Skip to content

Commit c7edf19

Browse files
chriskrychochriskrycho
authored
Merge pull request #4241 from rust-lang/2024-edition
Update to Rust 1.85 and 2024 Edition!
2 parents 4958a5d + b8b94b3 commit c7edf19

File tree

681 files changed

+870
-894
lines changed

Some content is hidden

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

681 files changed

+870
-894
lines changed

‎.github/workflows/main.yml

+6-6
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
@@ -71,7 +71,7 @@ jobs:
7171
- name: Install mdbook
7272
run: |
7373
mkdir bin
74-
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
74+
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
7575
echo "$(pwd)/bin" >> "${GITHUB_PATH}"
7676
- name: Install mdbook-trpl binaries
7777
run: cargo install --path packages/mdbook-trpl

‎Cargo.lock

+9-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

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

‎book.toml

+1-1
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"

‎ci/dictionary.txt

+1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ durations
151151
ebook
152152
ebooks
153153
Edsger
154+
efdcd
154155
egular
155156
ElementRef
156157
else's

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

+1-1
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.lock

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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

88
[dependencies]
9-
rand = "0.8.5"
9+
rand = "0.8.4"

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

+1-1
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

+1-1
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

+2-2
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

+1-1
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

+1-1
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/no-listing-01-cargo-new/Cargo.toml

+1-1
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]

‎listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/output.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ cargo run
22
Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
3-
Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.20s
4-
Running `target/debug/guessing_game`
3+
Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.08s
4+
Running `file:///projects/guessing_game/target/debug/guessing_game`
55
Hello, world!

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

+1-1
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/no-listing-03-convert-string-to-number/Cargo.toml

+1-1
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/no-listing-04-looping/Cargo.toml

+1-1
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/no-listing-05-quitting/Cargo.toml

+1-1
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/ch03-common-programming-concepts/listing-03-01/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "functions"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "branches"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "loops"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "loops"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "loops"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "variables"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "variables"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "variables"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "variables"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "variables"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "floating-point"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "numeric-operations"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "boolean"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "char"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tuples"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tuples"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]

0 commit comments

Comments
 (0)