Merge branch 'BurntSushi:master' into master

Author: DCjanus

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "csv"
-version = "1.3.1"  #:version
+version = "1.4.0"  #:version
 authors = ["Andrew Gallant <[email protected]>"]
 description = "Fast CSV parsing with support for serde."
 documentation = "https://docs.rs/csv"
@@ -24,11 +24,11 @@ bench = false
 csv-core = { path = "csv-core", version = "0.1.11" }
 itoa = "1"
 ryu = "1"
-serde = "1.0.55"
+serde_core = "1.0.221"
 
 [dev-dependencies]
 bstr = { version = "1.7.0", default-features = false, features = ["alloc", "serde"] }
-serde = { version = "1.0.55", features = ["derive"] }
+serde = { version = "1.0.221", features = ["derive"] }
 
 [profile.release]
 debug = true

benches/bench.rs

@@ -12,11 +12,10 @@ use csv::{
     WriterBuilder,
 };
 
-static NFL: &'static str = include_str!("../examples/data/bench/nfl.csv");
-static GAME: &'static str = include_str!("../examples/data/bench/game.csv");
-static POP: &'static str =
-    include_str!("../examples/data/bench/worldcitiespop.csv");
-static MBTA: &'static str =
+static NFL: &str = include_str!("../examples/data/bench/nfl.csv");
+static GAME: &str = include_str!("../examples/data/bench/game.csv");
+static POP: &str = include_str!("../examples/data/bench/worldcitiespop.csv");
+static MBTA: &str =
     include_str!("../examples/data/bench/gtfs-mbta-stop-times.csv");
 
 #[derive(Debug, Serialize, Deserialize, PartialEq)]

csv-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "csv-core"
-version = "0.1.12"  #:version
+version = "0.1.13"  #:version
 authors = ["Andrew Gallant <[email protected]>"]
 description = "Bare bones CSV parsing with no_std support."
 documentation = "https://docs.rs/csv-core"

csv-core/src/reader.rs

@@ -608,16 +608,14 @@ impl Reader {
     /// this method will fail to strip off the BOM if only part of the BOM is
     /// buffered. Hopefully that won't happen very often.
     fn strip_utf8_bom<'a>(&self, input: &'a [u8]) -> (&'a [u8], usize) {
-        let (input, nin) = if {
-            !self.has_read
-                && input.len() >= 3
-                && &input[0..3] == b"\xef\xbb\xbf"
-        } {
+        if !self.has_read
+            && input.len() >= 3
+            && &input[0..3] == b"\xef\xbb\xbf"
+        {
             (&input[3..], 3)
         } else {
             (input, 0)
-        };
-        (input, nin)
+        }
     }
 
     #[inline(always)]

examples/cookbook-write-basic.rs

@@ -5,9 +5,9 @@ fn example() -> Result<(), Box<dyn Error>> {
 
     // When writing records without Serde, the header record is written just
     // like any other record.
-    wtr.write_record(&["city", "region", "country", "population"])?;
-    wtr.write_record(&["Southborough", "MA", "United States", "9686"])?;
-    wtr.write_record(&["Northbridge", "MA", "United States", "14061"])?;
+    wtr.write_record(["city", "region", "country", "population"])?;
+    wtr.write_record(["Southborough", "MA", "United States", "9686"])?;
+    wtr.write_record(["Northbridge", "MA", "United States", "14061"])?;
     wtr.flush()?;
     Ok(())
 }

examples/tutorial-pipeline-pop-01.rs

@@ -35,13 +35,11 @@ fn run() -> Result<(), Box<dyn Error>> {
         // indicate which type we want to deserialize our record into.
         let record: Record = result?;
 
-        // `map_or` is a combinator on `Option`. It take two parameters:
-        // a value to use when the `Option` is `None` (i.e., the record has
-        // no population count) and a closure that returns another value of
-        // the same type when the `Option` is `Some`. In this case, we test it
-        // against our minimum population count that we got from the command
-        // line.
-        if record.population.map_or(false, |pop| pop >= minimum_pop) {
+        // `is_some_and` is a combinator on `Option`. It takes a closure that
+        // returns `bool` when the `Option` is `Some`. When the `Option` is
+        // `None`, `false` is always returned. In this case, we test it against
+        // our minimum population count that we got from the command line.
+        if record.population.is_some_and(|pop| pop >= minimum_pop) {
             wtr.serialize(record)?;
         }
     }

examples/tutorial-pipeline-search-01.rs

@@ -19,7 +19,7 @@ fn run() -> Result<(), Box<dyn Error>> {
     // `query` to `wtr`.
     for result in rdr.records() {
         let record = result?;
-        if record.iter().any(|field| field == &query) {
+        if record.iter().any(|field| field == query) {
             wtr.write_record(&record)?;
         }
     }

examples/tutorial-read-headers-02.rs

@@ -2,17 +2,13 @@ use std::{error::Error, io, process};
 
 fn run() -> Result<(), Box<dyn Error>> {
     let mut rdr = csv::Reader::from_reader(io::stdin());
-    {
-        // We nest this call in its own scope because of lifetimes.
-        let headers = rdr.headers()?;
-        println!("{:?}", headers);
-    }
+    let headers = rdr.headers()?;
+    println!("{:?}", headers);
     for result in rdr.records() {
         let record = result?;
         println!("{:?}", record);
     }
-    // We can ask for the headers at any time. There's no need to nest this
-    // call in its own scope because we never try to borrow the reader again.
+    // We can ask for the headers at any time.
     let headers = rdr.headers()?;
     println!("{:?}", headers);
     Ok(())

examples/tutorial-write-01.rs

@@ -5,22 +5,22 @@ 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(&[
+    wtr.write_record([
         "City",
         "State",
         "Population",
         "Latitude",
         "Longitude",
     ])?;
-    wtr.write_record(&[
+    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"])?;
+    wtr.write_record(["Kenai", "AK", "7610", "60.5544444", "-151.2583333"])?;
+    wtr.write_record(["Oakman", "AL", "", "33.7133333", "-87.3886111"])?;
 
     // A CSV writer maintains an internal buffer, so it's important
     // to flush the buffer when you're done.

examples/tutorial-write-02.rs

@@ -4,22 +4,22 @@ fn run() -> Result<(), Box<dyn Error>> {
     let file_path = get_first_arg()?;
     let mut wtr = csv::Writer::from_path(file_path)?;
 
-    wtr.write_record(&[
+    wtr.write_record([
         "City",
         "State",
         "Population",
         "Latitude",
         "Longitude",
     ])?;
-    wtr.write_record(&[
+    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"])?;
+    wtr.write_record(["Kenai", "AK", "7610", "60.5544444", "-151.2583333"])?;
+    wtr.write_record(["Oakman", "AL", "", "33.7133333", "-87.3886111"])?;
 
     wtr.flush()?;
     Ok(())