Update to edition 2024

est31 · est31 · commit f4c23fd83538 · 2025-05-07T00:03:27.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ name = "miri"
 repository = "https://github.com/rust-lang/miri"
 version = "0.1.0"
 default-run = "miri"
-edition = "2021"
+edition = "2024"
 
 [lib]
 test = true     # we have unit tests
diff --git a/bench-cargo-miri/backtraces/Cargo.toml b/bench-cargo-miri/backtraces/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "backtraces"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/bench-cargo-miri/big-allocs/Cargo.toml b/bench-cargo-miri/big-allocs/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "big-allocs"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/bench-cargo-miri/range-iteration/Cargo.toml b/bench-cargo-miri/range-iteration/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "range-iteration"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/bench-cargo-miri/slice-chunked/Cargo.toml b/bench-cargo-miri/slice-chunked/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "slice-chunked"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/bench-cargo-miri/slice-get-unchecked/Cargo.toml b/bench-cargo-miri/slice-get-unchecked/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "slice-get-unchecked"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/bench-cargo-miri/string-replace/Cargo.toml b/bench-cargo-miri/string-replace/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "string-replace"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/bench-cargo-miri/unicode/Cargo.toml b/bench-cargo-miri/unicode/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "unicode"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/bench-cargo-miri/zip-equal/Cargo.toml b/bench-cargo-miri/zip-equal/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zip-equal"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/cargo-miri/Cargo.toml b/cargo-miri/Cargo.toml
@@ -5,7 +5,7 @@ license = "MIT OR Apache-2.0"
 name = "cargo-miri"
 repository = "https://github.com/rust-lang/miri"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 name = "cargo-miri"
diff --git a/miri-script/Cargo.toml b/miri-script/Cargo.toml
@@ -6,7 +6,7 @@ name = "miri-script"
 repository = "https://github.com/rust-lang/miri"
 version = "0.1.0"
 default-run = "miri-script"
-edition = "2021"
+edition = "2024"
 
 [workspace]
 # We make this a workspace root so that cargo does not go looking in ../Cargo.toml for the workspace root.
diff --git a/miri-script/src/commands.rs b/miri-script/src/commands.rs
@@ -682,7 +682,7 @@ impl Command {
             }
         }
         early_flags.push("--edition".into());
-        early_flags.push(edition.as_deref().unwrap_or("2021").into());
+        early_flags.push(edition.as_deref().unwrap_or("2024").into());
         early_flags.push("--sysroot".into());
         early_flags.push(miri_sysroot.into());
 
diff --git a/miri-script/src/util.rs b/miri-script/src/util.rs
@@ -213,7 +213,7 @@ impl MiriEnv {
             let toolchain = &self.toolchain;
             let mut cmd = cmd!(
                 self.sh,
-                "rustfmt +{toolchain} --edition=2021 --config-path {config_path} --unstable-features --skip-children {flags...}"
+                "rustfmt +{toolchain} --edition=2024 --config-path {config_path} --unstable-features --skip-children {flags...}"
             );
             if first {
                 // Log an abbreviating command, and only once.
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
@@ -459,7 +459,7 @@ fn jemalloc_magic() {
     // linking, so we need to explicitly depend on the function.
     #[cfg(target_os = "macos")]
     {
-        extern "C" {
+        unsafe extern "C" {
             fn _rjem_je_zone_register();
         }
 
diff --git a/src/borrow_tracker/tree_borrows/diagnostics.rs b/src/borrow_tracker/tree_borrows/diagnostics.rs
@@ -179,7 +179,7 @@ impl NodeDebugInfo {
     /// Add a name to the tag. If a same tag is associated to several pointers,
     /// it can have several names which will be separated by commas.
     pub fn add_name(&mut self, name: &str) {
-        if let Some(ref mut prev_name) = &mut self.name {
+        if let Some(prev_name) = &mut self.name {
             prev_name.push_str(", ");
             prev_name.push_str(name);
         } else {
diff --git a/src/diagnostics.rs b/src/diagnostics.rs
@@ -648,8 +648,7 @@ impl<'tcx> MiriMachine<'tcx> {
             AccessedAlloc(AllocId(id), access_kind) =>
                 format!("{access_kind} to allocation with id {id}"),
             FreedAlloc(AllocId(id)) => format!("freed allocation with id {id}"),
-            RejectedIsolatedOp(ref op) =>
-                format!("{op} was made to return an error due to isolation"),
+            RejectedIsolatedOp(op) => format!("{op} was made to return an error due to isolation"),
             ProgressReport { .. } =>
                 format!("progress report: current operation being executed is here"),
             Int2Ptr { .. } => format!("integer-to-pointer cast"),
diff --git a/test-cargo-miri/no-std-smoke/Cargo.toml b/test-cargo-miri/no-std-smoke/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "no-std-smoke"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/test-cargo-miri/test-local-crate-detection/Cargo.toml b/test-cargo-miri/test-local-crate-detection/Cargo.toml
@@ -1,4 +1,4 @@
 [package]
 name = "test-local-crate-detection"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
diff --git a/test_dependencies/Cargo.toml b/test_dependencies/Cargo.toml
@@ -5,7 +5,7 @@ license = "MIT OR Apache-2.0"
 name = "miri-test-deps"
 repository = "https://github.com/rust-lang/miri"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 # all dependencies (and their transitive ones) listed here can be used in `tests/*-dep`.
diff --git a/tests/pass/coroutine.rs b/tests/pass/coroutine.rs
@@ -183,18 +183,18 @@ fn basic() {
 
 fn smoke_resume_arg() {
     fn drain<G: Coroutine<R, Yield = Y> + Unpin, R, Y>(
-        gen: &mut G,
+        gen_: &mut G,
         inout: Vec<(R, CoroutineState<Y, G::Return>)>,
     ) where
         Y: Debug + PartialEq,
         G::Return: Debug + PartialEq,
     {
-        let mut gen = Pin::new(gen);
+        let mut gen_ = Pin::new(gen_);
 
         for (input, out) in inout {
-            assert_eq!(gen.as_mut().resume(input), out);
+            assert_eq!(gen_.as_mut().resume(input), out);
             // Test if the coroutine is valid (according to type invariants).
-            let _ = unsafe { ManuallyDrop::new(ptr::read(gen.as_mut().get_unchecked_mut())) };
+            let _ = unsafe { ManuallyDrop::new(ptr::read(gen_.as_mut().get_unchecked_mut())) };
         }
     }
 
diff --git a/tests/ui.rs b/tests/ui.rs
@@ -126,7 +126,7 @@ fn miri_config(
         stdout_filters().iter().map(|(m, p)| (m.clone(), p.to_vec())).collect();
 
     // keep in sync with `./miri run`
-    config.comment_defaults.base().add_custom("edition", Edition("2021".into()));
+    config.comment_defaults.base().add_custom("edition", Edition("2024".into()));
 
     if let Some(WithDependencies { bless }) = with_dependencies {
         config.comment_defaults.base().set_custom(
