Skip to content

Commit 6b658f7

Browse files
committed
Update to Rust 1.85 and 2024 Edition!
1 parent 18f6e63 commit 6b658f7

File tree

666 files changed

+776
-806
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

666 files changed

+776
-806
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
- name: Install Rust
1313
run: |
1414
rustup set profile minimal
15-
rustup toolchain install 1.82 -c rust-docs
16-
rustup default 1.82
15+
rustup toolchain install 1.85 -c rust-docs
16+
rustup default 1.85
1717
- name: Install mdbook
1818
run: |
1919
mkdir bin
20-
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
20+
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
2121
echo "$(pwd)/bin" >> "${GITHUB_PATH}"
2222
- name: Report versions
2323
run: |
@@ -47,8 +47,8 @@ jobs:
4747
- name: Install Rust
4848
run: |
4949
rustup set profile minimal
50-
rustup toolchain install 1.82 -c rust-docs
51-
rustup default 1.82
50+
rustup toolchain install 1.85 -c rust-docs
51+
rustup default 1.85
5252
- name: Run `tools` package tests
5353
run: |
5454
cargo test

book.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ git-repository-url = "https://github.com/rust-lang/book"
4141
output-mode = "default"
4242

4343
[rust]
44-
edition = "2021"
44+
edition = "2024"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ error[E0308]: mismatched types
1818
= note: expected reference `&String`
1919
found reference `&{integer}`
2020
note: method defined here
21-
--> file:///home/.rustup/toolchains/1.82/lib/rustlib/src/rust/library/core/src/cmp.rs:838:8
21+
--> file:///home/.rustup/toolchains/1.85/lib/rustlib/src/rust/library/core/src/cmp.rs:964:8
2222
|
23-
838 | fn cmp(&self, other: &Self) -> Ordering;
23+
964 | fn cmp(&self, other: &Self) -> Ordering;
2424
| ^^^
2525

2626
For more information about this error, try `rustc --explain E0308`.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

0 commit comments

Comments
 (0)