Migrate testcrate and panic-handler to edition 2024

tgross35 · tgross35 · commit eb884770735a · 2025-03-06T03:58:28.000-05:00
Includes `extern` -&gt; `unsafe extern` blocks and formatting updates.
diff --git a/compiler-builtins/crates/panic-handler/Cargo.toml b/compiler-builtins/crates/panic-handler/Cargo.toml
@@ -2,7 +2,7 @@
 name = "panic-handler"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/compiler-builtins/testcrate/Cargo.toml b/compiler-builtins/testcrate/Cargo.toml
@@ -2,7 +2,7 @@
 name = "testcrate"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lib]
diff --git a/compiler-builtins/testcrate/benches/float_add.rs b/compiler-builtins/testcrate/benches/float_add.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
 use compiler_builtins::float::add;
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 float_bench! {
diff --git a/compiler-builtins/testcrate/benches/float_cmp.rs b/compiler-builtins/testcrate/benches/float_cmp.rs
@@ -1,6 +1,6 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 use compiler_builtins::float::cmp;
diff --git a/compiler-builtins/testcrate/benches/float_conv.rs b/compiler-builtins/testcrate/benches/float_conv.rs
@@ -2,7 +2,7 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
 use compiler_builtins::float::conv;
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 /* unsigned int -> float */
diff --git a/compiler-builtins/testcrate/benches/float_div.rs b/compiler-builtins/testcrate/benches/float_div.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
 use compiler_builtins::float::div;
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 float_bench! {
diff --git a/compiler-builtins/testcrate/benches/float_extend.rs b/compiler-builtins/testcrate/benches/float_extend.rs
@@ -3,7 +3,7 @@
 #![cfg_attr(f16_enabled, feature(f16))]
 
 use compiler_builtins::float::extend;
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 #[cfg(f16_enabled)]
diff --git a/compiler-builtins/testcrate/benches/float_mul.rs b/compiler-builtins/testcrate/benches/float_mul.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
 use compiler_builtins::float::mul;
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 float_bench! {
diff --git a/compiler-builtins/testcrate/benches/float_pow.rs b/compiler-builtins/testcrate/benches/float_pow.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
 use compiler_builtins::float::pow;
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 float_bench! {
diff --git a/compiler-builtins/testcrate/benches/float_sub.rs b/compiler-builtins/testcrate/benches/float_sub.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
 use compiler_builtins::float::sub;
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 float_bench! {
diff --git a/compiler-builtins/testcrate/benches/float_trunc.rs b/compiler-builtins/testcrate/benches/float_trunc.rs
@@ -2,7 +2,7 @@
 #![cfg_attr(f16_enabled, feature(f16))]
 
 use compiler_builtins::float::trunc;
-use criterion::{criterion_main, Criterion};
+use criterion::{Criterion, criterion_main};
 use testcrate::float_bench;
 
 #[cfg(f16_enabled)]
diff --git a/compiler-builtins/testcrate/benches/mem.rs b/compiler-builtins/testcrate/benches/mem.rs
@@ -1,7 +1,7 @@
 #![feature(test)]
 
 extern crate test;
-use test::{black_box, Bencher};
+use test::{Bencher, black_box};
 
 extern crate compiler_builtins;
 use compiler_builtins::mem::{memcmp, memcpy, memmove, memset};
diff --git a/compiler-builtins/testcrate/src/bench.rs b/compiler-builtins/testcrate/src/bench.rs
@@ -89,6 +89,10 @@ pub fn skip_asm_checks(_test_name: &str) -> bool {
 
 /// Create a comparison of the system symbol, compiler_builtins, and optionally handwritten
 /// assembly.
+///
+/// # Safety
+///
+/// The signature must be correct and any assembly must be sound.
 #[macro_export]
 macro_rules! float_bench {
     (
@@ -120,8 +124,9 @@ macro_rules! float_bench {
         ]
         $(,)?
     ) => {paste::paste! {
+        // SAFETY: macro invocation must use the correct signature
         #[cfg($sys_available)]
-        extern "C" {
+        unsafe extern "C" {
             /// Binding for the system function
             #[cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))]
             fn $sys_fn($($arg: $arg_ty),*) -> $ret_ty;
diff --git a/compiler-builtins/testcrate/src/lib.rs b/compiler-builtins/testcrate/src/lib.rs
@@ -22,8 +22,8 @@ extern crate alloc;
 use compiler_builtins::float::Float;
 use compiler_builtins::int::{Int, MinInt};
 
-use rand_xoshiro::rand_core::{RngCore, SeedableRng};
 use rand_xoshiro::Xoshiro128StarStar;
+use rand_xoshiro::rand_core::{RngCore, SeedableRng};
 
 /// Sets the number of fuzz iterations run for most tests. In practice, the vast majority of bugs
 /// are caught by the edge case testers. Most of the remaining bugs triggered by more complex
diff --git a/compiler-builtins/testcrate/tests/big.rs b/compiler-builtins/testcrate/tests/big.rs
@@ -1,4 +1,4 @@
-use compiler_builtins::int::{i256, u256, HInt, MinInt};
+use compiler_builtins::int::{HInt, MinInt, i256, u256};
 
 const LOHI_SPLIT: u128 = 0xaaaaaaaaaaaaaaaaffffffffffffffff;
 
