Merge pull request #4241 from rust-lang/2024-edition

Update to Rust 1.85 and 2024 Edition!

Author: chriskrycho

.github/workflows/main.yml

@@ -12,12 +12,12 @@ jobs:
     - name: Install Rust
       run: |
         rustup set profile minimal
-        rustup toolchain install 1.82 -c rust-docs
-        rustup default 1.82
+        rustup toolchain install 1.85 -c rust-docs
+        rustup default 1.85
     - name: Install mdbook
       run: |
         mkdir bin
-        curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.37/mdbook-v0.4.37-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
+        curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.45/mdbook-v0.4.45-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
         echo "$(pwd)/bin" >> "${GITHUB_PATH}"
     - name: Report versions
       run: |
@@ -47,8 +47,8 @@ jobs:
     - name: Install Rust
       run: |
         rustup set profile minimal
-        rustup toolchain install 1.82 -c rust-docs
-        rustup default 1.82
+        rustup toolchain install 1.85 -c rust-docs
+        rustup default 1.85
     - name: Run `tools` package tests
       run: |
         cargo test
@@ -71,7 +71,7 @@ jobs:
     - name: Install mdbook
       run: |
         mkdir bin
-        curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.21/mdbook-v0.4.21-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
+        curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.45/mdbook-v0.4.45-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
         echo "$(pwd)/bin" >> "${GITHUB_PATH}"
     - name: Install mdbook-trpl binaries
       run: cargo install --path packages/mdbook-trpl

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["packages/tools"]
+members = [ "listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new", "listings/ch11-writing-automated-tests/listing-11-01","packages/tools"]
 default-members = ["packages/tools"]
 resolver = "2"
 exclude = [

Cargo.toml

@@ -41,4 +41,4 @@ git-repository-url = "https://github.com/rust-lang/book"
 output-mode = "default"
 
 [rust]
-edition = "2021"
+edition = "2024"

book.toml

@@ -151,6 +151,7 @@ durations
 ebook
 ebooks
 Edsger
+efdcd
 egular
 ElementRef
 else's

ci/dictionary.txt

@@ -1,7 +1,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

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

@@ -1,9 +1,9 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8.4"

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

@@ -1,7 +1,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # 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,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # 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

@@ -18,9 +18,9 @@ error[E0308]: mismatched types
     = note: expected reference `&String`
                found reference `&{integer}`
 note: method defined here
-   --> file:///home/.rustup/toolchains/1.82/lib/rustlib/src/rust/library/core/src/cmp.rs:838:8
+   --> file:///home/.rustup/toolchains/1.85/lib/rustlib/src/rust/library/core/src/cmp.rs:964:8
     |
-838 |     fn cmp(&self, other: &Self) -> Ordering;
+964 |     fn cmp(&self, other: &Self) -> Ordering;
     |        ^^^
 
 For more information about this error, try `rustc --explain E0308`.

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

@@ -1,7 +1,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

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

@@ -1,7 +1,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # 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,6 +1,6 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,5 +1,5 @@
 $ cargo run
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.20s
-     Running `target/debug/guessing_game`
+    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.08s
+     Running `file:///projects/guessing_game/target/debug/guessing_game`
 Hello, world!

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

@@ -1,7 +1,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # 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/output.txt

@@ -1,7 +1,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # 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,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

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

@@ -1,7 +1,7 @@
 [package]
 name = "guessing_game"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # 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,6 +1,6 @@
 [package]
 name = "functions"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "branches"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "loops"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "loops"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "loops"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "variables"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "floating-point"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "numeric-operations"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "boolean"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "char"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "tuples"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "tuples"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]