tests/unit: update most tests to edition 2024

kkysen · kkysen · commit 6043bee79632 · 2026-03-07T17:01:54.000-08:00
diff --git a/tests/unit/README.md b/tests/unit/README.md
@@ -16,7 +16,7 @@ use crate::c_file::rust_example;
 use std::ffi::c_int;
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn example(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/arrays/Cargo.toml b/tests/unit/arrays/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "array-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libc = "0.2"
diff --git a/tests/unit/arrays/src/test_arrays.rs b/tests/unit/arrays/src/test_arrays.rs
@@ -6,7 +6,7 @@ use crate::variable_arrays::{rust_alloca_arrays, rust_variable_arrays};
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 
     fn entry2(_: c_uint, _: *mut c_int);
@@ -20,9 +20,10 @@ extern "C" {
     fn check_some_ints() -> bool;
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub static SOME_INTS: [u32; 4] = [2, 0, 1, 8];
-#[no_mangle]
+
+#[unsafe(no_mangle)]
 pub static rust_SOME_INTS: [u32; 4] = [2, 0, 1, 8];
 
 const BUFFER_SIZE: usize = 49;
diff --git a/tests/unit/asm.aarch64/Cargo.toml b/tests/unit/asm.aarch64/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "asm-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 c2rust-asm-casts = { path = "../../../c2rust-asm-casts", version = "0.22.1" }
diff --git a/tests/unit/asm.aarch64/src/test_asm.rs b/tests/unit/asm.aarch64/src/test_asm.rs
@@ -4,7 +4,7 @@ use crate::asm::rust_entry;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/asm.arm/Cargo.toml b/tests/unit/asm.arm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "asm-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/asm.arm/src/test_asm.rs b/tests/unit/asm.arm/src/test_asm.rs
@@ -2,7 +2,7 @@ use crate::asm::rust_entry;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/asm.x86_64/Cargo.toml b/tests/unit/asm.x86_64/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "asm-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 c2rust-asm-casts = { path = "../../../c2rust-asm-casts", version = "0.22.1" }
diff --git a/tests/unit/asm.x86_64/src/test_asm.rs b/tests/unit/asm.x86_64/src/test_asm.rs
@@ -4,7 +4,7 @@ use crate::asm::rust_entry;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/casts/Cargo.toml b/tests/unit/casts/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cast-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libc = "0.2"
diff --git a/tests/unit/casts/src/test_casts.rs b/tests/unit/casts/src/test_casts.rs
@@ -8,7 +8,7 @@ use std::ffi::{c_int, c_uint, c_void};
 use std::mem::transmute;
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn cast_stuff();
 
     fn identity(_: c_int) -> c_int;
diff --git a/tests/unit/comments/Cargo.toml b/tests/unit/comments/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "comments-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libc = "0.2"
diff --git a/tests/unit/conditionals/Cargo.toml b/tests/unit/conditionals/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "conditional-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/conditionals/src/test_conditionals.rs b/tests/unit/conditionals/src/test_conditionals.rs
@@ -1,5 +1,3 @@
-//! feature_raw_ref_op
-
 use crate::binary_conditional::rust_entry3;
 use crate::conditional::rust_entry;
 use crate::conditionals::{rust_entry2, rust_ternaries};
@@ -10,7 +8,7 @@ use crate::unused_conditionals::{
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 
     fn entry2(_: c_uint, _: *mut c_int);
diff --git a/tests/unit/enums/Cargo.toml b/tests/unit/enums/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "enum-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/enums/src/test_enums.rs b/tests/unit/enums/src/test_enums.rs
@@ -12,7 +12,7 @@ use crate::top_enum::{rust_entry4, E as otherE};
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 
     fn entry2(_: c_uint, _: *mut c_int);
diff --git a/tests/unit/example/Cargo.toml b/tests/unit/example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "example-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/example/src/test_add.rs b/tests/unit/example/src/test_add.rs
@@ -2,7 +2,7 @@ use crate::add::rust_add;
 use std::ffi::c_uint;
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn add(left: c_uint, right: c_uint) -> c_uint;
 }
 
diff --git a/tests/unit/example/src/test_sub.rs b/tests/unit/example/src/test_sub.rs
@@ -2,7 +2,7 @@ use crate::sub::rust_sub;
 use std::ffi::c_uint;
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn sub(left: c_uint, right: c_uint) -> c_uint;
 }
 
diff --git a/tests/unit/floats/Cargo.toml b/tests/unit/floats/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "float-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/floats/src/test_no_wrapping_neg.rs b/tests/unit/floats/src/test_no_wrapping_neg.rs
@@ -2,7 +2,7 @@ use crate::no_float_wrapping_neg::{rust_double_inc_dec, rust_float_inc_dec, rust
 use std::ffi::{c_double, c_float};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn no_wrapping_neg() -> c_double;
     fn float_inc_dec() -> c_float;
     fn double_inc_dec() -> c_double;
diff --git a/tests/unit/gotos/Cargo.toml b/tests/unit/gotos/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goto-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/gotos/src/test_irreducible.rs b/tests/unit/gotos/src/test_irreducible.rs
@@ -2,7 +2,7 @@ use crate::irreducible::rust_irreducible;
 use std::ffi::c_int;
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn irreducible(_: c_int) -> c_int;
 }
 
diff --git a/tests/unit/ints/Cargo.toml b/tests/unit/ints/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "int-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/ints/src/test_arithmetic.rs b/tests/unit/ints/src/test_arithmetic.rs
@@ -4,7 +4,7 @@ use crate::arithmetic::rust_entry2;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry2(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/ints/src/test_compound_assignment.rs b/tests/unit/ints/src/test_compound_assignment.rs
@@ -3,7 +3,7 @@ use crate::compound_assignment::rust_compound_assignment;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn compound_assignment(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/ints/src/test_const.rs b/tests/unit/ints/src/test_const.rs
@@ -2,7 +2,7 @@ use crate::const_test::rust_entry4;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry4(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/ints/src/test_implicit_ints.rs b/tests/unit/ints/src/test_implicit_ints.rs
@@ -3,7 +3,7 @@
 use crate::implicit_int::{identity as rust_identity, implicit_int as rust_implicit_int};
 use std::ffi::{c_int, c_uint};
 
-extern "C" {
+unsafe extern "C" {
     fn identity(_: c_int) -> c_int;
 
     fn implicit_int();
diff --git a/tests/unit/ints/src/test_ints.rs b/tests/unit/ints/src/test_ints.rs
@@ -3,7 +3,7 @@ use crate::size_t::rust_entry;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 
     fn multibyte_chars(_: c_uint, _: *mut c_int) -> c_int;
diff --git a/tests/unit/ints/src/test_sieve_of_eratosthenes.rs b/tests/unit/ints/src/test_sieve_of_eratosthenes.rs
@@ -2,7 +2,7 @@ use crate::sieve_of_eratosthenes::rust_sieve_of_eratosthenes;
 use std::ffi::c_int;
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn sieve_of_eratosthenes(_: *mut c_int);
 }
 
diff --git a/tests/unit/ints/src/test_volatile.rs b/tests/unit/ints/src/test_volatile.rs
@@ -2,7 +2,7 @@ use crate::volatile::rust_entry3;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry3(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/loops/Cargo.toml b/tests/unit/loops/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "loops-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/loops/src/test_goto.rs b/tests/unit/loops/src/test_goto.rs
@@ -5,7 +5,7 @@ use crate::goto_switch_cf::rust_goto_switch;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn goto_linear(_: c_uint, _: *mut c_int);
 
     fn goto_loop(_: c_uint, _: *mut c_int);
diff --git a/tests/unit/loops/src/test_loops.rs b/tests/unit/loops/src/test_loops.rs
@@ -2,7 +2,7 @@ use crate::break_continue::rust_entry;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 }
 
diff --git a/tests/unit/loops/src/test_switch.rs b/tests/unit/loops/src/test_switch.rs
@@ -2,7 +2,7 @@ use crate::switch::rust_switch_val;
 use std::ffi::c_int;
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn switch_val(_: c_int) -> c_int;
 }
 
diff --git a/tests/unit/macros/Cargo.toml b/tests/unit/macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "macros-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libc = "0.2"
diff --git a/tests/unit/macros/src/test_define.rs b/tests/unit/macros/src/test_define.rs
@@ -6,7 +6,7 @@ use crate::define::{rust_test_zstd, ZSTD_WINDOWLOG_MAX_32, ZSTD_WINDOWLOG_MAX_64
 use std::ffi::{c_int, c_uint, c_ulong};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn reference_define() -> c_uint;
 }
 
diff --git a/tests/unit/modules/Cargo.toml b/tests/unit/modules/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "modules-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libc = "0.2"
diff --git a/tests/unit/modules/src/test_modules.rs b/tests/unit/modules/src/test_modules.rs
@@ -2,7 +2,7 @@ use crate::modules::rust_modules;
 use std::ffi::c_uint;
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn modules();
 }
 
diff --git a/tests/unit/unions/Cargo.toml b/tests/unit/unions/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "union-tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
diff --git a/tests/unit/unions/src/test_unions.rs b/tests/unit/unions/src/test_unions.rs
@@ -2,7 +2,7 @@ use crate::unions::rust_entry;
 use std::ffi::{c_int, c_uint};
 
 #[link(name = "test")]
-extern "C" {
+unsafe extern "C" {
     fn entry(_: c_uint, _: *mut c_int);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ use crate::asm::rust_entry;`
`4`	`4`	`use std::ffi::{c_int, c_uint};`
`5`	`5`
`6`	`6`	`#[link(name = "test")]`
`7`		`-extern "C" {`
	`7`	`+unsafe extern "C" {`
`8`	`8`	`fn entry(_: c_uint, _: *mut c_int);`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use crate::asm::rust_entry;`
`2`	`2`	`use std::ffi::{c_int, c_uint};`
`3`	`3`
`4`	`4`	`#[link(name = "test")]`
`5`		`-extern "C" {`
	`5`	`+unsafe extern "C" {`
`6`	`6`	`fn entry(_: c_uint, _: *mut c_int);`
`7`	`7`	`}`
`8`	`8`