Update to Rust 1.47

rust-lang · Dec 5, 2020 · 2567c35 · 2567c35
1 parent 4895996
commit 2567c35
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git 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.46 -c rust-docs
- rustup default 1.46
+ rustup toolchain install 1.47 -c rust-docs
+ rustup default 1.47
  - name: Install mdbook
  run: |
  mkdir bin

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
@@ -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 `Здравствуйте`', /rustc/04488afe34512aa4c33566eb16d8c912a3ae04f9/src/libcore/str/mod.rs:1942:47
+thread 'main' panicked at 'byte index 1 is not a char boundary; it is inside 'З' (bytes 0..2) of `Здравствуйте`', src/main.rs:4:14
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git a/listings/ch15-smart-pointers/listing-15-21/output.txt b/listings/ch15-smart-pointers/listing-15-21/output.txt
@@ -14,3 +14,5 @@ For more information about this error, try `rustc --explain E0596`.
 error: could not compile `limit-tracker`.
 
 To learn more, run the command again with --verbose.
+warning: build failed, waiting for other jobs to finish...
+error: build failed
diff --git a/listings/ch15-smart-pointers/listing-15-23/output.txt b/listings/ch15-smart-pointers/listing-15-23/output.txt
@@ -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', /rustc/04488afe34512aa4c33566eb16d8c912a3ae04f9/src/libcore/cell.rs:867:31
+thread 'main' panicked at 'already borrowed: BorrowMutError', src/lib.rs:60:53
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 

diff --git a/listings/ch17-oop/no-listing-01-trait-object-of-clone/output.txt b/listings/ch17-oop/no-listing-01-trait-object-of-clone/output.txt
@@ -1,10 +1,10 @@
 $ cargo build
  Compiling gui v0.1.0 (file:///projects/gui)
 error[E0038]: the trait `std::clone::Clone` cannot be made into an object
- --> src/lib.rs:2:5
+ --> src/lib.rs:2:21
  |
 2 | pub components: Vec<Box<dyn Clone>>,
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone` cannot be made into an object
+ |  ^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone` cannot be made into an object
  |
  = note: the trait cannot be made into an object because it requires `Self: Sized`
 

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.46
+1.47
diff --git 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.46 or later with
+This version of the text assumes you’re using Rust 1.47 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]<!-- ignore -->
 to install or update Rust, and see the new [Appendix E][editions]<!-- ignore