style: regenerate and rustfmt examples

We permit the code in the docs to be un-rustfmt'd, but the CI check and the examples themselves use rustfmt. Ideally, the code in the docs would be formatted to, but that's still an unstable rustfmt feature.
BurntSushi · Jun 26, 2019 · 9423d80 · 9423d80
1 parent 775b836
commit 9423d80
Show file tree

Hide file tree

Showing 23 changed files with 150 additions and 100 deletions.
diff --git a/ci/check-copy b/ci/check-copy
@@ -19,6 +19,8 @@ errored() {
  exit 1
 }
 
+# Make sure the right rustfmt config is available.
+cp "$REPO/rustfmt.toml" "$TMPDIR/"
 "$SCRIPTS/copy-examples" \
  --rust-file "$REPO/src/$SOURCE.rs" \
  --example-dir "$TMPDIR"

diff --git a/examples/cookbook-read-colon.rs b/examples/cookbook-read-colon.rs
@@ -3,9 +3,8 @@ use std::io;
 use std::process;
 
 fn example() -> Result<(), Box<dyn Error>> {
- let mut rdr = csv::ReaderBuilder::new()
- .delimiter(b':')
- .from_reader(io::stdin());
+ let mut rdr =
+ csv::ReaderBuilder::new().delimiter(b':').from_reader(io::stdin());
  for result in rdr.records() {
  let record = result?;
  println!("{:?}", record);

diff --git a/examples/cookbook-read-no-headers.rs b/examples/cookbook-read-no-headers.rs
@@ -3,9 +3,8 @@ use std::io;
 use std::process;
 
 fn example() -> Result<(), Box<dyn Error>> {
- let mut rdr = csv::ReaderBuilder::new()
- .has_headers(false)
- .from_reader(io::stdin());
+ let mut rdr =
+ csv::ReaderBuilder::new().has_headers(false).from_reader(io::stdin());
  for result in rdr.records() {
  let record = result?;
  println!("{:?}", record);

diff --git a/examples/tutorial-error-03.rs b/examples/tutorial-error-03.rs
@@ -18,7 +18,7 @@ fn run() -> Result<(), Box<dyn Error>> {
  match result {
  Err(err) => return Err(From::from(err)),
  Ok(record) => {
- println!("{:?}", record);
+  println!("{:?}", record);
  }
  }
  }

diff --git a/examples/tutorial-perf-alloc-02.rs b/examples/tutorial-perf-alloc-02.rs
@@ -16,13 +16,13 @@ fn run() -> Result<u64, Box<dyn Error>> {
 }
 
 fn main() {
-match run() {
-Ok(count) => {
-println!("{}", count);
-}
-Err(err) => {
-println!("{}", err);
-process::exit(1);
-}
-}
+ match run() {
+ Ok(count) => {
+ println!("{}", count);
+ }
+ Err(err) => {
+ println!("{}", err);
+ process::exit(1);
+ }
+ }
 }
diff --git a/examples/tutorial-perf-alloc-03.rs b/examples/tutorial-perf-alloc-03.rs
@@ -16,13 +16,13 @@ fn run() -> Result<u64, Box<dyn Error>> {
 }
 
 fn main() {
-match run() {
-Ok(count) => {
-println!("{}", count);
-}
-Err(err) => {
-println!("{}", err);
-process::exit(1);
-}
-}
+ match run() {
+ Ok(count) => {
+ println!("{}", count);
+ }
+ Err(err) => {
+ println!("{}", err);
+ process::exit(1);
+ }
+ }
 }
diff --git a/examples/tutorial-perf-core-01.rs b/examples/tutorial-perf-core-01.rs
@@ -1,7 +1,7 @@
 use std::io::{self, Read};
 use std::process;
 
-use csv_core::{Reader, ReadFieldResult};
+use csv_core::{ReadFieldResult, Reader};
 
 fn run(mut data: &[u8]) -> Option<u64> {
  let mut rdr = Reader::new();

diff --git a/examples/tutorial-perf-serde-02.rs b/examples/tutorial-perf-serde-02.rs
@@ -32,13 +32,13 @@ fn run() -> Result<u64, Box<dyn Error>> {
 }
 
 fn main() {
-match run() {
-Ok(count) => {
-println!("{}", count);
-}
-Err(err) => {
-println!("{}", err);
-process::exit(1);
-}
-}
+ match run() {
+ Ok(count) => {
+ println!("{}", count);
+ }
+ Err(err) => {
+ println!("{}", err);
+ process::exit(1);
+ }
+ }
 }
diff --git a/examples/tutorial-perf-serde-03.rs b/examples/tutorial-perf-serde-03.rs
@@ -32,13 +32,13 @@ fn run() -> Result<u64, Box<dyn Error>> {
 }
 
 fn main() {
-match run() {
-Ok(count) => {
-println!("{}", count);
-}
-Err(err) => {
-println!("{}", err);
-process::exit(1);
-}
-}
+ match run() {
+ Ok(count) => {
+ println!("{}", count);
+ }
+ Err(err) => {
+ println!("{}", err);
+ process::exit(1);
+ }
+ }
 }
diff --git a/examples/tutorial-pipeline-search-02.rs b/examples/tutorial-pipeline-search-02.rs
@@ -28,8 +28,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-read-delimiter-01.rs b/examples/tutorial-read-delimiter-01.rs
@@ -19,8 +19,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-read-headers-01.rs b/examples/tutorial-read-headers-01.rs
@@ -3,9 +3,8 @@ use std::io;
 use std::process;
 
 fn run() -> Result<(), Box<dyn Error>> {
- let mut rdr = csv::ReaderBuilder::new()
- .has_headers(false)
- .from_reader(io::stdin());
+ let mut rdr =
+ csv::ReaderBuilder::new().has_headers(false).from_reader(io::stdin());
  for result in rdr.records() {
  let record = result?;
  println!("{:?}", record);
@@ -14,8 +13,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-read-headers-02.rs b/examples/tutorial-read-headers-02.rs
@@ -21,8 +21,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-read-serde-01.rs b/examples/tutorial-read-serde-01.rs
@@ -21,14 +21,15 @@ fn run() -> Result<(), Box<dyn Error>> {
  println!(
  "city: {:?}, state: {:?}, \
  pop: {:?}, latitude: {:?}, longitude: {:?}",
- city, state, pop, latitude, longitude);
+ city, state, pop, latitude, longitude
+ );
  }
  Ok(())
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-read-serde-02.rs b/examples/tutorial-read-serde-02.rs
@@ -19,8 +19,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-read-serde-03.rs b/examples/tutorial-read-serde-03.rs
@@ -17,8 +17,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-read-serde-invalid-01.rs b/examples/tutorial-read-serde-invalid-01.rs
@@ -24,8 +24,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-read-serde-invalid-02.rs b/examples/tutorial-read-serde-invalid-02.rs
@@ -24,8 +24,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }
diff --git a/examples/tutorial-write-01.rs b/examples/tutorial-write-01.rs
@@ -7,8 +7,20 @@ fn run() -> Result<(), Box<dyn Error>> {
  // Since we're writing records manually, we must explicitly write our
  // header record. A header record is written the same way that other
  // records are written.
- wtr.write_record(&["City", "State", "Population", "Latitude", "Longitude"])?;
- wtr.write_record(&["Davidsons Landing", "AK", "", "65.2419444", "-165.2716667"])?;
+ wtr.write_record(&[
+ "City",
+ "State",
+ "Population",
+ "Latitude",
+ "Longitude",
+ ])?;
+ wtr.write_record(&[
+ "Davidsons Landing",
+ "AK",
+ "",
+ "65.2419444",
+ "-165.2716667",
+ ])?;
  wtr.write_record(&["Kenai", "AK", "7610", "60.5544444", "-151.2583333"])?;
  wtr.write_record(&["Oakman", "AL", "", "33.7133333", "-87.3886111"])?;
 

diff --git a/examples/tutorial-write-02.rs b/examples/tutorial-write-02.rs
@@ -7,8 +7,20 @@ fn run() -> Result<(), Box<dyn Error>> {
  let file_path = get_first_arg()?;
  let mut wtr = csv::Writer::from_path(file_path)?;
 
- wtr.write_record(&["City", "State", "Population", "Latitude", "Longitude"])?;
- wtr.write_record(&["Davidsons Landing", "AK", "", "65.2419444", "-165.2716667"])?;
+ wtr.write_record(&[
+ "City",
+ "State",
+ "Population",
+ "Latitude",
+ "Longitude",
+ ])?;
+ wtr.write_record(&[
+ "Davidsons Landing",
+ "AK",
+ "",
+ "65.2419444",
+ "-165.2716667",
+ ])?;
  wtr.write_record(&["Kenai", "AK", "7610", "60.5544444", "-151.2583333"])?;
  wtr.write_record(&["Oakman", "AL", "", "33.7133333", "-87.3886111"])?;
 

diff --git a/examples/tutorial-write-delimiter-01.rs b/examples/tutorial-write-delimiter-01.rs
@@ -8,8 +8,20 @@ fn run() -> Result<(), Box<dyn Error>> {
  .quote_style(csv::QuoteStyle::NonNumeric)
  .from_writer(io::stdout());
 
- wtr.write_record(&["City", "State", "Population", "Latitude", "Longitude"])?;
- wtr.write_record(&["Davidsons Landing", "AK", "", "65.2419444", "-165.2716667"])?;
+ wtr.write_record(&[
+ "City",
+ "State",
+ "Population",
+ "Latitude",
+ "Longitude",
+ ])?;
+ wtr.write_record(&[
+ "Davidsons Landing",
+ "AK",
+ "",
+ "65.2419444",
+ "-165.2716667",
+ ])?;
  wtr.write_record(&["Kenai", "AK", "7610", "60.5544444", "-151.2583333"])?;
  wtr.write_record(&["Oakman", "AL", "", "33.7133333", "-87.3886111"])?;
 
@@ -18,8 +30,8 @@ fn run() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-if let Err(err) = run() {
-println!("{}", err);
-process::exit(1);
-}
+ if let Err(err) = run() {
+ println!("{}", err);
+ process::exit(1);
+ }
 }