Merge branch 'french-release' into french-unreleased

Jimskapt · Nov 22, 2021 · 7ef9b27 · 7ef9b27
2 parents 5059194 + 8b0ed18
commit 7ef9b27
Show file tree

Hide file tree

Showing 720 changed files with 2,348 additions and 2,051 deletions.
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-12-23-reproduced/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-12-23-reproduced/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "minigrep"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-12-23-reproduced/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-12-23-reproduced/src/lib.rs
@@ -10,7 +10,7 @@ pub struct Config {
 
 // ANCHOR: ch13
 impl Config {
-    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+    pub fn new(args: &[String]) -> Result<Config, &str> {
         if args.len() < 3 {
             return Err("not enough arguments");
         }
@@ -104,5 +104,3 @@ Trust me.";
         );
     }
 }
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-12-24-reproduced/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-12-24-reproduced/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "minigrep"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-12-24-reproduced/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-12-24-reproduced/src/lib.rs
@@ -9,7 +9,7 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+    pub fn new(args: &[String]) -> Result<Config, &str> {
         if args.len() < 3 {
             return Err("not enough arguments");
         }

diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-13/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-13/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "iterators"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-14/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-14/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "iterators"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-15/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-15/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "iterators"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-15/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-15/src/lib.rs
@@ -14,5 +14,3 @@ mod tests {
     }
     // ANCHOR_END: here
 }
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-16/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-16/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "iterators"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-16/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-16/src/lib.rs
@@ -13,5 +13,3 @@ mod tests {
     }
     // ANCHOR_END: here
 }
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-17/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-17/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "iterators"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-17/output.txt b/FRENCH/listings-sources/ch13-functional-features/listing-13-17/output.txt
@@ -1,6 +1,6 @@
 $ cargo run
    Compiling iterators v0.1.0 (file:///projects/iterators)
-warning: unused `std::iter::Map` that must be used
+warning: unused `Map` that must be used
  -- > src/main.rs:4:5
   |
 4 |     v1.iter().map(|x| x + 1);
@@ -9,5 +9,6 @@ warning: unused `std::iter::Map` that must be used
   = note: `#[warn(unused_must_use)]` on by default
   = note: iterators are lazy and do nothing unless consumed
 
+warning: `iterators` (bin "iterators") generated 1 warning
     Finished dev [unoptimized + debuginfo] target(s) in 0.47s
      Running `target/debug/iterators`
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-18/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-18/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "iterators"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-19/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-19/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "shoe_size"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-19/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-19/src/lib.rs
@@ -4,7 +4,7 @@ struct Shoe {
     style: String,
 }
 
-fn shoes_in_my_size(shoes: Vec<Shoe>, shoe_size: u32) -> Vec<Shoe> {
+fn shoes_in_size(shoes: Vec<Shoe>, shoe_size: u32) -> Vec<Shoe> {
     shoes.into_iter().filter(|s| s.size == shoe_size).collect()
 }
 
@@ -29,7 +29,7 @@ mod tests {
             },
         ];
 
-        let in_my_size = shoes_in_my_size(shoes, 10);
+        let in_my_size = shoes_in_size(shoes, 10);
 
         assert_eq!(
             in_my_size,
@@ -46,5 +46,3 @@ mod tests {
         );
     }
 }
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-20/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-20/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "counter"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-20/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-20/src/lib.rs
@@ -7,5 +7,3 @@ impl Counter {
         Counter { count: 0 }
     }
 }
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-21/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-21/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "counter"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-21/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-21/src/lib.rs
@@ -22,5 +22,3 @@ impl Iterator for Counter {
     }
 }
 // ANCHOR_END: here
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-22/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-22/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "counter"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-22/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-22/src/lib.rs
@@ -39,5 +39,3 @@ mod tests {
     }
     // ANCHOR_END: here
 }
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-23/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-23/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "counter"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-23/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-23/src/lib.rs
@@ -49,5 +49,3 @@ mod tests {
     }
     // ANCHOR_END: here
 }
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-25/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-25/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "minigrep"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-25/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-25/src/lib.rs
@@ -9,7 +9,7 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+    pub fn new(args: &[String]) -> Result<Config, &str> {
         if args.len() < 3 {
             return Err("not enough arguments");
         }

diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-26/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-26/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "minigrep"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-27/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-27/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "minigrep"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-27/src/lib.rs b/FRENCH/listings-sources/ch13-functional-features/listing-13-27/src/lib.rs
@@ -109,5 +109,3 @@ Trust me.";
         );
     }
 }
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch13-functional-features/listing-13-29/Cargo.toml b/FRENCH/listings-sources/ch13-functional-features/listing-13-29/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "minigrep"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-01/Cargo.toml b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-01/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "my_crate"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-02/Cargo.toml b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-02/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "my_crate"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-03/Cargo.toml b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-03/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "art"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-03/src/lib.rs b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-03/src/lib.rs
@@ -27,10 +27,8 @@ pub mod utils {
     pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor {
         // --snip--
         // ANCHOR_END: here
-        SecondaryColor::Orange
+        unimplemented!();
         // ANCHOR: here
     }
 }
 // ANCHOR_END: here
-
-fn main() {}
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-04/Cargo.toml b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-04/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "art"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-05/Cargo.toml b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-05/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "art"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-06/Cargo.toml b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-06/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "art"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-07/add/add-one/Cargo.toml b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-07/add/add-one/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "add-one"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml b/FRENCH/listings-sources/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "adder"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

diff --git a/...urces/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml b/...urces/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "adder"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/...rces/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/Cargo.toml b/...rces/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "add-one"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
diff --git a/...ources/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml b/...ources/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "adder"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]