Merge main into nyurik:inlinefmt2

.github/workflows/main.yml

@@ -12,8 +12,8 @@ jobs:
     - name: Install Rust
       run: |
         rustup set profile minimal
-        rustup toolchain install 1.67 -c rust-docs
-        rustup default 1.67
+        rustup toolchain install 1.76 -c rust-docs
+        rustup default 1.76
     - name: Install mdbook
       run: |
         mkdir bin

CONTRIBUTING.md

@@ -70,4 +70,4 @@ a new language! We're waiting on [mdbook support] for multiple languages
 before we merge any in, but feel free to start!
 
 [Translations]: https://github.com/rust-lang/book/issues?q=is%3Aopen+is%3Aissue+label%3ATranslations
-[mdbook support]: https://github.com/rust-lang-nursery/mdBook/issues/5
+[mdbook support]: https://github.com/rust-lang/mdBook/issues/5

README.md

@@ -26,11 +26,11 @@ See the [releases] to download just the code of all the code listings that appea
 Building the book requires [mdBook], ideally the same version that
 rust-lang/rust uses in [this file][rust-mdbook]. To get it:
 
-[mdBook]: https://github.com/rust-lang-nursery/mdBook
+[mdBook]: https://github.com/rust-lang/mdBook
 [rust-mdbook]: https://github.com/rust-lang/rust/blob/master/src/tools/rustbook/Cargo.toml
 
 ```bash
-$ cargo install mdbook --version <version_num>
+$ cargo install mdbook --locked --version <version_num>
 ```
 
 ## Building
@@ -93,13 +93,13 @@ a new language! We're waiting on [mdbook support] for multiple languages
 before we merge any in, but feel free to start!
 
 [Translations]: https://github.com/rust-lang/book/issues?q=is%3Aopen+is%3Aissue+label%3ATranslations
-[mdbook support]: https://github.com/rust-lang-nursery/mdBook/issues/5
+[mdbook support]: https://github.com/rust-lang/mdBook/issues/5
 
 ## Spellchecking
 
 To scan source files for spelling errors, you can use the `spellcheck.sh`
 script available in the `ci` directory. It needs a dictionary of valid words,
 which is provided in `ci/dictionary.txt`. If the script produces a false
-positive (say, you used word `BTreeMap` which the script considers invalid),
+positive (say, you used the word `BTreeMap` which the script considers invalid),
 you need to add this word to `ci/dictionary.txt` (keep the sorted order for
 consistency).

ci/dictionary.txt

@@ -35,6 +35,7 @@ backtraces
 BACKTRACE
 Backtraces
 Baz's
+beefeb
 benchmarking
 bioinformatics
 bitand

listings/ch02-guessing-game-tutorial/listing-02-04/output.txt

@@ -11,14 +11,14 @@ error[E0308]: mismatched types
   --> src/main.rs:22:21
    |
 22 |     match guess.cmp(&secret_number) {
-   |                 --- ^^^^^^^^^^^^^^ expected struct `String`, found integer
+   |                 --- ^^^^^^^^^^^^^^ expected `&String`, found `&{integer}`
    |                 |
-   |                 arguments to this function are incorrect
+   |                 arguments to this method are incorrect
    |
    = note: expected reference `&String`
               found reference `&{integer}`
-note: associated function defined here
-  --> /rustc/d5a82bbd26e1ad8b7401f6a718a9c57c96905483/library/core/src/cmp.rs:783:8
+note: method defined here
+  --> /rustc/07dca489ac2d933c78d3c5158e3f43beefeb02ce/library/core/src/cmp.rs:814:8
 
 For more information about this error, try `rustc --explain E0308`.
-error: could not compile `guessing_game` due to previous error
+error: could not compile `guessing_game` (bin "guessing_game") due to 1 previous error

listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/output.txt

@@ -8,6 +8,10 @@ warning: unused `Result` that must be used
    |
    = note: this `Result` may be an `Err` variant, which should be handled
    = note: `#[warn(unused_must_use)]` on by default
+help: use `let _ = ...` to ignore the resulting value
+   |
+10 |     let _ = io::stdin().read_line(&mut guess);
+   |     +++++++
 
 warning: `guessing_game` (bin "guessing_game") generated 1 warning
     Finished dev [unoptimized + debuginfo] target(s) in 0.59s

listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt

@@ -13,4 +13,4 @@ error[E0384]: cannot assign twice to immutable variable `x`
   |     ^^^^^ cannot assign twice to immutable variable
 
 For more information about this error, try `rustc --explain E0384`.
-error: could not compile `variables` due to previous error
+error: could not compile `variables` (bin "variables") due to 1 previous error

listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt

@@ -7,6 +7,12 @@ error[E0308]: mismatched types
   |                      ----- expected due to this value
 3 |     spaces = spaces.len();
   |              ^^^^^^^^^^^^ expected `&str`, found `usize`
+  |
+help: try removing the method call
+  |
+3 -     spaces = spaces.len();
+3 +     spaces = spaces;
+  |
 
 For more information about this error, try `rustc --explain E0308`.
-error: could not compile `variables` due to previous error
+error: could not compile `variables` (bin "variables") due to 1 previous error

listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/output.txt

@@ -5,22 +5,8 @@ error: expected expression, found `let` statement
   |
 2 |     let x = (let y = 6);
   |              ^^^
-
-error: expected expression, found statement (`let`)
- --> src/main.rs:2:14
-  |
-2 |     let x = (let y = 6);
-  |              ^^^^^^^^^
-  |
-  = note: variable declaration using `let` is a statement
-
-error[E0658]: `let` expressions in this position are unstable
- --> src/main.rs:2:14
-  |
-2 |     let x = (let y = 6);
-  |              ^^^^^^^^^
   |
-  = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
+  = note: only supported directly in conditions of `if` and `while` expressions
 
 warning: unnecessary parentheses around assigned value
  --> src/main.rs:2:13
@@ -35,6 +21,5 @@ help: remove these parentheses
 2 +     let x = let y = 6;
   |
 
-For more information about this error, try `rustc --explain E0658`.
 warning: `functions` (bin "functions") generated 1 warning
-error: could not compile `functions` due to 3 previous errors; 1 warning emitted
+error: could not compile `functions` (bin "functions") due to 1 previous error; 1 warning emitted

listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt

@@ -11,4 +11,4 @@ error[E0308]: mismatched types
   |          - help: remove this semicolon to return this value
 
 For more information about this error, try `rustc --explain E0308`.
-error: could not compile `functions` due to previous error
+error: could not compile `functions` (bin "functions") due to 1 previous error

listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt

@@ -7,4 +7,4 @@ error[E0308]: mismatched types
   |        ^^^^^^ expected `bool`, found integer
 
 For more information about this error, try `rustc --explain E0308`.
-error: could not compile `branches` due to previous error
+error: could not compile `branches` (bin "branches") due to 1 previous error

listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt

@@ -9,4 +9,4 @@ error[E0308]: `if` and `else` have incompatible types
   |                                 expected because of this
 
 For more information about this error, try `rustc --explain E0308`.
-error: could not compile `branches` due to previous error
+error: could not compile `branches` (bin "branches") due to 1 previous error

listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/output.txt

@@ -1,15 +1,16 @@
 $ cargo build
    Compiling no_type_annotations v0.1.0 (file:///projects/no_type_annotations)
-error[E0282]: type annotations needed
+error[E0284]: type annotations needed
  --> src/main.rs:2:9
   |
 2 |     let guess = "42".parse().expect("Not a number!");
-  |         ^^^^^
+  |         ^^^^^        ----- type must be known at this point
   |
+  = note: cannot satisfy `<_ as FromStr>::Err == _`
 help: consider giving `guess` an explicit type
   |
-2 |     let guess: _ = "42".parse().expect("Not a number!");
-  |              +++
+2 |     let guess: /* Type */ = "42".parse().expect("Not a number!");
+  |              ++++++++++++
 
-For more information about this error, try `rustc --explain E0282`.
-error: could not compile `no_type_annotations` due to previous error
+For more information about this error, try `rustc --explain E0284`.
+error: could not compile `no_type_annotations` (bin "no_type_annotations") due to 1 previous error

listings/ch04-understanding-ownership/listing-04-06/output.txt

@@ -3,10 +3,13 @@ $ cargo run
 error[E0596]: cannot borrow `*some_string` as mutable, as it is behind a `&` reference
  --> src/main.rs:8:5
   |
-7 | fn change(some_string: &String) {
-  |                        ------- help: consider changing this to be a mutable reference: `&mut String`
 8 |     some_string.push_str(", world");
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `some_string` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+  |     ^^^^^^^^^^^ `some_string` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+  |
+help: consider changing this to be a mutable reference
+  |
+7 | fn change(some_string: &mut String) {
+  |                         +++
 
 For more information about this error, try `rustc --explain E0596`.
-error: could not compile `ownership` due to previous error
+error: could not compile `ownership` (bin "ownership") due to 1 previous error

listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/output.txt

@@ -18,4 +18,4 @@ help: consider cloning the value if the performance cost is acceptable
   |                ++++++++
 
 For more information about this error, try `rustc --explain E0382`.
-error: could not compile `ownership` due to previous error
+error: could not compile `ownership` (bin "ownership") due to 1 previous error

listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/output.txt

@@ -12,4 +12,4 @@ error[E0499]: cannot borrow `s` as mutable more than once at a time
   |                        -- first borrow later used here
 
 For more information about this error, try `rustc --explain E0499`.
-error: could not compile `ownership` due to previous error
+error: could not compile `ownership` (bin "ownership") due to 1 previous error

listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/output.txt

@@ -13,4 +13,4 @@ error[E0502]: cannot borrow `s` as mutable because it is also borrowed as immuta
   |                                -- immutable borrow later used here
 
 For more information about this error, try `rustc --explain E0502`.
-error: could not compile `ownership` due to previous error
+error: could not compile `ownership` (bin "ownership") due to 1 previous error

listings/ch04-understanding-ownership/no-listing-14-dangling-reference/output.txt

@@ -7,10 +7,15 @@ error[E0106]: missing lifetime specifier
   |                ^ expected named lifetime parameter
   |
   = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the `'static` lifetime
+help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
   |
 5 | fn dangle() -> &'static String {
   |                 +++++++
+help: instead, you are more likely to want to return an owned value
+  |
+5 - fn dangle() -> &String {
+5 + fn dangle() -> String {
+  |
 
 For more information about this error, try `rustc --explain E0106`.
-error: could not compile `ownership` due to previous error
+error: could not compile `ownership` (bin "ownership") due to 1 previous error

listings/ch04-understanding-ownership/no-listing-19-slice-error/output.txt

@@ -13,4 +13,4 @@ error[E0502]: cannot borrow `s` as mutable because it is also borrowed as immuta
    |                                       ---- immutable borrow later used here
 
 For more information about this error, try `rustc --explain E0502`.
-error: could not compile `ownership` due to previous error
+error: could not compile `ownership` (bin "ownership") due to 1 previous error

listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt

@@ -11,4 +11,4 @@ error[E0277]: `Rectangle` doesn't implement `std::fmt::Display`
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 For more information about this error, try `rustc --explain E0277`.
-error: could not compile `rectangles` due to previous error
+error: could not compile `rectangles` (bin "rectangles") due to 1 previous error

listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/output.txt

@@ -28,4 +28,4 @@ help: consider introducing a named lifetime parameter
   |
 
 For more information about this error, try `rustc --explain E0106`.
-error: could not compile `structs` due to 2 previous errors
+error: could not compile `structs` (bin "structs") due to 2 previous errors

listings/ch05-using-structs-to-structure-related-data/no-listing-05-dbg-macro/output.txt

@@ -2,8 +2,8 @@ $ cargo run
    Compiling rectangles v0.1.0 (file:///projects/rectangles)
     Finished dev [unoptimized + debuginfo] target(s) in 0.61s
      Running `target/debug/rectangles`
-[src/main.rs:10] 30 * scale = 60
-[src/main.rs:14] &rect1 = Rectangle {
+[src/main.rs:10:16] 30 * scale = 60
+[src/main.rs:14:5] &rect1 = Rectangle {
     width: 60,
     height: 50,
 }

listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/output.txt

@@ -11,8 +11,9 @@ error[E0277]: `Rectangle` doesn't implement `Debug`
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Rectangle` with `#[derive(Debug)]`
    |
-1  | #[derive(Debug)]
+1  + #[derive(Debug)]
+2  | struct Rectangle {
    |
 
 For more information about this error, try `rustc --explain E0277`.
-error: could not compile `rectangles` due to previous error
+error: could not compile `rectangles` (bin "rectangles") due to 1 previous error

listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/output.txt

@@ -8,10 +8,10 @@ error[E0277]: cannot add `Option<i8>` to `i8`
   |
   = help: the trait `Add<Option<i8>>` is not implemented for `i8`
   = help: the following other types implement trait `Add<Rhs>`:
+            <i8 as Add>
+            <i8 as Add<&i8>>
             <&'a i8 as Add<i8>>
             <&i8 as Add<&i8>>
-            <i8 as Add<&i8>>
-            <i8 as Add>
 
 For more information about this error, try `rustc --explain E0277`.
-error: could not compile `enums` due to previous error
+error: could not compile `enums` (bin "enums") due to 1 previous error