doc: update examples

This mostly gets rid of lingering `extern crate` statements, and uses
`Box<dyn Error>` instead of `Box<Error>`.

Cargo.toml

@@ -30,7 +30,7 @@ ryu = "1"
 serde = "1.0.55"
 
 [dev-dependencies]
-serde_derive = "1.0.55"
+serde = { version = "1.0.55", features = ["derive"] }
 serde_bytes = "0.10.4"
 
 [profile.release]

README.md

@@ -24,13 +24,7 @@ Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-csv = "1"
-```
-
-and this to your crate root:
-
-```rust
-extern crate csv;
+csv = "1.1"
 ```
 
 ### Example
@@ -42,13 +36,11 @@ There are more examples in the
 [cookbook](https://docs.rs/csv/1.0.0/csv/cookbook/index.html).
 
 ```rust
-extern crate csv;
-
 use std::error::Error;
 use std::io;
 use std::process;
 
-fn example() -> Result<(), Box<Error>> {
+fn example() -> Result<(), Box<dyn Error>> {
  // Build the CSV reader and iterate over each record.
  let mut rdr = csv::Reader::from_reader(io::stdin());
  for result in rdr.records() {
@@ -83,23 +75,21 @@ By default, the member names of the struct are matched with the values in the
 header record of your CSV data.
 
 ```rust
-extern crate csv;
-#[macro_use]
-extern crate serde_derive;
-
 use std::error::Error;
 use std::io;
 use std::process;
 
-#[derive(Debug,Deserialize)]
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
 struct Record {
  city: String,
  region: String,
  country: String,
  population: Option<u64>,
 }
 
-fn example() -> Result<(), Box<Error>> {
+fn example() -> Result<(), Box<dyn Error>> {
  let mut rdr = csv::Reader::from_reader(io::stdin());
  for result in rdr.deserialize() {
  // Notice that we need to provide a type hint for automatic

benches/bench.rs

@@ -1,14 +1,10 @@
 #![feature(test)]
 
-extern crate csv;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
 extern crate test;
 
 use std::io;
 
-use serde::de::DeserializeOwned;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use test::Bencher;
 
 use csv::{

csv-core/README.md

@@ -19,13 +19,7 @@ Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-csv-core = "0.1"
-```
-
-and this to your crate root:
-
-```rust
-extern crate csv_core;
+csv-core = "0.2"
 ```
 
 ### Build features

csv-core/benches/bench.rs

@@ -1,6 +1,5 @@
 #![feature(test)]
 
-extern crate csv_core;
 extern crate test;
 
 use test::Bencher;

csv-core/src/lib.rs

@@ -99,15 +99,13 @@ foo,\"bar,baz\"
 #![deny(missing_docs)]
 #![no_std]
 
-#[cfg(test)]
-extern crate arrayvec;
-extern crate memchr;
-
 pub use crate::reader::{
  ReadFieldNoCopyResult, ReadFieldResult, ReadRecordNoCopyResult,
  ReadRecordResult, Reader, ReaderBuilder,
 };
-pub use crate::writer::{is_non_numeric, quote, WriteResult, Writer, WriterBuilder};
+pub use crate::writer::{
+ is_non_numeric, quote, WriteResult, Writer, WriterBuilder,
+};
 
 mod reader;
 mod writer;

csv-index/README.md

@@ -19,13 +19,7 @@ Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-csv-index = "0.1"
-```
-
-and this to your crate root:
-
-```rust
-extern crate csv_index;
+csv-index = "0.2"
 ```
 
 ### Example: build a simple random access index
@@ -36,19 +30,17 @@ data. This example shows how to save this index to disk for a particular CSV
 file.
 
 ```rust
-extern crate csv;
-extern crate csv_index;
-
 use std::error::Error;
 use std::fs::File;
 use std::io::{self, Write};
+
 use csv_index::RandomAccessSimple;
 
 fn main() {
  example().unwrap();
 }
 
-fn example() -> Result<(), Box<Error>> {
+fn example() -> Result<(), Box<dyn Error>> {
  // Open a normal CSV reader.
  let mut rdr = csv::Reader::from_path("data.csv")?;
 

csv-index/src/lib.rs

@@ -10,13 +10,7 @@ and can be used by adding `csv-index` to your dependencies in your project's
 
 ```toml
 [dependencies]
-csv-index = "0.1"
-```
-
-and this to your crate root:
-
-```ignore
-extern crate csv_index;
+csv-index = "0.2"
 ```
 
 # Example: build a simple random access index
@@ -31,16 +25,13 @@ your CSV data has changed since the index was created, then the index will need
 to be regenerated.
 
 ```no_run
-extern crate csv;
-extern crate csv_index;
-
 use std::error::Error;
 use std::fs::File;
 use std::io::{self, Write};
 use csv_index::RandomAccessSimple;
 
 # fn main() { example().unwrap(); }
-fn example() -> Result<(), Box<Error>> {
+fn example() -> Result<(), Box<dyn Error>> {
  // Open a normal CSV reader.
  let mut rdr = csv::Reader::from_path("data.csv")?;
 
@@ -81,9 +72,6 @@ amenable to serializing to disk.)
 
 #![deny(missing_docs)]
 
-extern crate byteorder;
-extern crate csv;
-
 pub use crate::simple::RandomAccessSimple;
 
 mod simple;

csv-index/src/simple.rs

@@ -45,9 +45,6 @@ impl<W: io::Write> RandomAccessSimple<W> {
  /// and query the number of records in the index.
  ///
  /// ```
- /// extern crate csv;
- /// extern crate csv_index;
- ///
  /// use std::io;
  /// use csv_index::RandomAccessSimple;
  ///
@@ -74,9 +71,6 @@ impl<W: io::Write> RandomAccessSimple<W> {
  /// in memory with `std::io::Cursor`, we write the index to a file.
  ///
  /// ```no_run
- /// extern crate csv;
- /// extern crate csv_index;
- ///
  /// use std::fs::File;
  /// use std::io;
  /// use csv_index::RandomAccessSimple;
@@ -137,9 +131,6 @@ impl<R: io::Read + io::Seek> RandomAccessSimple<R> {
  /// and query the number of records in the index.
  ///
  /// ```
- /// extern crate csv;
- /// extern crate csv_index;
- ///
  /// use std::io;
  /// use csv_index::RandomAccessSimple;
  ///
@@ -184,15 +175,12 @@ impl<R: io::Read + io::Seek> RandomAccessSimple<R> {
  /// and use it to seek a CSV reader to read an arbitrary record.
  ///
  /// ```
- /// extern crate csv;
- /// extern crate csv_index;
- ///
  /// use std::error::Error;
  /// use std::io;
  /// use csv_index::RandomAccessSimple;
  ///
  /// # fn main() { example().unwrap(); }
- /// fn example() -> Result<(), Box<Error>> {
+ /// fn example() -> Result<(), Box<dyn Error>> {
  /// let data = "\
  /// city,country,pop
  /// Boston,United States,4628910

examples/cookbook-read-basic.rs

@@ -1,5 +1,3 @@
-extern crate csv;
-
 use std::error::Error;
 use std::io;
 use std::process;

examples/cookbook-read-colon.rs

@@ -1,12 +1,11 @@
-extern crate csv;
-
 use std::error::Error;
 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);

examples/cookbook-read-no-headers.rs

@@ -1,12 +1,11 @@
-extern crate csv;
-
 use std::error::Error;
 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);

examples/cookbook-read-serde.rs

@@ -1,11 +1,9 @@
-extern crate csv;
-#[macro_use]
-extern crate serde_derive;
-
 use std::error::Error;
 use std::io;
 use std::process;
 
+use serde::Deserialize;
+
 // By default, struct field names are deserialized based on the position of
 // a corresponding field in the CSV data's header record.
 #[derive(Debug, Deserialize)]

examples/cookbook-write-basic.rs

@@ -1,5 +1,3 @@
-extern crate csv;
-
 use std::error::Error;
 use std::io;
 use std::process;

examples/cookbook-write-serde.rs

@@ -1,11 +1,9 @@
-extern crate csv;
-#[macro_use]
-extern crate serde_derive;
-
 use std::error::Error;
 use std::io;
 use std::process;
 
+use serde::Serialize;
+
 #[derive(Debug, Serialize)]
 struct Record {
  city: String,

examples/tutorial-error-01.rs

@@ -1,5 +1,3 @@
-extern crate csv;
-
 use std::io;
 
 fn main() {

examples/tutorial-error-02.rs

@@ -1,5 +1,3 @@
-extern crate csv;
-
 use std::io;
 use std::process;
 

examples/tutorial-error-03.rs

@@ -1,5 +1,3 @@
-extern crate csv;
-
 use std::error::Error;
 use std::io;
 use std::process;
@@ -16,11 +14,11 @@ fn run() -> Result<(), Box<dyn Error>> {
  for result in rdr.records() {
  // Examine our Result.
  // If there was no problem, print the record.
- // Otherwise, convert our error to a Box<Error> and return it.
+ // Otherwise, convert our error to a Box<dyn Error> and return it.
  match result {
  Err(err) => return Err(From::from(err)),
  Ok(record) => {
-  println!("{:?}", record);
+ println!("{:?}", record);
  }
  }
  }

examples/tutorial-error-04.rs

@@ -1,5 +1,3 @@
-extern crate csv;
-
 use std::error::Error;
 use std::io;
 use std::process;

examples/tutorial-perf-alloc-01.rs

@@ -1,5 +1,3 @@
-extern crate csv;
-
 use std::error::Error;
 use std::io;
 use std::process;

examples/tutorial-perf-alloc-02.rs

@@ -1,5 +1,3 @@
-extern crate csv;
-
 use std::error::Error;
 use std::io;
 use std::process;
@@ -18,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);
+}
+}
 }