From 29767c6ad2ed5d96f1db5d30e0ed3840a57e6240 Mon Sep 17 00:00:00 2001 From: Peter Trotman Date: Fri, 11 Oct 2019 16:32:16 +0100 Subject: [PATCH 1/5] Fixed compiler warnings as directed by compiler hints. --- src/cmd/headers.rs | 22 +++++++++------------- src/cmd/join.rs | 2 +- src/cmd/partition.rs | 2 +- src/cmd/split.rs | 2 +- src/config.rs | 8 ++++---- src/util.rs | 2 +- tests/tests.rs | 4 ++-- tests/workdir.rs | 2 +- 8 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/cmd/headers.rs b/src/cmd/headers.rs index d9e39e5b..6a215f2d 100644 --- a/src/cmd/headers.rs +++ b/src/cmd/headers.rs @@ -2,9 +2,9 @@ use std::io; use tabwriter::TabWriter; -use CliResult; use config::Delimiter; use util; +use CliResult; static USAGE: &'static str = " Prints the fields of the first row in the CSV data. @@ -41,31 +41,27 @@ struct Args { pub fn run(argv: &[&str]) -> CliResult<()> { let args: Args = util::get_args(USAGE, argv)?; - let configs = util::many_configs( - &*args.arg_input, args.flag_delimiter, true)?; + let configs = util::many_configs(&*args.arg_input, args.flag_delimiter, true)?; let num_inputs = configs.len(); let mut headers: Vec> = vec![]; for conf in configs.into_iter() { let mut rdr = conf.reader()?; for header in rdr.byte_headers()?.iter() { - if !args.flag_intersect - || !headers.iter().any(|h| &**h == header) - { + if !args.flag_intersect || !headers.iter().any(|h| &**h == header) { headers.push(header.to_vec()); } } } - let mut wtr: Box = - if args.flag_just_names { - Box::new(io::stdout()) - } else { - Box::new(TabWriter::new(io::stdout())) - }; + let mut wtr: Box = if args.flag_just_names { + Box::new(io::stdout()) + } else { + Box::new(TabWriter::new(io::stdout())) + }; for (i, header) in headers.into_iter().enumerate() { if num_inputs == 1 && !args.flag_just_names { - write!(&mut wtr, "{}\t", i+1)?; + write!(&mut wtr, "{}\t", i + 1)?; } wtr.write_all(&header)?; wtr.write_all(b"\n")?; diff --git a/src/cmd/join.rs b/src/cmd/join.rs index 98fbbd35..c2fafce1 100644 --- a/src/cmd/join.rs +++ b/src/cmd/join.rs @@ -278,7 +278,7 @@ impl IoState { impl Args { fn new_io_state(&self) - -> CliResult>> { + -> CliResult>> { let rconf1 = Config::new(&Some(self.arg_input1.clone())) .delimiter(self.flag_delimiter) .no_headers(self.flag_no_headers) diff --git a/src/cmd/partition.rs b/src/cmd/partition.rs index 68997a21..7f64699a 100644 --- a/src/cmd/partition.rs +++ b/src/cmd/partition.rs @@ -135,7 +135,7 @@ impl Args { } } -type BoxedWriter = csv::Writer>; +type BoxedWriter = csv::Writer>; /// Generates unique filenames based on CSV values. struct WriterGenerator { diff --git a/src/cmd/split.rs b/src/cmd/split.rs index 0e597ee5..eb22caca 100644 --- a/src/cmd/split.rs +++ b/src/cmd/split.rs @@ -128,7 +128,7 @@ impl Args { &self, headers: &csv::ByteRecord, start: usize, - ) -> CliResult>> { + ) -> CliResult>> { let dir = Path::new(&self.arg_outdir); let path = dir.join(self.flag_filename.filename(&format!("{}", start))); let spath = Some(path.display().to_string()); diff --git a/src/config.rs b/src/config.rs index 1816fa1c..84e98190 100644 --- a/src/config.rs +++ b/src/config.rs @@ -194,12 +194,12 @@ impl Config { } pub fn writer(&self) - -> io::Result>> { + -> io::Result>> { Ok(self.from_writer(self.io_writer()?)) } pub fn reader(&self) - -> io::Result>> { + -> io::Result>> { Ok(self.from_reader(self.io_reader()?)) } @@ -260,7 +260,7 @@ impl Config { } } - pub fn io_reader(&self) -> io::Result> { + pub fn io_reader(&self) -> io::Result> { Ok(match self.path { None => Box::new(io::stdin()), Some(ref p) => { @@ -290,7 +290,7 @@ impl Config { .from_reader(rdr) } - pub fn io_writer(&self) -> io::Result> { + pub fn io_writer(&self) -> io::Result> { Ok(match self.path { None => Box::new(io::stdout()), Some(ref p) => Box::new(fs::File::create(p)?), diff --git a/src/util.rs b/src/util.rs index c5086ff7..ce257417 100644 --- a/src/util.rs +++ b/src/util.rs @@ -187,7 +187,7 @@ impl FilenameTemplate { /// that we do not output headers; the caller must do that if /// desired. pub fn writer

(&self, path: P, unique_value: &str) - -> io::Result>> + -> io::Result>> where P: AsRef { let filename = self.filename(unique_value); diff --git a/tests/tests.rs b/tests/tests.rs index 37966bc7..70cd1e11 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -102,7 +102,7 @@ impl Arbitrary for CsvRecord { CsvRecord((0..size).map(|_| Arbitrary::arbitrary(g)).collect()) } - fn shrink(&self) -> Box+'static> { + fn shrink(&self) -> Box+'static> { Box::new(self.clone().unwrap() .shrink().filter(|r| r.len() > 0).map(CsvRecord)) } @@ -148,7 +148,7 @@ impl Arbitrary for CsvData { } } - fn shrink(&self) -> Box+'static> { + fn shrink(&self) -> Box+'static> { let len = if self.is_empty() { 0 } else { self[0].len() }; let mut rows: Vec = self.clone() diff --git a/tests/workdir.rs b/tests/workdir.rs index 111ade33..6a4c2971 100644 --- a/tests/workdir.rs +++ b/tests/workdir.rs @@ -14,7 +14,7 @@ use Csv; static XSV_INTEGRATION_TEST_DIR: &'static str = "xit"; -static NEXT_ID: atomic::AtomicUsize = atomic::ATOMIC_USIZE_INIT; +static NEXT_ID: atomic::AtomicUsize = atomic::AtomicUsize::new(0); pub struct Workdir { root: PathBuf, From eb58c913e3c8b9b10dd494303c1ade9c2cbc663b Mon Sep 17 00:00:00 2001 From: Peter Trotman Date: Fri, 11 Oct 2019 16:39:46 +0100 Subject: [PATCH 2/5] Update headers.rs --- src/cmd/headers.rs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/cmd/headers.rs b/src/cmd/headers.rs index 6a215f2d..70351d2c 100644 --- a/src/cmd/headers.rs +++ b/src/cmd/headers.rs @@ -2,9 +2,9 @@ use std::io; use tabwriter::TabWriter; +use CliResult; use config::Delimiter; use util; -use CliResult; static USAGE: &'static str = " Prints the fields of the first row in the CSV data. @@ -41,24 +41,26 @@ struct Args { pub fn run(argv: &[&str]) -> CliResult<()> { let args: Args = util::get_args(USAGE, argv)?; - let configs = util::many_configs(&*args.arg_input, args.flag_delimiter, true)?; + let configs = util::many_configs( + &*args.arg_input, args.flag_delimiter, true)?; let num_inputs = configs.len(); let mut headers: Vec> = vec![]; for conf in configs.into_iter() { let mut rdr = conf.reader()?; for header in rdr.byte_headers()?.iter() { - if !args.flag_intersect || !headers.iter().any(|h| &**h == header) { + if !args.flag_intersect + || !headers.iter().any(|h| &**h == header) headers.push(header.to_vec()); } } } - - let mut wtr: Box = if args.flag_just_names { - Box::new(io::stdout()) - } else { - Box::new(TabWriter::new(io::stdout())) - }; + let mut wtr: Box = + if args.flag_just_names { + Box::new(io::stdout()) + } else { + Box::new(TabWriter::new(io::stdout())) + }; for (i, header) in headers.into_iter().enumerate() { if num_inputs == 1 && !args.flag_just_names { write!(&mut wtr, "{}\t", i + 1)?; From 80499cb782b49e6148c9fdbd8112aaa13399817c Mon Sep 17 00:00:00 2001 From: Peter Trotman Date: Fri, 11 Oct 2019 16:40:22 +0100 Subject: [PATCH 3/5] Update headers.rs --- src/cmd/headers.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cmd/headers.rs b/src/cmd/headers.rs index 70351d2c..cce6ad10 100644 --- a/src/cmd/headers.rs +++ b/src/cmd/headers.rs @@ -51,6 +51,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> { for header in rdr.byte_headers()?.iter() { if !args.flag_intersect || !headers.iter().any(|h| &**h == header) + { headers.push(header.to_vec()); } } From f0bc33ffe6cf64c60d0f9aaa75c117a50a2eaf15 Mon Sep 17 00:00:00 2001 From: Peter Trotman Date: Fri, 11 Oct 2019 16:40:46 +0100 Subject: [PATCH 4/5] Update headers.rs --- src/cmd/headers.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cmd/headers.rs b/src/cmd/headers.rs index cce6ad10..f92dd584 100644 --- a/src/cmd/headers.rs +++ b/src/cmd/headers.rs @@ -56,6 +56,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> { } } } + let mut wtr: Box = if args.flag_just_names { Box::new(io::stdout()) From 52ba2034b352e8f6890b69d869b3f893181bc83f Mon Sep 17 00:00:00 2001 From: Peter Trotman Date: Fri, 11 Oct 2019 16:41:04 +0100 Subject: [PATCH 5/5] Update headers.rs --- src/cmd/headers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/headers.rs b/src/cmd/headers.rs index f92dd584..d531bdd2 100644 --- a/src/cmd/headers.rs +++ b/src/cmd/headers.rs @@ -65,7 +65,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> { }; for (i, header) in headers.into_iter().enumerate() { if num_inputs == 1 && !args.flag_just_names { - write!(&mut wtr, "{}\t", i + 1)?; + write!(&mut wtr, "{}\t", i+1)?; } wtr.write_all(&header)?; wtr.write_all(b"\n")?;