From: Kostya Shishkov Date: Wed, 15 May 2019 12:43:59 +0000 (+0200) Subject: use a bit more modern Rust idioms X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=e47ee41144428dafd739f6bb7fd7fc31f1c890d5;p=nihav-tool.git use a bit more modern Rust idioms --- diff --git a/src/frmwriter.rs b/src/frmwriter.rs index a9c0612..57141cd 100644 --- a/src/frmwriter.rs +++ b/src/frmwriter.rs @@ -24,8 +24,7 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { let ls = buf.get_stride(0); let mut idx = 0; let mut idx2 = w; - let mut pad: Vec = Vec::with_capacity((w - w2 * 2) / 2); - pad.resize((w - w2 * 2) / 2, 0xFF); + let pad: Vec = vec![0xFF; (w - w2 * 2) / 2]; for _ in 0..h { let line = &dta[idx..idx2]; ofile.write_all(line).unwrap(); @@ -79,8 +78,7 @@ pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { buf.get_info().get_format().get_chromaton(2).unwrap().get_offset() as usize ]; let mut idx = 0; - let mut line: Vec = Vec::with_capacity(w * 3); - line.resize(w * 3, 0); + let mut line: Vec = vec![0; w * 3]; for _ in 0..h { let src = &dta[idx..(idx+w)]; for x in 0..w { @@ -109,8 +107,7 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { buf.get_info().get_format().get_chromaton(2).unwrap().get_offset() as usize ]; let step = buf.get_info().get_format().get_elem_size() as usize; - let mut line: Vec = Vec::with_capacity(w * 3); - line.resize(w * 3, 0); + let mut line: Vec = vec![0; w * 3]; for src in dta.chunks(stride) { for x in 0..w { line[x * 3 + 0] = src[x * step + offs[0]]; @@ -140,8 +137,7 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { buf.get_info().get_format().get_chromaton(1).unwrap().get_shift(), buf.get_info().get_format().get_chromaton(2).unwrap().get_shift() ]; - let mut line: Vec = Vec::with_capacity(w * 3); - line.resize(w * 3, 0); + let mut line: Vec = vec![0; w * 3]; for src in dta.chunks(stride) { for x in 0..w { let elem = src[x]; diff --git a/src/main.rs b/src/main.rs index 9f9d497..c26e671 100644 --- a/src/main.rs +++ b/src/main.rs @@ -61,7 +61,7 @@ struct AudioOutput { } impl AudioOutput { - fn new(name: &String) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } } + fn new(name: &str) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } } fn output_frame(&mut self, _pkt: &NAPacket, frm: NAFrameRef) { if !self.wrote_header { self.wwr.write_header(frm.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap(); @@ -91,7 +91,7 @@ fn main() { let mut decode_audio = true; let mut nmode = NumberMode::FrmPTS; - while (cur_arg < args.len()) && (args[cur_arg].chars().next().unwrap() == '-') { + while (cur_arg < args.len()) && args[cur_arg].starts_with('-') { match args[cur_arg].as_str() { "--" => { break; }, "-noout" => { noout = true; }, @@ -132,7 +132,7 @@ println!("trying demuxer {} on {}", dmx_name, name); br.seek(SeekFrom::Start(0)).unwrap(); let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap(); - let mut decs: Vec, Box)>> = Vec::new(); + let mut decs: Vec, Box)>> = Vec::new(); let mut sids: Vec = Vec::new(); let mut writers: Vec = Vec::new(); for i in 0..dmx.get_num_streams() { @@ -154,7 +154,7 @@ println!("stream {} - {} {}", i, s, info.get_name()); dec.init(&mut dsupp, info).unwrap(); decs.push(Some((dsupp, dec))); if !noout { - writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode: nmode})); + writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode})); has_out = true; } } else { diff --git a/src/wavwriter.rs b/src/wavwriter.rs index 51700f7..d72b82a 100644 --- a/src/wavwriter.rs +++ b/src/wavwriter.rs @@ -49,7 +49,7 @@ macro_rules! write_data { } impl<'a> WavWriter<'a> { - pub fn new(name: &String) -> Self { + pub fn new(name: &str) -> Self { let file = File::create(name).unwrap(); let fw = Box::new(FileWriter::new_write(file)); let io = ByteWriter::new(Box::leak(fw));