From 0b942f6be831e96087753aa2da61b9060593c10c Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Mon, 19 Jul 2021 08:56:28 -0400 Subject: [PATCH 1/2] Update to Rust 1.53. --- .github/workflows/main.yml | 4 ++-- .../no-listing-01-variables-are-immutable/output.txt | 2 +- .../no-listing-11-ignore-a-test/output.txt | 2 +- listings/ch12-an-io-project/listing-12-16/output.txt | 2 +- listings/ch12-an-io-project/listing-12-19/output.txt | 4 ++-- listings/ch12-an-io-project/listing-12-21/output.txt | 4 ++-- .../no-listing-01-failing-cacher-test/output.txt | 2 +- listings/ch15-smart-pointers/listing-15-23/output.txt | 2 +- rust-toolchain | 2 +- src/title-page.md | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c76a73ae0..e3838345f7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,8 +12,8 @@ jobs: - name: Install Rust run: | rustup set profile minimal - rustup toolchain install 1.52 -c rust-docs - rustup default 1.52 + rustup toolchain install 1.53 -c rust-docs + rustup default 1.53 - name: Install mdbook run: | mkdir bin diff --git a/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt b/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt index 7c2ec5bf78..c74ef3c44a 100644 --- a/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt +++ b/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt @@ -7,7 +7,7 @@ error[E0384]: cannot assign twice to immutable variable `x` | - | | | first assignment to `x` - | help: make this binding mutable: `mut x` + | help: consider making this binding mutable: `mut x` 3 | println!("The value of x is: {}", x); 4 | x = 6; | ^^^^^ cannot assign twice to immutable variable 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 fcdff2517e..8931f0d8e5 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 @@ -7,7 +7,7 @@ running 2 tests test expensive_test ... ignored test it_works ... ok -test result: ok. 1 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 0.00s +test result: ok. 1 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 0.02s Doc-tests adder 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 1c9196e8fe..63ea400f86 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-4672b652f7794785 + Running unittests (target/debug/deps/minigrep-9cd200e5fac0fc94) 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 3699130fd9..176d1b9baf 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-4672b652f7794785 + Running unittests (target/debug/deps/minigrep-9cd200e5fac0fc94) running 1 test test tests::one_result ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s - Running target/debug/deps/minigrep-4672b652f7794785 + Running unittests (target/debug/deps/minigrep-9cd200e5fac0fc94) 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 5b0f7b666f..97ae4a40aa 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-4672b652f7794785 + Running unittests (target/debug/deps/minigrep-9cd200e5fac0fc94) 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; finished in 0.00s - Running target/debug/deps/minigrep-4672b652f7794785 + Running unittests (target/debug/deps/minigrep-9cd200e5fac0fc94) running 0 tests 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 33437ab7cc..c9bda8c11e 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-4116485fb32b3fff + Running unittests (target/debug/deps/cacher-074d7c200c000afa) 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 802dc26092..22c2f79907 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-d1b2637139dca6ca + Running unittests (target/debug/deps/limit_tracker-e599811fa246dbde) running 1 test test tests::it_sends_an_over_75_percent_warning_message ... FAILED diff --git a/rust-toolchain b/rust-toolchain index d96ae405eb..74df8b1698 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.52 +1.53 diff --git a/src/title-page.md b/src/title-page.md index 4760ba98fb..8cb2d68ba5 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.52 or later with +This version of the text assumes you’re using Rust 1.53 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]