Merge remote-tracking branch 'upstream/main' into french-release

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,13 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+- [ ] I have checked the latest `main` branch to see if this has already been fixed
+- [ ] I have searched existing issues and pull requests for duplicates
+
+URL to the section(s) of the book with this problem:
+
+Description of the problem:
+
+Suggested fix:

.github/ISSUE_TEMPLATE/new_translation.md

@@ -0,0 +1,7 @@
+---
+name: New translation
+about: Let us know of a new language translation you're working on
+---
+
+Language your translation is for:
+URL to the repo where you're working:

.github/workflows/main.yml

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

CONTRIBUTING.md

@@ -13,13 +13,19 @@ repository.
 The Rust project has [a code of conduct](http://rust-lang.org/policies/code-of-conduct)
 that governs all sub-projects, including this one. Please respect it!
 
-## Review
-
-Our [open pull requests][pulls] are new chapters or edits that we're
-currently working on. We would love if you would read through those and make
-comments for any suggestions or corrections!
-
-[pulls]: https://github.com/rust-lang/book/pulls
+## Expectations
+
+Because the book is [printed](https://nostarch.com/rust), and because we want
+to keep the online version of the book close to the print version when
+possible, it may take longer than you're used to for us to address your issue
+or pull request.
+
+So far, we've been doing a larger revision to coincide with [Rust
+Editions](https://doc.rust-lang.org/edition-guide/). Between those larger
+revisions, we will only be correcting errors. If your issue or pull request
+isn't strictly fixing an error, it might sit until the next time that we're
+working on a large revision: expect on the order of months or years. Thank you
+for your patience!
 
 ## Help wanted
 

COPYRIGHT

@@ -11,8 +11,8 @@ Developers.
 
 Licensed under the Apache License, Version 2.0
 <LICENSE-APACHE or
-http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
+https://www.apache.org/licenses/LICENSE-2.0> or the MIT
+license <LICENSE-MIT or https://opensource.org/licenses/MIT>,
 at your option. All files in the project carrying such
 notice may not be copied, modified, or distributed except
 according to those terms.
@@ -39,7 +39,7 @@ their own copyright notices and license terms:
 
         University of Illinois at Urbana-Champaign
 
-        http://llvm.org
+        https://llvm.org
 
     Permission is hereby granted, free of charge, to any
     person obtaining a copy of this software and associated
@@ -95,7 +95,7 @@ their own copyright notices and license terms:
 
         University of Illinois at Urbana-Champaign
 
-        http://llvm.org
+        https://llvm.org
 
     Permission is hereby granted, free of charge, to any
     person obtaining a copy of this software and associated

Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "rust-book"
 version = "0.0.1"
-authors = ["Steve Klabnik <[email protected]>"]
 description = "The Rust Book"
 edition = "2018"
 

README.md

@@ -89,6 +89,18 @@ kinds of contributions we're looking for.
 
 [contrib]: https://github.com/rust-lang/book/blob/master/CONTRIBUTING.md
 
+Because the book is [printed](https://nostarch.com/rust), and because we want
+to keep the online version of the book close to the print version when
+possible, it may take longer than you're used to for us to address your issue
+or pull request.
+
+So far, we've been doing a larger revision to coincide with [Rust
+Editions](https://doc.rust-lang.org/edition-guide/). Between those larger
+revisions, we will only be correcting errors. If your issue or pull request
+isn't strictly fixing an error, it might sit until the next time that we're
+working on a large revision: expect on the order of months or years. Thank you
+for your patience!
+
 ### Translations
 
 We'd love help translating the book! See the [Translations] label to join in

ferris.js

@@ -7,10 +7,6 @@ var ferrisTypes = [
     attr: 'panics',
     title: 'This code panics!'
   },
-  {
-    attr: 'unsafe',
-    title: 'This code block contains unsafe code.'
-  },
   {
     attr: 'not_desired_behavior',
     title: 'This code does not produce the desired behavior.'

listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

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

@@ -1,6 +1,6 @@
 $ cargo build
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-warning: unused `std::result::Result` that must be used
+warning: unused `Result` that must be used
   --> src/main.rs:10:5
    |
 10 |     io::stdin().read_line(&mut guess);

listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

listings/ch03-common-programming-concepts/listing-03-01/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "functions"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/listing-03-02/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "branches"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/listing-03-03/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "loops"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/listing-03-04/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "loops"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/listing-03-05/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "loops"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/listing-03-05/src/main.rs

@@ -1,7 +1,7 @@
 fn main() {
     let a = [10, 20, 30, 40, 50];
 
-    for element in a.iter() {
+    for element in a {
         println!("the value is: {}", element);
     }
 }

listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

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

listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-03-shadowing/output.txt

@@ -2,4 +2,5 @@ $ cargo run
    Compiling variables v0.1.0 (file:///projects/variables)
     Finished dev [unoptimized + debuginfo] target(s) in 0.31s
      Running `target/debug/variables`
-The value of x is: 12
+The value of x in the inner scope is: 12
+The value of x is: 6

listings/ch03-common-programming-concepts/no-listing-03-shadowing/src/main.rs

@@ -3,7 +3,10 @@ fn main() {
 
     let x = x + 1;
 
-    let x = x * 2;
+    {
+        let x = x * 2;
+        println!("The value of x in the inner scope is: {}", x);
+    }
 
     println!("The value of x is: {}", x);
 }

listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "floating-point"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "numeric-operations"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/src/main.rs

@@ -10,6 +10,7 @@ fn main() {
 
     // division
     let quotient = 56.7 / 32.2;
+    let floored = 2 / 3; // Results in 0
 
     // remainder
     let remainder = 43 % 5;

listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "boolean"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "char"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "tuples"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]

listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "tuples"
 version = "0.1.0"
-authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]