Skip to content

Commit 40a6949

Browse files
committed
Update to Rust 2024 edition.
1 parent 32a8b4b commit 40a6949

File tree

39 files changed

+52
-43
lines changed

39 files changed

+52
-43
lines changed

mdbook-course/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "mdbook-course"
33
version = "0.1.0"
44
authors = ["Dustin Mitchell <djmitche@google.com>"]
5-
edition = "2021"
5+
edition = "2024"
66
license = "Apache-2.0"
77
publish = false
88
repository = "https://github.com/google/comprehensive-rust"

mdbook-exerciser/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "mdbook-exerciser"
33
version = "0.1.0"
44
authors = ["Andrew Walbran <qwandor@google.com>"]
5-
edition = "2021"
5+
edition = "2024"
66
license = "Apache-2.0"
77
repository = "https://github.com/google/comprehensive-rust"
88
description = "A tool for extracting starter code for exercises from Markdown files."

mdbook-slide-evaluator/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "mdbook-slide-evaluator"
33
version = "0.1.0"
44
authors = ["Michael Kerscher <kerscher@google.com>"]
5-
edition = "2021"
5+
edition = "2024"
66
license = "Apache-2.0"
77
repository = "https://github.com/google/comprehensive-rust"
88
description = "A tool for evaluating mdbook slides by rendering the html pages and spot violations to the policies"

src/android/testing/Cargo.toml

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

77
[[example]]

src/bare-metal/alloc-example/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[package]
44
name = "alloc-example"
55
version = "0.1.0"
6-
edition = "2021"
6+
edition = "2024"
77
publish = false
88

99
[dependencies]

src/bare-metal/alloc-example/src/main.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ use buddy_system_allocator::LockedHeap;
2626
#[global_allocator]
2727
static HEAP_ALLOCATOR: LockedHeap<32> = LockedHeap::<32>::new();
2828

29-
static mut HEAP: [u8; 65536] = [0; 65536];
29+
const HEAP_SIZE: usize = 65536;
30+
static mut HEAP: [u8; HEAP_SIZE] = [0; HEAP_SIZE];
3031

3132
pub fn entry() {
3233
// SAFETY: `HEAP` is only used here and `entry` is only called once.
3334
unsafe {
3435
// Give the allocator some memory to allocate.
35-
HEAP_ALLOCATOR.lock().init(HEAP.as_mut_ptr() as usize, HEAP.len());
36+
HEAP_ALLOCATOR.lock().init(&raw mut HEAP as usize, HEAP_SIZE);
3637
}
3738

3839
// Now we can do things that require heap allocation.

src/bare-metal/aps/examples/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[package]
44
name = "ap-examples"
55
version = "0.1.0"
6-
edition = "2021"
6+
edition = "2024"
77
publish = false
88

99
[dependencies]

src/bare-metal/aps/examples/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ use cc::Build;
1616
use std::env;
1717

1818
fn main() {
19-
env::set_var("CROSS_COMPILE", "aarch64-none-elf");
20-
env::set_var("CC", "clang");
19+
// SAFETY: The build script is single-threaded.
20+
unsafe {
21+
env::set_var("CROSS_COMPILE", "aarch64-none-elf");
22+
env::set_var("CC", "clang");
23+
}
2124

2225
Build::new()
2326
.file("entry.S")

src/bare-metal/microcontrollers/examples/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[package]
44
name = "microcontroller-examples"
55
version = "0.1.0"
6-
edition = "2021"
6+
edition = "2024"
77
publish = false
88

99
[dependencies]

src/bare-metal/useful-crates/allocator-example/Cargo.toml

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

77
[dependencies]

src/bare-metal/useful-crates/zerocopy-example/Cargo.toml

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

77
[dependencies]

src/borrowing/Cargo.toml

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

77
[lib]

src/concurrency/async-exercises/chat-async/Cargo.toml

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

66
[dependencies]
77
futures-util = { version = "0.3.31", features = ["sink"] }

src/concurrency/async-exercises/dining-philosophers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ can use the following `Cargo.toml`:
4545
[package]
4646
name = "dining-philosophers-async-dine"
4747
version = "0.1.0"
48-
edition = "2021"
48+
edition = "2024"
4949

5050
[dependencies]
5151
tokio = { version = "1.26.0", features = ["sync", "time", "macros", "rt-multi-thread"] }

src/concurrency/sync-exercises/Cargo.toml

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

77
[[bin]]

src/concurrency/sync-exercises/dining-philosophers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You can use the following `Cargo.toml`:
5151
[package]
5252
name = "dining-philosophers"
5353
version = "0.1.0"
54-
edition = "2021"
54+
edition = "2024"
5555
```
5656

5757
<details>

src/concurrency/sync-exercises/link-checker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The `cargo add` calls will update the `Cargo.toml` file to look like this:
3434
[package]
3535
name = "link-checker"
3636
version = "0.1.0"
37-
edition = "2021"
37+
edition = "2024"
3838
publish = false
3939

4040
[dependencies]

src/control-flow-basics/Cargo.toml

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

77
[[bin]]

src/error-handling/Cargo.toml

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

77
[dependencies]

src/exercises/bare-metal/compass/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[package]
44
name = "compass"
55
version = "0.1.0"
6-
edition = "2021"
6+
edition = "2024"
77
publish = false
88

99
[dependencies]

src/exercises/bare-metal/rtc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[package]
44
name = "rtc"
55
version = "0.1.0"
6-
edition = "2021"
6+
edition = "2024"
77
publish = false
88

99
[dependencies]

src/exercises/bare-metal/rtc/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ use cc::Build;
1616
use std::env;
1717

1818
fn main() {
19-
env::set_var("CROSS_COMPILE", "aarch64-none-elf");
20-
env::set_var("CC", "clang");
19+
// SAFETY: The build script is single-threaded.
20+
unsafe {
21+
env::set_var("CROSS_COMPILE", "aarch64-none-elf");
22+
env::set_var("CC", "clang");
23+
}
2124

2225
Build::new()
2326
.file("entry.S")

src/generics/Cargo.toml

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

77
[lib]

src/iterators/Cargo.toml

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

77
[lib]

src/lifetimes/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "lifetimes"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55
publish = false
66

77
[dependencies]
8-
thiserror = "*"
8+
thiserror = "2.0.11"
99

1010
[lib]
1111
name = "protobuf"

src/memory-management/Cargo.toml

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

77
[[bin]]

src/methods-and-traits/Cargo.toml

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

77
[[bin]]

src/modules/Cargo.toml

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

77
[[bin]]

src/pattern-matching/Cargo.toml

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

77
[lib]

src/references/Cargo.toml

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

77
[[bin]]

src/smart-pointers/Cargo.toml

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

77
[lib]

src/std-traits/Cargo.toml

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

77
[lib]

src/std-types/Cargo.toml

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

77
[[bin]]

src/testing/Cargo.toml

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

77
[lints.rust]

src/tuples-and-arrays/Cargo.toml

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

77
[[bin]]

src/types-and-values/Cargo.toml

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

77
[[bin]]

src/unsafe-rust/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "unsafe-rust"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55
publish = false
66

77
[dependencies]
8-
tempfile = "*"
8+
tempfile = "3.17.1"
99

1010
[[bin]]
1111
name = "listdir"

src/user-defined-types/Cargo.toml

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

77
[[bin]]

theme/book.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ function playground_text(playground, hidden = true) {
137137
edition = "2018";
138138
} else if(classes.contains("edition2021")) {
139139
edition = "2021";
140+
} else if(classes.contains("edition2024")) {
141+
edition = "2024";
140142
}
141143
var params = {
142144
backtrace: true,

0 commit comments

Comments
 (0)