[WIP] Migrate all tests to the 2024 edition

Author: bjorn3

.vscode/settings.json

@@ -15,19 +15,19 @@
             "crates": [
                 {
                     "root_module": "./example/mini_core.rs",
-                    "edition": "2018",
+                    "edition": "2024",
                     "deps": [],
                     "cfg": [],
                 },
                 {
                     "root_module": "./example/mini_core_hello_world.rs",
-                    "edition": "2018",
+                    "edition": "2024",
                     "deps": [{ "crate": 0, "name": "mini_core" }],
                     "cfg": [],
                 },
                 {
                     "root_module": "./example/mod_bench.rs",
-                    "edition": "2018",
+                    "edition": "2024",
                     "deps": [],
                     "cfg": [],
                 },
@@ -38,7 +38,7 @@
             "crates": [
                 {
                     "root_module": "./example/std_example.rs",
-                    "edition": "2015",
+                    "edition": "2024",
                     "deps": [],
                     "cfg": [],
                 },

build_system/tests.rs

@@ -90,15 +90,7 @@ const BASE_SYSROOT_SUITE: &[TestCase] = &[
     TestCase::build_bin_and_run("aot.issue-72793", "example/issue-72793.rs", &[]),
     TestCase::build_bin("aot.issue-59326", "example/issue-59326.rs"),
     TestCase::build_bin_and_run("aot.neon", "example/neon.rs", &[]),
-    TestCase::custom("aot.gen_block_iterate", &|runner| {
-        runner.run_rustc([
-            "example/gen_block_iterate.rs",
-            "--edition",
-            "2024",
-            "-Zunstable-options",
-        ]);
-        runner.run_out_command("gen_block_iterate", &[]);
-    }),
+    TestCase::build_bin_and_run("aot.gen_block_iterate", "example/gen_block_iterate.rs", &[]),
     TestCase::build_bin_and_run("aot.raw-dylib", "example/raw-dylib.rs", &[]),
 ];
 
@@ -428,6 +420,7 @@ impl<'a> TestRunner<'a> {
         cmd.arg(&self.target_compiler.triple);
         cmd.arg("-Cpanic=abort");
         cmd.arg("--check-cfg=cfg(jit)");
+        cmd.arg("--edition=2024");
         cmd.args(args);
         cmd
     }

example/example.rs

@@ -81,12 +81,16 @@ pub fn use_size_of() -> usize {
 }
 
 pub unsafe fn use_copy_intrinsic(src: *const u8, dst: *mut u8) {
-    intrinsics::copy::<u8>(src, dst, 1);
+    unsafe {
+        intrinsics::copy::<u8>(src, dst, 1);
+    }
 }
 
 pub unsafe fn use_copy_intrinsic_ref(src: *const u8, dst: *mut u8) {
-    let copy2 = &intrinsics::copy::<u8>;
-    copy2(src, dst, 1);
+    unsafe {
+        let copy2 = &intrinsics::copy::<u8>;
+        copy2(src, dst, 1);
+    }
 }
 
 pub const ABC: u8 = 6 * 7;
@@ -130,11 +134,11 @@ pub fn eq_char(a: char, b: char) -> bool {
 }
 
 pub unsafe fn transmute(c: char) -> u32 {
-    intrinsics::transmute(c)
+    unsafe { intrinsics::transmute(c) }
 }
 
 pub unsafe fn deref_str_ptr(s: *const str) -> &'static str {
-    &*s
+    unsafe { &*s }
 }
 
 pub fn use_array(arr: [u8; 3]) -> u8 {
@@ -150,7 +154,7 @@ pub fn array_as_slice(arr: &[u8; 3]) -> &[u8] {
 }
 
 pub unsafe fn use_ctlz_nonzero(a: u16) -> u32 {
-    intrinsics::ctlz_nonzero(a)
+    unsafe { intrinsics::ctlz_nonzero(a) }
 }
 
 pub fn ptr_as_usize(ptr: *const u8) -> usize {

example/mini_core.rs

@@ -527,7 +527,9 @@ fn eh_personality() -> ! {
 pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
     // Code here does not matter - this is replaced by the
     // real drop glue by the compiler.
-    drop_in_place(to_drop);
+    unsafe {
+        drop_in_place(to_drop);
+    }
 }
 
 #[lang = "unpin"]
@@ -594,7 +596,7 @@ impl<T: ?Sized> Deref for Box<T> {
 
 #[lang = "exchange_malloc"]
 unsafe fn allocate(size: usize, _align: usize) -> *mut u8 {
-    libc::malloc(size)
+    unsafe { libc::malloc(size) }
 }
 
 #[lang = "drop"]
@@ -616,6 +618,8 @@ pub union MaybeUninit<T> {
 }
 
 pub mod intrinsics {
+    use super::*;
+
     #[rustc_intrinsic]
     #[rustc_intrinsic_must_be_overridden]
     pub fn abort() -> ! {
@@ -628,7 +632,7 @@ pub mod intrinsics {
     }
     #[rustc_intrinsic]
     #[rustc_intrinsic_must_be_overridden]
-    pub unsafe fn size_of_val<T: ?::Sized>(_val: *const T) -> usize {
+    pub unsafe fn size_of_val<T: ?Sized>(_val: *const T) -> usize {
         loop {}
     }
     #[rustc_intrinsic]
@@ -638,7 +642,7 @@ pub mod intrinsics {
     }
     #[rustc_intrinsic]
     #[rustc_intrinsic_must_be_overridden]
-    pub unsafe fn min_align_of_val<T: ?::Sized>(_val: *const T) -> usize {
+    pub unsafe fn min_align_of_val<T: ?Sized>(_val: *const T) -> usize {
         loop {}
     }
     #[rustc_intrinsic]
@@ -658,7 +662,7 @@ pub mod intrinsics {
     }
     #[rustc_intrinsic]
     #[rustc_intrinsic_must_be_overridden]
-    pub fn needs_drop<T: ?::Sized>() -> bool {
+    pub fn needs_drop<T: ?Sized>() -> bool {
         loop {}
     }
     #[rustc_intrinsic]
@@ -689,13 +693,13 @@ pub mod libc {
     // symbols to link against.
     #[cfg_attr(unix, link(name = "c"))]
     #[cfg_attr(target_env = "msvc", link(name = "legacy_stdio_definitions"))]
-    extern "C" {
+    unsafe extern "C" {
         pub fn printf(format: *const i8, ...) -> i32;
     }
 
     #[cfg_attr(unix, link(name = "c"))]
     #[cfg_attr(target_env = "msvc", link(name = "msvcrt"))]
-    extern "C" {
+    unsafe extern "C" {
         pub fn puts(s: *const i8) -> i32;
         pub fn malloc(size: usize) -> *mut u8;
         pub fn free(ptr: *mut u8);
@@ -727,7 +731,7 @@ impl<T> Index<usize> for [T] {
     }
 }
 
-extern "C" {
+unsafe extern "C" {
     type VaListImpl;
 }
 
@@ -786,7 +790,7 @@ struct PanicLocation {
     column: u32,
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[cfg(not(all(windows, target_env = "gnu")))]
 pub fn get_tls() -> u8 {
     #[thread_local]

example/mini_core_hello_world.rs

@@ -124,9 +124,11 @@ static mut NUM: u8 = 6 * 7;
 static NUM_REF: &'static u8 = unsafe { &*&raw const NUM };
 
 unsafe fn zeroed<T>() -> T {
-    let mut uninit = MaybeUninit { uninit: () };
-    intrinsics::write_bytes(&mut uninit.value.value as *mut T, 0, 1);
-    uninit.value.value
+    unsafe {
+        let mut uninit = MaybeUninit { uninit: () };
+        intrinsics::write_bytes(&mut uninit.value.value as *mut T, 0, 1);
+        uninit.value.value
+    }
 }
 
 fn take_f32(_f: f32) {}
@@ -236,7 +238,7 @@ fn main() {
         }
 
         unsafe fn uninitialized<T>() -> T {
-            MaybeUninit { uninit: () }.value.value
+            unsafe { MaybeUninit { uninit: () }.value.value }
         }
 
         zeroed::<(u8, u8)>();
@@ -269,20 +271,20 @@ fn main() {
     let x = &[0u32, 42u32] as &[u32];
     match x {
         [] => assert_eq!(0u32, 1),
-        [_, ref y @ ..] => assert_eq!(&x[1] as *const u32 as usize, &y[0] as *const u32 as usize),
+        [_, y @ ..] => assert_eq!(&x[1] as *const u32 as usize, &y[0] as *const u32 as usize),
     }
 
     assert_eq!(((|()| 42u8) as fn(()) -> u8)(()), 42);
 
     #[cfg(not(any(jit, windows)))]
     {
-        extern "C" {
+        unsafe extern "C" {
             #[linkage = "extern_weak"]
             static ABC: *const u8;
         }
 
         {
-            extern "C" {
+            unsafe extern "C" {
                 #[linkage = "extern_weak"]
                 static ABC: *const u8;
             }
@@ -309,7 +311,7 @@ fn main() {
 
     check_niche_behavior();
 
-    extern "C" {
+    unsafe extern "C" {
         type ExternType;
     }
 
@@ -362,7 +364,7 @@ fn stack_val_align() {
 }
 
 #[cfg(all(not(jit), target_arch = "x86_64", any(target_os = "linux", target_os = "macos")))]
-extern "C" {
+unsafe extern "C" {
     fn global_asm_test();
 }
 
@@ -412,7 +414,7 @@ struct pthread_attr_t {
 
 #[link(name = "pthread")]
 #[cfg(unix)]
-extern "C" {
+unsafe extern "C" {
     fn pthread_attr_init(attr: *mut pthread_attr_t) -> c_int;
 
     fn pthread_create(
@@ -433,7 +435,7 @@ type HANDLE = *mut c_void;
 
 #[link(name = "msvcrt")]
 #[cfg(windows)]
-extern "C" {
+unsafe extern "C" {
     fn WaitForSingleObject(hHandle: LPVOID, dwMilliseconds: DWORD) -> DWORD;
 
     fn CreateThread(
@@ -455,46 +457,51 @@ struct Thread {
 
 impl Thread {
     unsafe fn create(f: extern "C" fn(_: *mut c_void) -> *mut c_void) -> Self {
-        #[cfg(unix)]
-        {
-            let mut attr: pthread_attr_t = zeroed();
-            let mut thread: pthread_t = 0;
+        unsafe {
+            #[cfg(unix)]
+            {
+                let mut attr: pthread_attr_t = zeroed();
+                let mut thread: pthread_t = 0;
 
-            if pthread_attr_init(&mut attr) != 0 {
-                assert!(false);
-            }
+                if pthread_attr_init(&mut attr) != 0 {
+                    assert!(false);
+                }
+
+                if pthread_create(&mut thread, &attr, f, 0 as *mut c_void) != 0 {
+                    assert!(false);
+                }
 
-            if pthread_create(&mut thread, &attr, f, 0 as *mut c_void) != 0 {
-                assert!(false);
+                Thread { handle: thread }
             }
 
-            Thread { handle: thread }
-        }
+            #[cfg(windows)]
+            {
+                let handle =
+                    CreateThread(0 as *mut c_void, 0, f, 0 as *mut c_void, 0, 0 as *mut u32);
 
-        #[cfg(windows)]
-        {
-            let handle = CreateThread(0 as *mut c_void, 0, f, 0 as *mut c_void, 0, 0 as *mut u32);
+                if (handle as u64) == 0 {
+                    assert!(false);
+                }
 
-            if (handle as u64) == 0 {
-                assert!(false);
+                Thread { handle }
             }
-
-            Thread { handle }
         }
     }
 
     unsafe fn join(self) {
-        #[cfg(unix)]
-        {
-            let mut res = 0 as *mut c_void;
-            pthread_join(self.handle, &mut res);
-        }
+        unsafe {
+            #[cfg(unix)]
+            {
+                let mut res = 0 as *mut c_void;
+                pthread_join(self.handle, &mut res);
+            }
 
-        #[cfg(windows)]
-        {
-            // The INFINITE macro is used to signal operations that do not timeout.
-            let infinite = 0xffffffff;
-            assert!(WaitForSingleObject(self.handle, infinite) == 0);
+            #[cfg(windows)]
+            {
+                // The INFINITE macro is used to signal operations that do not timeout.
+                let infinite = 0xffffffff;
+                assert!(WaitForSingleObject(self.handle, infinite) == 0);
+            }
         }
     }
 }