Migrate all in-repo crates to edition 2024

Most of this just means wrapping the bodies of `mem` functions in `unsafe` and updating `no_mangle` / `extern`.
rust-lang · Feb 13, 2025 · 3e4e8f2 · 3e4e8f2
1 parent 3c09866
commit 3e4e8f2
Show file tree

Hide file tree

Showing 15 changed files with 327 additions and 281 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 repository = "https://github.com/rust-lang/compiler-builtins"
 homepage = "https://github.com/rust-lang/compiler-builtins"
 documentation = "https://docs.rs/compiler_builtins"
-edition = "2021"
+edition = "2024"
 description = """
 Compiler intrinsics used by the Rust compiler. Also available for other targets
 if necessary!

diff --git a/crates/panic-handler/Cargo.toml b/crates/panic-handler/Cargo.toml
@@ -2,7 +2,7 @@
 name = "panic-handler"
 version = "0.1.0"
 authors = ["Alex Crichton <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/examples/intrinsics.rs b/examples/intrinsics.rs
@@ -17,7 +17,7 @@ extern crate panic_handler;
 
 #[cfg(all(not(thumb), not(windows), not(target_arch = "wasm32")))]
 #[link(name = "c")]
-extern "C" {}
+unsafe extern "C" {}
 
 // Every function in this module maps will be lowered to an intrinsic by LLVM, if the platform
 // doesn't have native support for the operation used in the function. ARM has a naming convention
@@ -626,7 +626,7 @@ fn run() {
 
     something_with_a_dtor(&|| assert_eq!(bb(1), 1));
 
-    extern "C" {
+    unsafe extern "C" {
         fn rust_begin_unwind(x: usize);
     }
 
@@ -647,14 +647,14 @@ fn something_with_a_dtor(f: &dyn Fn()) {
     f();
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[cfg(not(thumb))]
 fn main(_argc: core::ffi::c_int, _argv: *const *const u8) -> core::ffi::c_int {
     run();
     0
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[cfg(thumb)]
 pub fn _start() -> ! {
     run();
@@ -664,23 +664,23 @@ pub fn _start() -> ! {
 #[cfg(windows)]
 #[link(name = "kernel32")]
 #[link(name = "msvcrt")]
-extern "C" {}
+unsafe extern "C" {}
 
 // ARM targets need these symbols
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub fn __aeabi_unwind_cpp_pr0() {}
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub fn __aeabi_unwind_cpp_pr1() {}
 
 #[cfg(not(windows))]
 #[allow(non_snake_case)]
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub fn _Unwind_Resume() {}
 
 #[cfg(not(windows))]
 #[lang = "eh_personality"]
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn eh_personality() {}
 
 #[cfg(all(windows, target_env = "gnu"))]

diff --git a/src/arm.rs b/src/arm.rs
@@ -23,64 +23,72 @@ intrinsics! {
     #[naked]
     #[cfg(not(target_env = "msvc"))]
     pub unsafe extern "C" fn __aeabi_uidivmod() {
-        core::arch::naked_asm!(
-            "push {{lr}}",
-            "sub sp, sp, #4",
-            "mov r2, sp",
-            bl!("__udivmodsi4"),
-            "ldr r1, [sp]",
-            "add sp, sp, #4",
-            "pop {{pc}}",
-        );
+        unsafe {
+            core::arch::naked_asm!(
+                "push {{lr}}",
+                "sub sp, sp, #4",
+                "mov r2, sp",
+                bl!("__udivmodsi4"),
+                "ldr r1, [sp]",
+                "add sp, sp, #4",
+                "pop {{pc}}",
+            );
+        }
     }
 
     #[naked]
     pub unsafe extern "C" fn __aeabi_uldivmod() {
-        core::arch::naked_asm!(
-            "push {{r4, lr}}",
-            "sub sp, sp, #16",
-            "add r4, sp, #8",
-            "str r4, [sp]",
-            bl!("__udivmoddi4"),
-            "ldr r2, [sp, #8]",
-            "ldr r3, [sp, #12]",
-            "add sp, sp, #16",
-            "pop {{r4, pc}}",
-        );
+        unsafe {
+            core::arch::naked_asm!(
+                "push {{r4, lr}}",
+                "sub sp, sp, #16",
+                "add r4, sp, #8",
+                "str r4, [sp]",
+                bl!("__udivmoddi4"),
+                "ldr r2, [sp, #8]",
+                "ldr r3, [sp, #12]",
+                "add sp, sp, #16",
+                "pop {{r4, pc}}",
+            );
+        }
     }
 
     #[naked]
     pub unsafe extern "C" fn __aeabi_idivmod() {
-        core::arch::naked_asm!(
-            "push {{r0, r1, r4, lr}}",
-            bl!("__aeabi_idiv"),
-            "pop {{r1, r2}}",
-            "muls r2, r2, r0",
-            "subs r1, r1, r2",
-            "pop {{r4, pc}}",
-        );
+        unsafe {
+            core::arch::naked_asm!(
+                "push {{r0, r1, r4, lr}}",
+                bl!("__aeabi_idiv"),
+                "pop {{r1, r2}}",
+                "muls r2, r2, r0",
+                "subs r1, r1, r2",
+                "pop {{r4, pc}}",
+            );
+        }
     }
 
     #[naked]
     pub unsafe extern "C" fn __aeabi_ldivmod() {
-        core::arch::naked_asm!(
-            "push {{r4, lr}}",
-            "sub sp, sp, #16",
-            "add r4, sp, #8",
-            "str r4, [sp]",
-            bl!("__divmoddi4"),
-            "ldr r2, [sp, #8]",
-            "ldr r3, [sp, #12]",
-            "add sp, sp, #16",
-            "pop {{r4, pc}}",
-        );
+        unsafe {
+            core::arch::naked_asm!(
+                "push {{r4, lr}}",
+                "sub sp, sp, #16",
+                "add r4, sp, #8",
+                "str r4, [sp]",
+                bl!("__divmoddi4"),
+                "ldr r2, [sp, #8]",
+                "ldr r3, [sp, #12]",
+                "add sp, sp, #16",
+                "pop {{r4, pc}}",
+            );
+        }
     }
 
     // FIXME: The `*4` and `*8` variants should be defined as aliases.
 
     #[cfg(not(target_vendor = "apple"))]
     pub unsafe extern "aapcs" fn __aeabi_memcpy(dest: *mut u8, src: *const u8, n: usize) {
-        crate::mem::memcpy(dest, src, n);
+        unsafe { crate::mem::memcpy(dest, src, n) };
     }
 
     #[cfg(not(target_vendor = "apple"))]
@@ -97,33 +105,33 @@ intrinsics! {
             n -= 4;
         }
 
-        __aeabi_memcpy(dest as *mut u8, src as *const u8, n);
+        unsafe { __aeabi_memcpy(dest as *mut u8, src as *const u8, n) };
     }
 
     #[cfg(not(target_vendor = "apple"))]
     pub unsafe extern "aapcs" fn __aeabi_memcpy8(dest: *mut u8, src: *const u8, n: usize) {
-        __aeabi_memcpy4(dest, src, n);
+        unsafe { __aeabi_memcpy4(dest, src, n) };
     }
 
     #[cfg(not(target_vendor = "apple"))]
     pub unsafe extern "aapcs" fn __aeabi_memmove(dest: *mut u8, src: *const u8, n: usize) {
-        crate::mem::memmove(dest, src, n);
+        unsafe { crate::mem::memmove(dest, src, n) };
     }
 
     #[cfg(not(any(target_vendor = "apple", target_env = "msvc")))]
     pub unsafe extern "aapcs" fn __aeabi_memmove4(dest: *mut u8, src: *const u8, n: usize) {
-        __aeabi_memmove(dest, src, n);
+        unsafe { __aeabi_memmove(dest, src, n) };
     }
 
     #[cfg(not(any(target_vendor = "apple", target_env = "msvc")))]
     pub unsafe extern "aapcs" fn __aeabi_memmove8(dest: *mut u8, src: *const u8, n: usize) {
-        __aeabi_memmove(dest, src, n);
+        unsafe { __aeabi_memmove(dest, src, n) };
     }
 
     #[cfg(not(target_vendor = "apple"))]
     pub unsafe extern "aapcs" fn __aeabi_memset(dest: *mut u8, n: usize, c: i32) {
         // Note the different argument order
-        crate::mem::memset(dest, c, n);
+        unsafe { crate::mem::memset(dest, c, n) };
     }
 
     #[cfg(not(target_vendor = "apple"))]
@@ -140,26 +148,26 @@ intrinsics! {
             n -= 4;
         }
 
-        __aeabi_memset(dest as *mut u8, n, byte as i32);
+        unsafe { __aeabi_memset(dest as *mut u8, n, byte as i32) };
     }
 
     #[cfg(not(target_vendor = "apple"))]
     pub unsafe extern "aapcs" fn __aeabi_memset8(dest: *mut u8, n: usize, c: i32) {
-        __aeabi_memset4(dest, n, c);
+        unsafe { __aeabi_memset4(dest, n, c) };
     }
 
     #[cfg(not(target_vendor = "apple"))]
     pub unsafe extern "aapcs" fn __aeabi_memclr(dest: *mut u8, n: usize) {
-        __aeabi_memset(dest, n, 0);
+        unsafe { __aeabi_memset(dest, n, 0) };
     }
 
     #[cfg(not(any(target_vendor = "apple", target_env = "msvc")))]
     pub unsafe extern "aapcs" fn __aeabi_memclr4(dest: *mut u8, n: usize) {
-        __aeabi_memset4(dest, n, 0);
+        unsafe { __aeabi_memset4(dest, n, 0) };
     }
 
     #[cfg(not(any(target_vendor = "apple", target_env = "msvc")))]
     pub unsafe extern "aapcs" fn __aeabi_memclr8(dest: *mut u8, n: usize) {
-        __aeabi_memset4(dest, n, 0);
+        unsafe { __aeabi_memset4(dest, n, 0) };
     }
 }
diff --git a/src/macros.rs b/src/macros.rs
@@ -255,7 +255,7 @@ macro_rules! intrinsics {
 
         #[cfg(all(any(windows, target_os = "uefi"), target_arch = "x86_64", not(feature = "mangled-names")))]
         mod $name {
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             #[cfg_attr(not(all(windows, target_env = "gnu")), linkage = "weak")]
             extern $abi fn $name( $($argname: $ty),* )
                 -> $crate::macros::win64_128bit_abi_hack::U64x2
@@ -320,7 +320,7 @@ macro_rules! intrinsics {
 
         #[cfg(all(target_vendor = "apple", any(target_arch = "x86", target_arch = "x86_64"), not(feature = "mangled-names")))]
         mod $name {
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             #[cfg_attr(not(all(windows, target_env = "gnu")), linkage = "weak")]
             $(#[$($attr)*])*
             extern $abi fn $name( $($argname: u16),* ) $(-> $ret)? {
@@ -356,7 +356,7 @@ macro_rules! intrinsics {
 
         #[cfg(all(target_vendor = "apple", any(target_arch = "x86", target_arch = "x86_64"), not(feature = "mangled-names")))]
         mod $name {
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             #[cfg_attr(not(all(windows, target_env = "gnu")), linkage = "weak")]
             $(#[$($attr)*])*
             extern $abi fn $name( $($argname: $ty),* ) -> u16 {
@@ -397,7 +397,7 @@ macro_rules! intrinsics {
 
         #[cfg(all(target_arch = "arm", not(feature = "mangled-names")))]
         mod $name {
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             #[cfg_attr(not(all(windows, target_env = "gnu")), linkage = "weak")]
             $(#[$($attr)*])*
             extern $abi fn $name( $($argname: $ty),* ) $(-> $ret)? {
@@ -407,7 +407,7 @@ macro_rules! intrinsics {
 
         #[cfg(all(target_arch = "arm", not(feature = "mangled-names")))]
         mod $alias {
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             #[cfg_attr(not(all(windows, target_env = "gnu")), linkage = "weak")]
             $(#[$($attr)*])*
             extern "aapcs" fn $alias( $($argname: $ty),* ) $(-> $ret)? {
@@ -474,7 +474,7 @@ macro_rules! intrinsics {
         #[cfg(all(feature = "mem", not(feature = "mangled-names")))]
         mod $name {
             $(#[$($attr)*])*
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             #[cfg_attr(not(all(windows, target_env = "gnu")), linkage = "weak")]
             unsafe extern $abi fn $name( $($argname: $ty),* ) $(-> $ret)? {
                 super::$name($($argname),*)
@@ -499,7 +499,7 @@ macro_rules! intrinsics {
         pub mod $name {
             #[naked]
             $(#[$($attr)*])*
-            #[cfg_attr(not(feature = "mangled-names"), no_mangle)]
+            #[cfg_attr(not(feature = "mangled-names"), unsafe(no_mangle))]
             #[cfg_attr(not(all(windows, target_env = "gnu")), linkage = "weak")]
             pub unsafe extern $abi fn $name( $($argname: $ty),* ) $(-> $ret)? {
                 $($body)*
@@ -566,10 +566,10 @@ macro_rules! intrinsics {
         #[cfg(not(feature = "mangled-names"))]
         mod $name {
             $(#[$($attr)*])*
-            #[no_mangle]
+            #[unsafe(no_mangle)]
             #[cfg_attr(not(all(windows, target_env = "gnu")), linkage = "weak")]
             $(unsafe $($empty)?)? extern $abi fn $name( $($argname: $ty),* ) $(-> $ret)? {
-                super::$name($($argname),*)
+                $(unsafe $($empty)?)? { super::$name($($argname),*) }
             }
         }