upgrade to rust 2024

Author: Mic92

.cargo/config renamed to .cargo/config.toml

@@ -1,7 +1,7 @@
 [package]
 name = "nix-ld"
 version = "2.0.4"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 name = "nix-ld"
@@ -15,9 +15,16 @@ cfg-match = "0.2.1"
 constcat = "0.6.1"
 default-env = "0.1.1"
 embedded-io = "0.6.1"
-goblin = { version = "0.9.3", default-features = false, features = ["elf32", "elf64"] }
+goblin = { version = "0.9.3", default-features = false, features = [
+    "elf32",
+    "elf64",
+] }
 heapless = "0.8.0"
-linux-raw-sys = { version = "0.9.4", default-features = false, features = ["no_std", "general", "errno"] }
+linux-raw-sys = { version = "0.9.4", default-features = false, features = [
+    "no_std",
+    "general",
+    "errno",
+] }
 log = "0.4.27"
 
 [build-dependencies]

Cargo.lock

@@ -1,6 +1,6 @@
 //! Args wrangling.
 
-use core::ffi::{c_void, CStr};
+use core::ffi::{CStr, c_void};
 use core::mem;
 use core::slice;
 

Cargo.toml

@@ -47,7 +47,7 @@ struct Context {
     ld_library_path: Option<VarHandle>,
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 unsafe extern "C" fn main(argc: usize, argv: *const *const u8, envp: *const *const u8) -> ! {
     fixup::fixup_relocs(envp);
 
@@ -56,7 +56,7 @@ unsafe extern "C" fn main(argc: usize, argv: *const *const u8, envp: *const *con
     arch::main_relocate_stack!(stack, real_main);
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn real_main() -> ! {
     let args = unsafe { ARGS.assume_init_mut() };
     let mut ctx = Context::default();

flake.lock

@@ -62,7 +62,7 @@ fn panic_handler(info: &core::panic::PanicInfo) -> ! {
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn __stack_chk_fail() -> ! {
     explode("stack smashing detected");
 }

src/args.rs

@@ -26,7 +26,7 @@ use heapless::Vec as ArrayVec;
 pub use linux_raw_sys::errno;
 
 #[link(name = "c_kinda", kind = "static")]
-extern "C" {
+unsafe extern "C" {
     pub fn write(fd: i32, buf: *const u8, count: usize) -> isize;
     #[must_use]
     pub fn mmap(
@@ -181,6 +181,6 @@ pub fn new_slice_leak(size: usize) -> Option<&'static mut [u8]> {
 
 #[cfg(not(test))]
 #[lang = "eh_personality"]
-#[no_mangle]
-pub extern fn rust_eh_personality() {
+#[unsafe(no_mangle)]
+pub extern "C" fn rust_eh_personality() {
 }