*: fix all warnings and update code

BurntSushi · Feb 14, 2023 · ea0273c · ea0273c
1 parent b9479c2
commit ea0273c
Show file tree

Hide file tree

Showing 36 changed files with 96 additions and 221 deletions.
diff --git a/examples/cookbook-read-basic.rs b/examples/cookbook-read-basic.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn example() -> Result<(), Box<dyn Error>> {
  // Build the CSV reader and iterate over each record.

diff --git a/examples/cookbook-read-colon.rs b/examples/cookbook-read-colon.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn example() -> Result<(), Box<dyn Error>> {
  let mut rdr =

diff --git a/examples/cookbook-read-no-headers.rs b/examples/cookbook-read-no-headers.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn example() -> Result<(), Box<dyn Error>> {
  let mut rdr =

diff --git a/examples/cookbook-read-serde.rs b/examples/cookbook-read-serde.rs
@@ -1,6 +1,5 @@
-use std::error::Error;
-use std::io;
-use std::process;
+#![allow(dead_code)]
+use std::{error::Error, io, process};
 
 use serde::Deserialize;
 

diff --git a/examples/cookbook-write-basic.rs b/examples/cookbook-write-basic.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn example() -> Result<(), Box<dyn Error>> {
  let mut wtr = csv::Writer::from_writer(io::stdout());

diff --git a/examples/cookbook-write-serde.rs b/examples/cookbook-write-serde.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 use serde::Serialize;
 

diff --git a/examples/tutorial-error-02.rs b/examples/tutorial-error-02.rs
@@ -1,5 +1,4 @@
-use std::io;
-use std::process;
+use std::{io, process};
 
 fn main() {
  let mut rdr = csv::Reader::from_reader(io::stdin());

diff --git a/examples/tutorial-error-03.rs b/examples/tutorial-error-03.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn main() {
  if let Err(err) = run() {

diff --git a/examples/tutorial-error-04.rs b/examples/tutorial-error-04.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn main() {
  if let Err(err) = run() {

diff --git a/examples/tutorial-perf-alloc-01.rs b/examples/tutorial-perf-alloc-01.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<u64, Box<dyn Error>> {
  let mut rdr = csv::Reader::from_reader(io::stdin());

diff --git a/examples/tutorial-perf-alloc-02.rs b/examples/tutorial-perf-alloc-02.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<u64, Box<dyn Error>> {
  let mut rdr = csv::Reader::from_reader(io::stdin());

diff --git a/examples/tutorial-perf-alloc-03.rs b/examples/tutorial-perf-alloc-03.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<u64, Box<dyn Error>> {
  let mut rdr = csv::Reader::from_reader(io::stdin());

diff --git a/examples/tutorial-perf-serde-01.rs b/examples/tutorial-perf-serde-01.rs
@@ -1,6 +1,5 @@
-use std::error::Error;
-use std::io;
-use std::process;
+#![allow(dead_code)]
+use std::{error::Error, io, process};
 
 use serde::Deserialize;
 

diff --git a/examples/tutorial-perf-serde-02.rs b/examples/tutorial-perf-serde-02.rs
@@ -1,8 +1,6 @@
-use std::error::Error;
-use std::io;
-use std::process;
-
+#![allow(dead_code)]
 use serde::Deserialize;
+use std::{error::Error, io, process};
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]

diff --git a/examples/tutorial-perf-serde-03.rs b/examples/tutorial-perf-serde-03.rs
@@ -1,6 +1,5 @@
-use std::error::Error;
-use std::io;
-use std::process;
+#![allow(dead_code)]
+use std::{error::Error, io, process};
 
 use serde::Deserialize;
 

diff --git a/examples/tutorial-pipeline-pop-01.rs b/examples/tutorial-pipeline-pop-01.rs
@@ -1,7 +1,4 @@
-use std::env;
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{env, error::Error, io, process};
 
 use serde::{Deserialize, Serialize};
 

diff --git a/examples/tutorial-pipeline-search-01.rs b/examples/tutorial-pipeline-search-01.rs
@@ -1,7 +1,4 @@
-use std::env;
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{env, error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  // Get the query from the positional arguments.

diff --git a/examples/tutorial-pipeline-search-02.rs b/examples/tutorial-pipeline-search-02.rs
@@ -1,7 +1,4 @@
-use std::env;
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{env, error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let query = match env::args().nth(1) {

diff --git a/examples/tutorial-read-01.rs b/examples/tutorial-read-01.rs
@@ -1,8 +1,4 @@
-use std::env;
-use std::error::Error;
-use std::ffi::OsString;
-use std::fs::File;
-use std::process;
+use std::{env, error::Error, ffi::OsString, fs::File, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let file_path = get_first_arg()?;

diff --git a/examples/tutorial-read-delimiter-01.rs b/examples/tutorial-read-delimiter-01.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let mut rdr = csv::ReaderBuilder::new()

diff --git a/examples/tutorial-read-headers-01.rs b/examples/tutorial-read-headers-01.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let mut rdr =

diff --git a/examples/tutorial-read-headers-02.rs b/examples/tutorial-read-headers-02.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let mut rdr = csv::Reader::from_reader(io::stdin());

diff --git a/examples/tutorial-read-serde-01.rs b/examples/tutorial-read-serde-01.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let mut rdr = csv::Reader::from_reader(io::stdin());

diff --git a/examples/tutorial-read-serde-02.rs b/examples/tutorial-read-serde-02.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 // This introduces a type alias so that we can conveniently reference our
 // record type.

diff --git a/examples/tutorial-read-serde-03.rs b/examples/tutorial-read-serde-03.rs
@@ -1,7 +1,5 @@
 use std::collections::HashMap;
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 // This introduces a type alias so that we can conveniently reference our
 // record type.

diff --git a/examples/tutorial-read-serde-04.rs b/examples/tutorial-read-serde-04.rs
@@ -1,6 +1,5 @@
-use std::error::Error;
-use std::io;
-use std::process;
+#![allow(dead_code)]
+use std::{error::Error, io, process};
 
 // This lets us write `#[derive(Deserialize)]`.
 use serde::Deserialize;

diff --git a/examples/tutorial-read-serde-invalid-01.rs b/examples/tutorial-read-serde-invalid-01.rs
@@ -1,6 +1,5 @@
-use std::error::Error;
-use std::io;
-use std::process;
+#![allow(dead_code)]
+use std::{error::Error, io, process};
 
 use serde::Deserialize;
 

diff --git a/examples/tutorial-read-serde-invalid-02.rs b/examples/tutorial-read-serde-invalid-02.rs
@@ -1,6 +1,5 @@
-use std::error::Error;
-use std::io;
-use std::process;
+#![allow(dead_code)]
+use std::{error::Error, io, process};
 
 use serde::Deserialize;
 #[derive(Debug, Deserialize)]

diff --git a/examples/tutorial-write-01.rs b/examples/tutorial-write-01.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let mut wtr = csv::Writer::from_writer(io::stdout());

diff --git a/examples/tutorial-write-02.rs b/examples/tutorial-write-02.rs
@@ -1,7 +1,4 @@
-use std::env;
-use std::error::Error;
-use std::ffi::OsString;
-use std::process;
+use std::{env, error::Error, ffi::OsString, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let file_path = get_first_arg()?;

diff --git a/examples/tutorial-write-delimiter-01.rs b/examples/tutorial-write-delimiter-01.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let mut wtr = csv::WriterBuilder::new()

diff --git a/examples/tutorial-write-serde-01.rs b/examples/tutorial-write-serde-01.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
  let mut wtr = csv::Writer::from_writer(io::stdout());

diff --git a/examples/tutorial-write-serde-02.rs b/examples/tutorial-write-serde-02.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 use serde::Serialize;
 

diff --git a/src/cookbook.rs b/src/cookbook.rs
@@ -31,9 +31,7 @@ stdout.
 
 ```no_run
 # //cookbook-read-basic.rs
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn example() -> Result<(), Box<dyn Error>> {
  // Build the CSV reader and iterate over each record.
@@ -74,9 +72,8 @@ method.
 
 ```no_run
 # //cookbook-read-serde.rs
-use std::error::Error;
-use std::io;
-use std::process;
+# #![allow(dead_code)]
+use std::{error::Error, io, process};
 
 use serde::Deserialize;
 
@@ -124,9 +121,7 @@ by `:` instead of `,`.
 
 ```no_run
 # //cookbook-read-colon.rs
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn example() -> Result<(), Box<dyn Error>> {
  let mut rdr = csv::ReaderBuilder::new()
@@ -164,9 +159,7 @@ first record is not skipped. This example shows how to disable that setting.
 
 ```no_run
 # //cookbook-read-no-headers.rs
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn example() -> Result<(), Box<dyn Error>> {
  let mut rdr = csv::ReaderBuilder::new()
@@ -201,9 +194,7 @@ This example shows how to write CSV data to stdout.
 
 ```no_run
 # //cookbook-write-basic.rs
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 fn example() -> Result<(), Box<dyn Error>> {
  let mut wtr = csv::Writer::from_writer(io::stdout());
@@ -241,9 +232,7 @@ headers are written automatically.
 
 ```no_run
 # //cookbook-write-serde.rs
-use std::error::Error;
-use std::io;
-use std::process;
+use std::{error::Error, io, process};
 
 use serde::Serialize;
 

diff --git a/src/deserializer.rs b/src/deserializer.rs
@@ -30,7 +30,7 @@ pub fn deserialize_string_record<'de, D: Deserialize<'de>>(
  D::deserialize(&mut deser).map_err(|err| {
  Error::new(ErrorKind::Deserialize {
  pos: record.position().map(Clone::clone),
- err: err,
+ err,
  })
  })
 }
@@ -47,7 +47,7 @@ pub fn deserialize_byte_record<'de, D: Deserialize<'de>>(
  D::deserialize(&mut deser).map_err(|err| {
  Error::new(ErrorKind::Deserialize {
  pos: record.position().map(Clone::clone),
- err: err,
+ err,
  })
  })
 }
@@ -197,10 +197,7 @@ impl<'r> DeRecord<'r> for DeStringRecord<'r> {
  }
 
  fn error(&self, kind: DeserializeErrorKind) -> DeserializeError {
- DeserializeError {
- field: Some(self.field.saturating_sub(1)),
- kind: kind,
- }
+ DeserializeError { field: Some(self.field.saturating_sub(1)), kind }
  }
 
  fn infer_deserialize<'de, V: Visitor<'de>>(
@@ -291,10 +288,7 @@ impl<'r> DeRecord<'r> for DeByteRecord<'r> {
  }
 
  fn error(&self, kind: DeserializeErrorKind) -> DeserializeError {
- DeserializeError {
- field: Some(self.field.saturating_sub(1)),
- kind: kind,
- }
+ DeserializeError { field: Some(self.field.saturating_sub(1)), kind }
  }
 
  fn infer_deserialize<'de, V: Visitor<'de>>(
@@ -913,7 +907,7 @@ mod tests {
  struct Foo;
 
  #[derive(Deserialize, Debug, PartialEq)]
- struct Bar {};
+ struct Bar {}
 
  let got = de_headers::<Foo>(&[], &[]);
  assert_eq!(got.unwrap(), Foo);