Update to Rust 2024 edition.

qwandor · qwandor · commit 1a50889e5f22 · 2025-02-25T18:24:57.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -204,6 +204,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Update Rust
+        run: rustup update
+
       - name: Setup Rust cache
         uses: ./.github/workflows/setup-rust-cache
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -33,6 +33,9 @@ jobs:
         with:
           fetch-depth: 0 # We need the full history for build.sh below.
 
+      - name: Update Rust
+        run: rustup update
+
       - name: Setup Rust cache
         uses: ./.github/workflows/setup-rust-cache
 
diff --git a/book.toml b/book.toml
@@ -6,7 +6,7 @@ src = "src"
 title = "Comprehensive Rust 🦀"
 
 [rust]
-edition = "2021"
+edition = "2024"
 
 [build]
 extra-watch-dirs = ["po", "third_party"]
diff --git a/mdbook-course/Cargo.toml b/mdbook-course/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mdbook-course"
 version = "0.1.0"
 authors = ["Dustin Mitchell <djmitche@google.com>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 publish = false
 repository = "https://github.com/google/comprehensive-rust"
diff --git a/mdbook-exerciser/Cargo.toml b/mdbook-exerciser/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mdbook-exerciser"
 version = "0.1.0"
 authors = ["Andrew Walbran <qwandor@google.com>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 repository = "https://github.com/google/comprehensive-rust"
 description = "A tool for extracting starter code for exercises from Markdown files."
diff --git a/mdbook-slide-evaluator/Cargo.toml b/mdbook-slide-evaluator/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mdbook-slide-evaluator"
 version = "0.1.0"
 authors = ["Michael Kerscher <kerscher@google.com>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 repository = "https://github.com/google/comprehensive-rust"
 description = "A tool for evaluating mdbook slides by rendering the html pages and spot violations to the policies"
diff --git a/src/android/testing/Cargo.toml b/src/android/testing/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "android-testing"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[example]]
diff --git a/src/bare-metal/alloc-example/Cargo.toml b/src/bare-metal/alloc-example/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "alloc-example"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/bare-metal/alloc-example/src/main.rs b/src/bare-metal/alloc-example/src/main.rs
@@ -26,13 +26,14 @@ use buddy_system_allocator::LockedHeap;
 #[global_allocator]
 static HEAP_ALLOCATOR: LockedHeap<32> = LockedHeap::<32>::new();
 
-static mut HEAP: [u8; 65536] = [0; 65536];
+const HEAP_SIZE: usize = 65536;
+static mut HEAP: [u8; HEAP_SIZE] = [0; HEAP_SIZE];
 
 pub fn entry() {
     // SAFETY: `HEAP` is only used here and `entry` is only called once.
     unsafe {
         // Give the allocator some memory to allocate.
-        HEAP_ALLOCATOR.lock().init(HEAP.as_mut_ptr() as usize, HEAP.len());
+        HEAP_ALLOCATOR.lock().init(&raw mut HEAP as usize, HEAP_SIZE);
     }
 
     // Now we can do things that require heap allocation.
diff --git a/src/bare-metal/aps/examples/Cargo.toml b/src/bare-metal/aps/examples/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "ap-examples"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/bare-metal/aps/examples/build.rs b/src/bare-metal/aps/examples/build.rs
@@ -16,8 +16,11 @@ use cc::Build;
 use std::env;
 
 fn main() {
-    env::set_var("CROSS_COMPILE", "aarch64-none-elf");
-    env::set_var("CC", "clang");
+    // SAFETY: The build script is single-threaded.
+    unsafe {
+        env::set_var("CROSS_COMPILE", "aarch64-none-elf");
+        env::set_var("CC", "clang");
+    }
 
     Build::new()
         .file("entry.S")
diff --git a/src/bare-metal/microcontrollers/examples/Cargo.toml b/src/bare-metal/microcontrollers/examples/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "microcontroller-examples"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/bare-metal/useful-crates/allocator-example/Cargo.toml b/src/bare-metal/useful-crates/allocator-example/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "allocator-example"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/bare-metal/useful-crates/zerocopy-example/Cargo.toml b/src/bare-metal/useful-crates/zerocopy-example/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zerocopy-example"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/borrowing/Cargo.toml b/src/borrowing/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "borrowing"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lib]
diff --git a/src/concurrency/async-exercises/chat-async/Cargo.toml b/src/concurrency/async-exercises/chat-async/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "chat-async"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 futures-util = { version = "0.3.31", features = ["sink"] }
diff --git a/src/concurrency/async-exercises/dining-philosophers.md b/src/concurrency/async-exercises/dining-philosophers.md
@@ -45,7 +45,7 @@ can use the following `Cargo.toml`:
 [package]
 name = "dining-philosophers-async-dine"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 tokio = { version = "1.26.0", features = ["sync", "time", "macros", "rt-multi-thread"] }
diff --git a/src/concurrency/sync-exercises/Cargo.toml b/src/concurrency/sync-exercises/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sync-exercises"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/concurrency/sync-exercises/dining-philosophers.md b/src/concurrency/sync-exercises/dining-philosophers.md
@@ -51,7 +51,7 @@ You can use the following `Cargo.toml`:
 [package]
 name = "dining-philosophers"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 ```
 
 <details>
diff --git a/src/concurrency/sync-exercises/link-checker.md b/src/concurrency/sync-exercises/link-checker.md
@@ -34,7 +34,7 @@ The `cargo add` calls will update the `Cargo.toml` file to look like this:
 [package]
 name = "link-checker"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/control-flow-basics/Cargo.toml b/src/control-flow-basics/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "control-flow-basics"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/error-handling/Cargo.toml b/src/error-handling/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "error-handling"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/exercises/bare-metal/compass/Cargo.toml b/src/exercises/bare-metal/compass/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "compass"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/exercises/bare-metal/rtc/Cargo.toml b/src/exercises/bare-metal/rtc/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "rtc"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/src/exercises/bare-metal/rtc/build.rs b/src/exercises/bare-metal/rtc/build.rs
@@ -16,8 +16,11 @@ use cc::Build;
 use std::env;
 
 fn main() {
-    env::set_var("CROSS_COMPILE", "aarch64-none-elf");
-    env::set_var("CC", "clang");
+    // SAFETY: The build script is single-threaded.
+    unsafe {
+        env::set_var("CROSS_COMPILE", "aarch64-none-elf");
+        env::set_var("CC", "clang");
+    }
 
     Build::new()
         .file("entry.S")
diff --git a/src/generics/Cargo.toml b/src/generics/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "generics"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lib]
diff --git a/src/iterators/Cargo.toml b/src/iterators/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "iterators"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lib]
diff --git a/src/lifetimes/Cargo.toml b/src/lifetimes/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "lifetimes"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
-thiserror = "*"
+thiserror = "2.0.11"
 
 [lib]
 name = "protobuf"
diff --git a/src/memory-management/Cargo.toml b/src/memory-management/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "memory-management"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/methods-and-traits/Cargo.toml b/src/methods-and-traits/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "methods-and-traits"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/modules/Cargo.toml b/src/modules/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "modules"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/pattern-matching/Cargo.toml b/src/pattern-matching/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pattern-matching"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lib]
diff --git a/src/references/Cargo.toml b/src/references/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "references"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/smart-pointers/Cargo.toml b/src/smart-pointers/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "smart-pointers"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lib]
diff --git a/src/std-traits/Cargo.toml b/src/std-traits/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "std-traits"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lib]
diff --git a/src/std-types/Cargo.toml b/src/std-types/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "std-types"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/testing/Cargo.toml b/src/testing/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "testing"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lints.rust]
diff --git a/src/tuples-and-arrays/Cargo.toml b/src/tuples-and-arrays/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tuples-and-arrays"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/types-and-values/Cargo.toml b/src/types-and-values/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "types-and-values"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/src/unsafe-rust/Cargo.toml b/src/unsafe-rust/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "unsafe-rust"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
-tempfile = "*"
+tempfile = "3.17.1"
 
 [[bin]]
 name = "listdir"
diff --git a/src/user-defined-types/Cargo.toml b/src/user-defined-types/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "user-defined-types"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[bin]]
diff --git a/theme/book.js b/theme/book.js
