Skip to content

Commit 7ef9b27

Browse files
JimskaptJimskapt
committed
Merge branch 'french-release' into french-unreleased
2 parents 5059194 + 8b0ed18 commit 7ef9b27

File tree

720 files changed

+2348
-2051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

720 files changed

+2348
-2051
lines changed

‎FRENCH/listings-sources/ch13-functional-features/listing-12-23-reproduced/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "minigrep"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-12-23-reproduced/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub struct Config {
1010

1111
// ANCHOR: ch13
1212
impl Config {
13-
pub fn new(args: &[String]) -> Result<Config, &'static str> {
13+
pub fn new(args: &[String]) -> Result<Config, &str> {
1414
if args.len() < 3 {
1515
return Err("not enough arguments");
1616
}
@@ -104,5 +104,3 @@ Trust me.";
104104
);
105105
}
106106
}
107-
108-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-12-24-reproduced/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "minigrep"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-12-24-reproduced/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub struct Config {
99
}
1010

1111
impl Config {
12-
pub fn new(args: &[String]) -> Result<Config, &'static str> {
12+
pub fn new(args: &[String]) -> Result<Config, &str> {
1313
if args.len() < 3 {
1414
return Err("not enough arguments");
1515
}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-13/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "iterators"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-14/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "iterators"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-15/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "iterators"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-15/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,3 @@ mod tests {
1414
}
1515
// ANCHOR_END: here
1616
}
17-
18-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-16/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "iterators"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-16/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ mod tests {
1313
}
1414
// ANCHOR_END: here
1515
}
16-
17-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-17/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "iterators"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-17/output.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ cargo run
22
Compiling iterators v0.1.0 (file:///projects/iterators)
3-
warning: unused `std::iter::Map` that must be used
3+
warning: unused `Map` that must be used
44
-- > src/main.rs:4:5
55
|
66
4 | v1.iter().map(|x| x + 1);
@@ -9,5 +9,6 @@ warning: unused `std::iter::Map` that must be used
99
= note: `#[warn(unused_must_use)]` on by default
1010
= note: iterators are lazy and do nothing unless consumed
1111

12+
warning: `iterators` (bin "iterators") generated 1 warning
1213
Finished dev [unoptimized + debuginfo] target(s) in 0.47s
1314
Running `target/debug/iterators`

‎FRENCH/listings-sources/ch13-functional-features/listing-13-18/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "iterators"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-19/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "shoe_size"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-19/src/lib.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ struct Shoe {
44
style: String,
55
}
66

7-
fn shoes_in_my_size(shoes: Vec<Shoe>, shoe_size: u32) -> Vec<Shoe> {
7+
fn shoes_in_size(shoes: Vec<Shoe>, shoe_size: u32) -> Vec<Shoe> {
88
shoes.into_iter().filter(|s| s.size == shoe_size).collect()
99
}
1010

@@ -29,7 +29,7 @@ mod tests {
2929
},
3030
];
3131

32-
let in_my_size = shoes_in_my_size(shoes, 10);
32+
let in_my_size = shoes_in_size(shoes, 10);
3333

3434
assert_eq!(
3535
in_my_size,
@@ -46,5 +46,3 @@ mod tests {
4646
);
4747
}
4848
}
49-
50-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-20/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "counter"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-20/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ impl Counter {
77
Counter { count: 0 }
88
}
99
}
10-
11-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-21/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "counter"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-21/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,3 @@ impl Iterator for Counter {
2222
}
2323
}
2424
// ANCHOR_END: here
25-
26-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-22/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "counter"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-22/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,3 @@ mod tests {
3939
}
4040
// ANCHOR_END: here
4141
}
42-
43-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-23/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "counter"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-23/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,3 @@ mod tests {
4949
}
5050
// ANCHOR_END: here
5151
}
52-
53-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-25/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "minigrep"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-25/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub struct Config {
99
}
1010

1111
impl Config {
12-
pub fn new(args: &[String]) -> Result<Config, &'static str> {
12+
pub fn new(args: &[String]) -> Result<Config, &str> {
1313
if args.len() < 3 {
1414
return Err("not enough arguments");
1515
}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-26/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "minigrep"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-27/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "minigrep"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch13-functional-features/listing-13-27/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,3 @@ Trust me.";
109109
);
110110
}
111111
}
112-
113-
fn main() {}

‎FRENCH/listings-sources/ch13-functional-features/listing-13-29/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "minigrep"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-01/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "my_crate"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-02/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "my_crate"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-03/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "art"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-03/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ pub mod utils {
2727
pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor {
2828
// --snip--
2929
// ANCHOR_END: here
30-
SecondaryColor::Orange
30+
unimplemented!();
3131
// ANCHOR: here
3232
}
3333
}
3434
// ANCHOR_END: here
35-
36-
fn main() {}

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-04/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "art"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-05/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "art"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-06/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "art"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-07/add/add-one/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "add-one"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "add-one"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

‎FRENCH/listings-sources/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
54
edition = "2018"
65

76
[dependencies]

0 commit comments

Comments
 (0)