From a2bd349f8654f5c45ad1f07394225f946954b8ef Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Mon, 3 Feb 2020 09:18:34 -0500 Subject: [PATCH] Update to Rust 1.41.0 --- .travis.yml | 2 +- .../listing-02-04/output.txt | 4 +- .../output.txt | 5 +- .../output.txt | 5 +- .../output.txt | 5 +- .../output.txt | 5 +- .../output.txt | 2 +- .../listing-09-01/output.txt | 2 +- .../output.txt | 6 +- .../output.txt | 7 +- .../listing-10-07/output.txt | 3 - .../listing-10-17/output.txt | 4 +- .../listing-11-01/output.txt | 2 +- .../listing-11-03/output.txt | 2 +- .../listing-11-06/output.txt | 2 +- .../listing-11-07/output.txt | 2 +- .../listing-11-08/output.txt | 2 +- .../listing-11-10/output.txt | 2 +- .../listing-11-11/output.txt | 2 +- .../listing-11-13/output.txt | 4 +- .../output.txt | 2 +- .../output.txt | 2 +- .../output.txt | 2 +- .../no-listing-04-bug-in-add-two/output.txt | 2 +- .../no-listing-06-greeter-with-bug/output.txt | 2 +- .../output.txt | 2 +- .../no-listing-08-guess-with-bug/output.txt | 2 +- .../output.txt | 6 +- .../no-listing-11-ignore-a-test/output.txt | 2 +- .../output.txt | 6 +- .../output-only-01-show-output/output.txt | 2 +- .../output-only-02-single-test/output.txt | 2 +- .../output-only-03-multiple-tests/output.txt | 2 +- .../output-only-04-running-ignored/output.txt | 2 +- .../output.txt | 2 +- .../listing-12-16/output.txt | 2 +- .../listing-12-19/output.txt | 4 +- .../listing-12-21/output.txt | 4 +- .../listing-13-08/output.txt | 3 - .../output.txt | 2 +- .../listing-15-23/output.txt | 4 +- .../listing-18-05/output.txt | 4 +- .../listing-19-20/output.txt | 6 +- .../no-listing-18-returns-closure/output.txt | 6 +- .../hello_macro/hello_macro_derive/Cargo.lock | 30 +++--- .../output.txt | 4 +- rust-toolchain | 2 +- ...ch09-01-unrecoverable-errors-with-panic.md | 93 ++++++++++--------- src/ch14-03-cargo-workspaces.md | 6 +- src/ch14-04-installing-binaries.md | 2 +- src/ch20-02-multithreaded.md | 8 +- src/ch20-03-graceful-shutdown-and-cleanup.md | 5 +- src/title-page.md | 2 +- 53 files changed, 147 insertions(+), 146 deletions(-) diff --git a/.travis.yml b/.travis.yml index b47a355dee..5221c0edf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ dist: trusty language: rust cache: cargo rust: - - 1.40.0 + - 1.41.0 branches: only: - master diff --git a/listings/ch02-guessing-game-tutorial/listing-02-04/output.txt b/listings/ch02-guessing-game-tutorial/listing-02-04/output.txt index 06ab080e47..d3b62774b6 100644 --- a/listings/ch02-guessing-game-tutorial/listing-02-04/output.txt +++ b/listings/ch02-guessing-game-tutorial/listing-02-04/output.txt @@ -10,8 +10,8 @@ error[E0308]: mismatched types 22 | match guess.cmp(&secret_number) { | ^^^^^^^^^^^^^^ expected struct `std::string::String`, found integer | - = note: expected type `&std::string::String` - found type `&{integer}` + = note: expected reference `&std::string::String` + found reference `&{integer}` error: aborting due to previous error diff --git a/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt b/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt index a8b628a1c5..0f4a7d13a3 100644 --- a/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt +++ b/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt @@ -4,10 +4,7 @@ error[E0308]: mismatched types --> src/main.rs:3:14 | 3 | spaces = spaces.len(); - | ^^^^^^^^^^^^ expected &str, found usize - | - = note: expected type `&str` - found type `usize` + | ^^^^^^^^^^^^ expected `&str`, found `usize` error: aborting due to previous error diff --git a/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt b/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt index 3104740410..1c80331541 100644 --- a/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt +++ b/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt @@ -4,14 +4,11 @@ error[E0308]: mismatched types --> src/main.rs:7:24 | 7 | fn plus_one(x: i32) -> i32 { - | -------- ^^^ expected i32, found () + | -------- ^^^ expected `i32`, found `()` | | | implicitly returns `()` as its body has no tail or `return` expression 8 | x + 1; | - help: consider removing this semicolon - | - = note: expected type `i32` - found type `()` error: aborting due to previous error diff --git a/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt b/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt index 304f3140a8..b3442affe0 100644 --- a/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt +++ b/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt @@ -4,10 +4,7 @@ error[E0308]: mismatched types --> src/main.rs:4:8 | 4 | if number { - | ^^^^^^ expected bool, found integer - | - = note: expected type `bool` - found type `{integer}` + | ^^^^^^ expected `bool`, found integer error: aborting due to previous error diff --git a/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt b/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt index db77c62744..f47a2a8067 100644 --- a/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt +++ b/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt @@ -4,12 +4,9 @@ error[E0308]: if and else have incompatible types --> src/main.rs:4:44 | 4 | let number = if condition { 5 } else { "six" }; - | - ^^^^^ expected integer, found &str + | - ^^^^^ expected integer, found `&str` | | | expected because of this - | - = note: expected type `{integer}` - found type `&str` error: aborting due to previous error diff --git a/listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt b/listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt index 1c9c2b110d..e05d332339 100644 --- a/listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt +++ b/listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt @@ -2,5 +2,5 @@ $ cargo run Compiling collections v0.1.0 (file:///projects/collections) Finished dev [unoptimized + debuginfo] target(s) in 0.43s Running `target/debug/collections` -thread 'main' panicked at 'byte index 1 is not a char boundary; it is inside 'З' (bytes 0..2) of `Здравствуйте`', src/libcore/str/mod.rs:2068:5 +thread 'main' panicked at 'byte index 1 is not a char boundary; it is inside 'З' (bytes 0..2) of `Здравствуйте`', src/libcore/str/mod.rs:2069:5 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. diff --git a/listings/ch09-error-handling/listing-09-01/output.txt b/listings/ch09-error-handling/listing-09-01/output.txt index b1e324eced..36aef5049e 100644 --- a/listings/ch09-error-handling/listing-09-01/output.txt +++ b/listings/ch09-error-handling/listing-09-01/output.txt @@ -2,5 +2,5 @@ $ cargo run Compiling panic v0.1.0 (file:///projects/panic) Finished dev [unoptimized + debuginfo] target(s) in 0.27s Running `target/debug/panic` -thread 'main' panicked at 'index out of bounds: the len is 3 but the index is 99', /rustc/73528e339aae0f17a15ffa49a8ac608f50c6cf14/src/libcore/slice/mod.rs:2796:10 +thread 'main' panicked at 'index out of bounds: the len is 3 but the index is 99', /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libcore/slice/mod.rs:2806:10 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. diff --git a/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt b/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt index 812eac2e23..18262cbc40 100644 --- a/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt +++ b/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt @@ -4,10 +4,12 @@ error[E0308]: mismatched types --> src/main.rs:4:18 | 4 | let f: u32 = File::open("hello.txt"); - | ^^^^^^^^^^^^^^^^^^^^^^^ expected u32, found enum `std::result::Result` + | --- ^^^^^^^^^^^^^^^^^^^^^^^ expected `u32`, found enum `std::result::Result` + | | + | expected due to this | = note: expected type `u32` - found type `std::result::Result` + found enum `std::result::Result` error: aborting due to previous error diff --git a/listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt b/listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt index f8688192ae..17a8b2e476 100644 --- a/listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt +++ b/listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt @@ -3,8 +3,11 @@ $ cargo run error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`) --> src/main.rs:4:13 | -4 | let f = File::open("hello.txt")?; - | ^^^^^^^^^^^^^^^^^^^^^^^^ cannot use the `?` operator in a function that returns `()` +3 | / fn main() { +4 | | let f = File::open("hello.txt")?; + | | ^^^^^^^^^^^^^^^^^^^^^^^^ cannot use the `?` operator in a function that returns `()` +5 | | } + | |_- this function should return `Result` or `Option` to accept `?` | = help: the trait `std::ops::Try` is not implemented for `()` = note: required by `std::ops::Try::from_error` diff --git a/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt b/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt index dce3be8c50..4a67e1b595 100644 --- a/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt +++ b/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt @@ -5,9 +5,6 @@ error[E0308]: mismatched types | 7 | let wont_work = Point { x: 5, y: 4.0 }; | ^^^ expected integer, found floating-point number - | - = note: expected type `{integer}` - found type `{float}` error: aborting due to previous error diff --git a/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt b/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt index d6364c3c1c..5f9b71b0bf 100644 --- a/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt +++ b/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt @@ -1,10 +1,10 @@ $ cargo run Compiling chapter10 v0.1.0 (file:///projects/chapter10) error[E0597]: `x` does not live long enough - --> src/main.rs:7:13 + --> src/main.rs:7:17 | 7 | r = &x; - | ^^^^^^ borrowed value does not live long enough + | ^^ borrowed value does not live long enough 8 | } | - `x` dropped here while still borrowed 9 | diff --git a/listings/ch11-writing-automated-tests/listing-11-01/output.txt b/listings/ch11-writing-automated-tests/listing-11-01/output.txt index b56a40a1f4..aa4b0990db 100644 --- a/listings/ch11-writing-automated-tests/listing-11-01/output.txt +++ b/listings/ch11-writing-automated-tests/listing-11-01/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.57s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 1 test test tests::it_works ... ok diff --git a/listings/ch11-writing-automated-tests/listing-11-03/output.txt b/listings/ch11-writing-automated-tests/listing-11-03/output.txt index bc6a905b25..c39456f818 100644 --- a/listings/ch11-writing-automated-tests/listing-11-03/output.txt +++ b/listings/ch11-writing-automated-tests/listing-11-03/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.72s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 2 tests test tests::another ... FAILED diff --git a/listings/ch11-writing-automated-tests/listing-11-06/output.txt b/listings/ch11-writing-automated-tests/listing-11-06/output.txt index 337878eb22..241997c15a 100644 --- a/listings/ch11-writing-automated-tests/listing-11-06/output.txt +++ b/listings/ch11-writing-automated-tests/listing-11-06/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling rectangle v0.1.0 (file:///projects/rectangle) Finished test [unoptimized + debuginfo] target(s) in 0.66s - Running target/debug/deps/rectangle-6fe0c0eff9a70690 + Running target/debug/deps/rectangle-6584c4561e48942e running 1 test test tests::larger_can_hold_smaller ... ok diff --git a/listings/ch11-writing-automated-tests/listing-11-07/output.txt b/listings/ch11-writing-automated-tests/listing-11-07/output.txt index 548ab756ba..dc1a5212e7 100644 --- a/listings/ch11-writing-automated-tests/listing-11-07/output.txt +++ b/listings/ch11-writing-automated-tests/listing-11-07/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.58s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 1 test test tests::it_adds_two ... ok diff --git a/listings/ch11-writing-automated-tests/listing-11-08/output.txt b/listings/ch11-writing-automated-tests/listing-11-08/output.txt index 09c8d9e4bd..47a50f7e1c 100644 --- a/listings/ch11-writing-automated-tests/listing-11-08/output.txt +++ b/listings/ch11-writing-automated-tests/listing-11-08/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling guessing_game v0.1.0 (file:///projects/guessing_game) Finished test [unoptimized + debuginfo] target(s) in 0.58s - Running target/debug/deps/guessing_game-1bf5eca04a7d401d + Running target/debug/deps/guessing_game-57d70c3acb738f4d running 1 test test tests::greater_than_100 ... ok diff --git a/listings/ch11-writing-automated-tests/listing-11-10/output.txt b/listings/ch11-writing-automated-tests/listing-11-10/output.txt index 3f1af78bf9..1621d796b0 100644 --- a/listings/ch11-writing-automated-tests/listing-11-10/output.txt +++ b/listings/ch11-writing-automated-tests/listing-11-10/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling silly-function v0.1.0 (file:///projects/silly-function) Finished test [unoptimized + debuginfo] target(s) in 0.58s - Running target/debug/deps/silly_function-b02a4796f0aeb021 + Running target/debug/deps/silly_function-160869f38cff9166 running 2 tests test tests::this_test_will_fail ... FAILED diff --git a/listings/ch11-writing-automated-tests/listing-11-11/output.txt b/listings/ch11-writing-automated-tests/listing-11-11/output.txt index 7e48f1c502..59feae3241 100644 --- a/listings/ch11-writing-automated-tests/listing-11-11/output.txt +++ b/listings/ch11-writing-automated-tests/listing-11-11/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.62s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 3 tests test tests::add_three_and_two ... ok diff --git a/listings/ch11-writing-automated-tests/listing-11-13/output.txt b/listings/ch11-writing-automated-tests/listing-11-13/output.txt index 7648a5e039..e213b9c38d 100644 --- a/listings/ch11-writing-automated-tests/listing-11-13/output.txt +++ b/listings/ch11-writing-automated-tests/listing-11-13/output.txt @@ -1,14 +1,14 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.73s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 1 test test tests::internal ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out - Running target/debug/deps/integration_test-60fcbc66f73b2933 + Running target/debug/deps/integration_test-82e7799c1bc62298 running 1 test test it_adds_two ... ok diff --git a/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt b/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt index bf2e1a8fe6..0f287fc564 100644 --- a/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.59s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 1 test test tests::exploration ... ok diff --git a/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt b/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt index 222bd99e47..e95f4727e0 100644 --- a/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling rectangle v0.1.0 (file:///projects/rectangle) Finished test [unoptimized + debuginfo] target(s) in 0.66s - Running target/debug/deps/rectangle-6fe0c0eff9a70690 + Running target/debug/deps/rectangle-6584c4561e48942e running 2 tests test tests::larger_can_hold_smaller ... ok diff --git a/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt b/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt index 04913446b7..8f050a252d 100644 --- a/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling rectangle v0.1.0 (file:///projects/rectangle) Finished test [unoptimized + debuginfo] target(s) in 0.66s - Running target/debug/deps/rectangle-6fe0c0eff9a70690 + Running target/debug/deps/rectangle-6584c4561e48942e running 2 tests test tests::larger_can_hold_smaller ... FAILED diff --git a/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt b/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt index 6b51b3980a..7fb67743eb 100644 --- a/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.61s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 1 test test tests::it_adds_two ... FAILED diff --git a/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt b/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt index f7b6e9b4fa..8f832a7432 100644 --- a/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling greeter v0.1.0 (file:///projects/greeter) Finished test [unoptimized + debuginfo] target(s) in 0.91s - Running target/debug/deps/greeter-01c2d86f487c60e6 + Running target/debug/deps/greeter-170b942eb5bf5e3a running 1 test test tests::greeting_contains_name ... FAILED diff --git a/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt b/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt index a30b0cd77c..c3a735e4d4 100644 --- a/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling greeter v0.1.0 (file:///projects/greeter) Finished test [unoptimized + debuginfo] target(s) in 0.93s - Running target/debug/deps/greeter-01c2d86f487c60e6 + Running target/debug/deps/greeter-170b942eb5bf5e3a running 1 test test tests::greeting_contains_name ... FAILED diff --git a/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt b/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt index 33a78e4936..c9a4fda931 100644 --- a/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling guessing_game v0.1.0 (file:///projects/guessing_game) Finished test [unoptimized + debuginfo] target(s) in 0.62s - Running target/debug/deps/guessing_game-1bf5eca04a7d401d + Running target/debug/deps/guessing_game-57d70c3acb738f4d running 1 test test tests::greater_than_100 ... FAILED diff --git a/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt b/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt index 3ffee55b33..f2b8ffc7c3 100644 --- a/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling guessing_game v0.1.0 (file:///projects/guessing_game) Finished test [unoptimized + debuginfo] target(s) in 0.66s - Running target/debug/deps/guessing_game-1bf5eca04a7d401d + Running target/debug/deps/guessing_game-57d70c3acb738f4d running 1 test test tests::greater_than_100 ... FAILED @@ -11,7 +11,9 @@ failures: ---- tests::greater_than_100 stdout ---- thread 'main' panicked at 'Guess value must be greater than or equal to 1, got 200.', src/lib.rs:13:13 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. -note: panic did not include expected string 'Guess value must be less than or equal to 100' +note: panic did not contain expected string + panic message: `"Guess value must be greater than or equal to 1, got 200."`, + expected substring: `"Guess value must be less than or equal to 100"` failures: tests::greater_than_100 diff --git a/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt b/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt index 68c129b373..8cf7475c5e 100644 --- a/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.60s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 2 tests test expensive_test ... ignored diff --git a/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt b/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt index a826703a95..0637a1068f 100644 --- a/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt +++ b/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt @@ -1,20 +1,20 @@ $ cargo test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.89s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 1 test test tests::internal ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out - Running target/debug/deps/common-a282abfe78e5b141 + Running target/debug/deps/common-7064e1b6d2e271be running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out - Running target/debug/deps/integration_test-60fcbc66f73b2933 + Running target/debug/deps/integration_test-82e7799c1bc62298 running 1 test test it_adds_two ... ok diff --git a/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt b/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt index c1df21359c..901df6ae63 100644 --- a/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt +++ b/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt @@ -1,7 +1,7 @@ $ cargo test -- --show-output Compiling silly-function v0.1.0 (file:///projects/silly-function) Finished test [unoptimized + debuginfo] target(s) in 0.60s - Running target/debug/deps/silly_function-b02a4796f0aeb021 + Running target/debug/deps/silly_function-160869f38cff9166 running 2 tests test tests::this_test_will_fail ... FAILED diff --git a/listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt b/listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt index 6e715ff85c..9284de3d4f 100644 --- a/listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt +++ b/listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt @@ -1,7 +1,7 @@ $ cargo test one_hundred Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.69s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 1 test test tests::one_hundred ... ok diff --git a/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt b/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt index db56677605..76c2c170df 100644 --- a/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt +++ b/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt @@ -1,7 +1,7 @@ $ cargo test add Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.61s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 2 tests test tests::add_three_and_two ... ok diff --git a/listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt b/listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt index 3c30e01677..6bddfdb820 100644 --- a/listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt +++ b/listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt @@ -1,7 +1,7 @@ $ cargo test -- --ignored Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.61s - Running target/debug/deps/adder-076f0528706a8604 + Running target/debug/deps/adder-92948b65e88960b4 running 1 test test expensive_test ... ok diff --git a/listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt b/listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt index b95c2681d1..dd915c35c1 100644 --- a/listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt +++ b/listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt @@ -1,7 +1,7 @@ $ cargo test --test integration_test Compiling adder v0.1.0 (file:///projects/adder) Finished test [unoptimized + debuginfo] target(s) in 0.64s - Running target/debug/deps/integration_test-60fcbc66f73b2933 + Running target/debug/deps/integration_test-82e7799c1bc62298 running 1 test test it_adds_two ... ok diff --git a/listings/ch12-an-io-project/listing-12-16/output.txt b/listings/ch12-an-io-project/listing-12-16/output.txt index bc28612298..a7a676ec3d 100644 --- a/listings/ch12-an-io-project/listing-12-16/output.txt +++ b/listings/ch12-an-io-project/listing-12-16/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling minigrep v0.1.0 (file:///projects/minigrep) Finished test [unoptimized + debuginfo] target(s) in 0.97s - Running target/debug/deps/minigrep-7003bffd2dda3b01 + Running target/debug/deps/minigrep-4672b652f7794785 running 1 test test tests::one_result ... FAILED diff --git a/listings/ch12-an-io-project/listing-12-19/output.txt b/listings/ch12-an-io-project/listing-12-19/output.txt index aa679d9c26..fa1490152a 100644 --- a/listings/ch12-an-io-project/listing-12-19/output.txt +++ b/listings/ch12-an-io-project/listing-12-19/output.txt @@ -1,14 +1,14 @@ $ cargo test Compiling minigrep v0.1.0 (file:///projects/minigrep) Finished test [unoptimized + debuginfo] target(s) in 1.22s - Running target/debug/deps/minigrep-7003bffd2dda3b01 + Running target/debug/deps/minigrep-4672b652f7794785 running 1 test test tests::one_result ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out - Running target/debug/deps/minigrep-bf1f738c1c9dea06 + Running target/debug/deps/minigrep-caf9dbee196c78b9 running 0 tests diff --git a/listings/ch12-an-io-project/listing-12-21/output.txt b/listings/ch12-an-io-project/listing-12-21/output.txt index 5d3cfcc6fc..3d7cf26d1f 100644 --- a/listings/ch12-an-io-project/listing-12-21/output.txt +++ b/listings/ch12-an-io-project/listing-12-21/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling minigrep v0.1.0 (file:///projects/minigrep) Finished test [unoptimized + debuginfo] target(s) in 1.33s - Running target/debug/deps/minigrep-7003bffd2dda3b01 + Running target/debug/deps/minigrep-4672b652f7794785 running 2 tests test tests::case_insensitive ... ok @@ -9,7 +9,7 @@ test tests::case_sensitive ... ok test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out - Running target/debug/deps/minigrep-bf1f738c1c9dea06 + Running target/debug/deps/minigrep-caf9dbee196c78b9 running 0 tests diff --git a/listings/ch13-functional-features/listing-13-08/output.txt b/listings/ch13-functional-features/listing-13-08/output.txt index ad266adaca..d859957f21 100644 --- a/listings/ch13-functional-features/listing-13-08/output.txt +++ b/listings/ch13-functional-features/listing-13-08/output.txt @@ -8,9 +8,6 @@ error[E0308]: mismatched types | | | expected struct `std::string::String`, found integer | help: try using a conversion method: `5.to_string()` - | - = note: expected type `std::string::String` - found type `{integer}` error: aborting due to previous error diff --git a/listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt b/listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt index 9f904f83fa..378a614d4e 100644 --- a/listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt +++ b/listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling cacher v0.1.0 (file:///projects/cacher) Finished test [unoptimized + debuginfo] target(s) in 0.72s - Running target/debug/deps/cacher-35748700da794293 + Running target/debug/deps/cacher-4116485fb32b3fff running 1 test test tests::call_with_different_values ... FAILED diff --git a/listings/ch15-smart-pointers/listing-15-23/output.txt b/listings/ch15-smart-pointers/listing-15-23/output.txt index a60385bac1..9d69d439c7 100644 --- a/listings/ch15-smart-pointers/listing-15-23/output.txt +++ b/listings/ch15-smart-pointers/listing-15-23/output.txt @@ -1,7 +1,7 @@ $ cargo test Compiling limit-tracker v0.1.0 (file:///projects/limit-tracker) Finished test [unoptimized + debuginfo] target(s) in 0.91s - Running target/debug/deps/limit_tracker-6c079de0866a6d36 + Running target/debug/deps/limit_tracker-d1b2637139dca6ca running 1 test test tests::it_sends_an_over_75_percent_warning_message ... FAILED @@ -9,7 +9,7 @@ test tests::it_sends_an_over_75_percent_warning_message ... FAILED failures: ---- tests::it_sends_an_over_75_percent_warning_message stdout ---- -thread 'main' panicked at 'already borrowed: BorrowMutError', src/libcore/result.rs:1165:5 +thread 'main' panicked at 'already borrowed: BorrowMutError', src/libcore/result.rs:1188:5 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. diff --git a/listings/ch18-patterns-and-matching/listing-18-05/output.txt b/listings/ch18-patterns-and-matching/listing-18-05/output.txt index 0672793804..eae835e37c 100644 --- a/listings/ch18-patterns-and-matching/listing-18-05/output.txt +++ b/listings/ch18-patterns-and-matching/listing-18-05/output.txt @@ -6,8 +6,8 @@ error[E0308]: mismatched types 2 | let (x, y) = (1, 2, 3); | ^^^^^^ expected a tuple with 3 elements, found one with 2 elements | - = note: expected type `({integer}, {integer}, {integer})` - found type `(_, _)` + = note: expected tuple `({integer}, {integer}, {integer})` + found tuple `(_, _)` error: aborting due to previous error diff --git a/listings/ch19-advanced-features/listing-19-20/output.txt b/listings/ch19-advanced-features/listing-19-20/output.txt index b810f4e8df..46c7dafa0a 100644 --- a/listings/ch19-advanced-features/listing-19-20/output.txt +++ b/listings/ch19-advanced-features/listing-19-20/output.txt @@ -1,13 +1,15 @@ $ cargo run Compiling traits-example v0.1.0 (file:///projects/traits-example) -error[E0283]: type annotations needed: cannot resolve `_: Animal` +error[E0283]: type annotations needed --> src/main.rs:20:43 | 2 | fn baby_name() -> String; | ------------------------- required by `Animal::baby_name` ... 20 | println!("A baby dog is called a {}", Animal::baby_name()); - | ^^^^^^^^^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^ cannot infer type + | + = note: cannot resolve `_: Animal` error: aborting due to previous error diff --git a/listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt b/listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt index e315cbc5f0..2d4be9b0a3 100644 --- a/listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt +++ b/listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt @@ -16,10 +16,10 @@ error[E0308]: mismatched types 1 | fn returns_closure() -> dyn Fn(i32) -> i32 { | ------------------ expected `(dyn std::ops::Fn(i32) -> i32 + 'static)` because of return type 2 | |x| x + 1 - | ^^^^^^^^^ expected trait std::ops::Fn, found closure + | ^^^^^^^^^ expected trait `std::ops::Fn`, found closure | - = note: expected type `(dyn std::ops::Fn(i32) -> i32 + 'static)` - found type `[closure@src/lib.rs:2:5: 2:14]` + = note: expected trait object `(dyn std::ops::Fn(i32) -> i32 + 'static)` + found closure `[closure@src/lib.rs:2:5: 2:14]` error: aborting due to 2 previous errors diff --git a/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.lock b/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.lock index d6a2f84a96..9a38c8ac26 100644 --- a/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.lock +++ b/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.lock @@ -4,43 +4,43 @@ name = "hello_macro_derive" version = "0.1.0" dependencies = [ - "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "proc-macro2" -version = "0.4.29" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quote" -version = "0.6.12" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syn" -version = "0.14.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "unicode-xid" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] -"checksum proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)" = "64c827cea7a7ab30ce4593e5e04d7a11617ad6ece2fa230605a78b00ff965316" -"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" -"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741" -"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" +"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" +"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" diff --git a/listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt b/listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt index 87971b2085..91907cf79a 100644 --- a/listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt +++ b/listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt @@ -15,8 +15,8 @@ error[E0308]: mismatched types | expected enum `std::option::Option`, found struct `std::thread::JoinHandle` | help: try using a variant of the expected enum: `Some(thread)` | - = note: expected type `std::option::Option>` - found type `std::thread::JoinHandle<_>` + = note: expected enum `std::option::Option>` + found struct `std::thread::JoinHandle<_>` error: aborting due to 2 previous errors diff --git a/rust-toolchain b/rust-toolchain index 32b7211cb6..7d47e59980 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.40.0 +1.41.0 diff --git a/src/ch09-01-unrecoverable-errors-with-panic.md b/src/ch09-01-unrecoverable-errors-with-panic.md index e8937366a7..e677281038 100644 --- a/src/ch09-01-unrecoverable-errors-with-panic.md +++ b/src/ch09-01-unrecoverable-errors-with-panic.md @@ -116,53 +116,60 @@ check the backtrace number mentioned in the text below the listing ```text $ RUST_BACKTRACE=1 cargo run -thread 'main' panicked at 'index out of bounds: the len is 3 but the index is 99', /rustc/625451e376bb2e5283fc4741caa0a3e8a2ca4d54/src/libcore/slice/mod.rs:2715:10 +thread 'main' panicked at 'index out of bounds: the len is 3 but the index is 99', /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libcore/slice/mod.rs:2806:10 stack backtrace: 0: backtrace::backtrace::libunwind::trace - at /Users/vsts/.cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.34/src/backtrace/libunwind.rs:88 + at /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.40/src/backtrace/libunwind.rs:88 1: backtrace::backtrace::trace_unsynchronized - at /Users/vsts/.cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.34/src/backtrace/mod.rs:66 - 2: std::sys_common::backtrace::_print - at src/libstd/sys_common/backtrace.rs:47 - 3: std::sys_common::backtrace::print - at src/libstd/sys_common/backtrace.rs:36 - 4: std::panicking::default_hook::{{closure}} - at src/libstd/panicking.rs:200 - 5: std::panicking::default_hook - at src/libstd/panicking.rs:214 - 6: std::panicking::rust_panic_with_hook - at src/libstd/panicking.rs:477 - 7: std::panicking::continue_panic_fmt - at src/libstd/panicking.rs:384 - 8: rust_begin_unwind - at src/libstd/panicking.rs:311 - 9: std::panicking::begin_panic - 10: std::panicking::begin_panic - 11: >::index - at /rustc/625451e376bb2e5283fc4741caa0a3e8a2ca4d54/src/libcore/slice/mod.rs:2715 - 12: core::slice:: for [T]>::index - at /rustc/625451e376bb2e5283fc4741caa0a3e8a2ca4d54/src/libcore/slice/mod.rs:2566 - 13: as core::ops::index::Index>::index - at /rustc/625451e376bb2e5283fc4741caa0a3e8a2ca4d54/src/liballoc/vec.rs:1791 - 14: panic::main + at /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.40/src/backtrace/mod.rs:66 + 2: std::sys_common::backtrace::_print_fmt + at src/libstd/sys_common/backtrace.rs:84 + 3: ::fmt + at src/libstd/sys_common/backtrace.rs:61 + 4: core::fmt::ArgumentV1::show_usize + 5: std::io::Write::write_fmt + at src/libstd/io/mod.rs:1426 + 6: std::sys_common::backtrace::_print + at src/libstd/sys_common/backtrace.rs:65 + 7: std::sys_common::backtrace::print + at src/libstd/sys_common/backtrace.rs:50 + 8: std::panicking::default_hook::{{closure}} + at src/libstd/panicking.rs:193 + 9: std::panicking::default_hook + at src/libstd/panicking.rs:210 + 10: std::panicking::rust_panic_with_hook + at src/libstd/panicking.rs:471 + 11: rust_begin_unwind + at src/libstd/panicking.rs:375 + 12: core::panicking::panic_fmt + at src/libcore/panicking.rs:84 + 13: core::panicking::panic_bounds_check + at src/libcore/panicking.rs:62 + 14: >::index + at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libcore/slice/mod.rs:2806 + 15: core::slice:: for [T]>::index + at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libcore/slice/mod.rs:2657 + 16: as core::ops::index::Index>::index + at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/liballoc/vec.rs:1871 + 17: panic::main at src/main.rs:4 - 15: std::rt::lang_start::{{closure}} - at /rustc/625451e376bb2e5283fc4741caa0a3e8a2ca4d54/src/libstd/rt.rs:64 - 16: std::rt::lang_start_internal::{{closure}} - at src/libstd/rt.rs:49 - 17: std::panicking::try::do_call - at src/libstd/panicking.rs:296 - 18: __rust_maybe_catch_panic - at src/libpanic_unwind/lib.rs:80 - 19: std::panicking::try - at src/libstd/panicking.rs:275 - 20: std::panic::catch_unwind + 18: std::rt::lang_start::{{closure}} + at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libstd/rt.rs:67 + 19: std::rt::lang_start_internal::{{closure}} + at src/libstd/rt.rs:52 + 20: std::panicking::try::do_call + at src/libstd/panicking.rs:292 + 21: __rust_maybe_catch_panic + at src/libpanic_unwind/lib.rs:78 + 22: std::panicking::try + at src/libstd/panicking.rs:270 + 23: std::panic::catch_unwind at src/libstd/panic.rs:394 - 21: std::rt::lang_start_internal - at src/libstd/rt.rs:48 - 22: std::rt::lang_start - at /rustc/625451e376bb2e5283fc4741caa0a3e8a2ca4d54/src/libstd/rt.rs:64 - 23: panic::main + 24: std::rt::lang_start_internal + at src/libstd/rt.rs:51 + 25: std::rt::lang_start + at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libstd/rt.rs:67 + 26: panic::main ``` Listing 9-2: The backtrace generated by a call to @@ -174,7 +181,7 @@ information, debug symbols must be enabled. Debug symbols are enabled by default when using `cargo build` or `cargo run` without the `--release` flag, as we have here. -In the output in Listing 9-2, line 14 of the backtrace points to the line in +In the output in Listing 9-2, line 17 of the backtrace points to the line in our project that’s causing the problem: line 4 of *src/main.rs*. If we don’t want our program to panic, the location pointed to by the first line mentioning a file we wrote is where we should start investigating. In Listing 9-1, where diff --git a/src/ch14-03-cargo-workspaces.md b/src/ch14-03-cargo-workspaces.md index fb8b756610..6054c734c0 100644 --- a/src/ch14-03-cargo-workspaces.md +++ b/src/ch14-03-cargo-workspaces.md @@ -288,7 +288,7 @@ copy output below; the output updating script doesn't handle subdirectories in p $ cargo test Compiling add-one v0.1.0 (file:///projects/add/add-one) Compiling adder v0.1.0 (file:///projects/add/adder) - Finished dev [unoptimized + debuginfo] target(s) in 0.27s + Finished test [unoptimized + debuginfo] target(s) in 0.27s Running target/debug/deps/add_one-f0253159197f7841 running 1 test @@ -296,7 +296,7 @@ test tests::it_works ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out - Running target/debug/deps/adder-6b04971c46fc224f + Running target/debug/deps/adder-49979ff40686fa8e running 0 tests @@ -327,7 +327,7 @@ copy output below; the output updating script doesn't handle subdirectories in p ```text $ cargo test -p add-one - Finished dev [unoptimized + debuginfo] target(s) in 0.00s + Finished test [unoptimized + debuginfo] target(s) in 0.00s Running target/debug/deps/add_one-b3235fea9a156f74 running 1 test diff --git a/src/ch14-04-installing-binaries.md b/src/ch14-04-installing-binaries.md index cd21123029..6b2f58ba8c 100644 --- a/src/ch14-04-installing-binaries.md +++ b/src/ch14-04-installing-binaries.md @@ -33,7 +33,7 @@ $ cargo install ripgrep Installing ripgrep v11.0.2 --snip-- Compiling ripgrep v11.0.2 - Finished release [optimized + debuginfo] target(s) in 3m 10s + Finished release [optimized] target(s) in 3m 10s Installing ~/.cargo/bin/rg Installed package `ripgrep v11.0.2` (executable `rg`) ``` diff --git a/src/ch20-02-multithreaded.md b/src/ch20-02-multithreaded.md index c0b09297e7..c0731d214c 100644 --- a/src/ch20-02-multithreaded.md +++ b/src/ch20-02-multithreaded.md @@ -596,7 +596,7 @@ Can't automate because the output depends on making requests ```text $ cargo run Compiling hello v0.1.0 (file:///projects/hello) -warning: field is never used: `workers` +warning: field is never read: `workers` --> src/lib.rs:7:5 | 7 | workers: Vec, @@ -604,19 +604,19 @@ warning: field is never used: `workers` | = note: `#[warn(dead_code)]` on by default -warning: field is never used: `id` +warning: field is never read: `id` --> src/lib.rs:48:5 | 48 | id: usize, | ^^^^^^^^^ -warning: field is never used: `thread` +warning: field is never read: `thread` --> src/lib.rs:49:5 | 49 | thread: thread::JoinHandle<()>, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Finished dev [unoptimized + debuginfo] target(s) in 1.66s + Finished dev [unoptimized + debuginfo] target(s) in 1.40s Running `target/debug/main` Worker 0 got a job; executing. Worker 2 got a job; executing. diff --git a/src/ch20-03-graceful-shutdown-and-cleanup.md b/src/ch20-03-graceful-shutdown-and-cleanup.md index fe80857d64..13df0492a4 100644 --- a/src/ch20-03-graceful-shutdown-and-cleanup.md +++ b/src/ch20-03-graceful-shutdown-and-cleanup.md @@ -202,8 +202,11 @@ should error, and in your terminal you should see output similar to this: diff --git a/src/title-page.md b/src/title-page.md index 53a4ab76ff..c1cb567109 100644 --- a/src/title-page.md +++ b/src/title-page.md @@ -2,7 +2,7 @@ *by Steve Klabnik and Carol Nichols, with contributions from the Rust Community* -This version of the text assumes you’re using Rust 1.40.0 or later with +This version of the text assumes you’re using Rust 1.41.0 or later with `edition="2018"` in *Cargo.toml* of all projects to use Rust 2018 Edition idioms. See the [“Installation” section of Chapter 1][install] to install or update Rust, and see the new [Appendix E][editions]