Switch to 2024 edition

Author: phcoder

grub_rust_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Vladimir Serbinenko <[email protected]>"]
-edition = "2018"
+edition = "2024"
 name = "grub"
 version = "0.1.0"
 

grub_rust_core/src/lib.rs

@@ -4,6 +4,7 @@
 #![feature(rustc_attrs)]
 #![feature(format_args_nl)]
 #![feature(inherent_str_constructors)]
+#![warn(static_mut_refs)]
 
 extern crate alloc;
 
@@ -22,14 +23,14 @@ use core::ffi::CStr;
 use core::panic::PanicInfo;
 use core::num::TryFromIntError;
 
-#[link_section = ".modname"]
-#[no_mangle]
+#[unsafe(link_section = ".modname")]
+#[unsafe(no_mangle)]
 pub static GRUB_MODNAME: [u8; 5] = *b"rust\0";
-#[link_section = ".module_license"]
-#[no_mangle]
+#[unsafe(link_section = ".module_license")]
+#[unsafe(no_mangle)]
 pub static GRUB_LICENSE: [u8; 15] = *b"LICENSE=GPLv3+\0";
 
-extern "C" {
+unsafe extern "C" {
     static grub_xputs: extern "C" fn(stri: *const c_char);
     fn grub_abort();
     fn grub_malloc(sz: usize) -> *mut u8;
@@ -88,7 +89,7 @@ macro_rules! eformat {
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn strlen(s: *const c_char) -> usize {
     return unsafe { grub_strlen(s) }; 
 }
@@ -314,11 +315,11 @@ struct GrubAllocator;
 
 unsafe impl GlobalAlloc for GrubAllocator {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        return grub_malloc(layout.size());
+        return unsafe { grub_malloc(layout.size()) };
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {
-        grub_free(ptr);
+        unsafe { grub_free(ptr) };
     }
 }
 

grub_rust_example/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Vladimir Serbinenko <[email protected]>"]
-edition = "2018"
+edition = "2024"
 readme = "README.md"
 name = "grub-rust-hello"
 version = "0.1.0"

grub_rust_example/src/lib.rs

@@ -17,11 +17,11 @@ use grub::dprintln;
 use grub::println;
 use grub::eformat;
 
-#[link_section = ".modname"]
-#[no_mangle]
+#[unsafe(link_section = ".modname")]
+#[unsafe(no_mangle)]
 pub static GRUB_MODNAME_EXAMPLE: [u8; 11] = *b"rust_hello\0";
-#[link_section = ".module_license"]
-#[no_mangle]
+#[unsafe(link_section = ".module_license")]
+#[unsafe(no_mangle)]
 pub static GRUB_LICENSE_EXAMPLE: [u8; 15] = *b"LICENSE=GPLv3+\0";
 
 
@@ -121,7 +121,7 @@ fn rust_hexdump (args: &[&str]) -> Result<(), grub::GrubError> {
     return Ok(());
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn grub_mod_init() {
     grub::Command::register("rust_hello", rust_hello,
 				"Rust hello", "Say hello from Rust.");
@@ -131,7 +131,7 @@ pub extern "C" fn grub_mod_init() {
 				"Rust hexdump", "Hexdump a file from Rust.");
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn grub_mod_fini() {
     grub::Command::unregister_all();
 }