Merge pull request #526 from spencer3035/update-to-2024-edition

Code changes to update to 2024 edition

Author: phil-opp

Cargo.toml

@@ -5,7 +5,7 @@ license.workspace = true
 version.workspace = true
 repository.workspace = true
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
-edition = "2021"
+edition = "2024"
 
 [workspace]
 members = [

api/Cargo.toml

@@ -3,7 +3,7 @@ name = "bootloader_api"
 license.workspace = true
 version.workspace = true
 repository.workspace = true
-edition = "2021"
+edition = "2024"
 description = "Makes a kernel compatible with the bootloader crate"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

api/src/lib.rs

@@ -114,7 +114,7 @@ macro_rules! entry_point {
     };
     ($path:path, config = $config:expr) => {
         const _: () = {
-            #[link_section = ".bootloader-config"]
+            #[unsafe(link_section = ".bootloader-config")]
             pub static __BOOTLOADER_CONFIG: [u8; $crate::BootloaderConfig::SERIALIZED_LEN] = {
                 // validate the type
                 let config: &$crate::BootloaderConfig = $config;
@@ -125,7 +125,7 @@ macro_rules! entry_point {
             static __BOOTLOADER_CONFIG_REF: &[u8; $crate::BootloaderConfig::SERIALIZED_LEN] =
                 &__BOOTLOADER_CONFIG;
 
-            #[export_name = "_start"]
+            #[unsafe(export_name = "_start")]
             pub extern "C" fn __impl_start(boot_info: &'static mut $crate::BootInfo) -> ! {
                 // validate the signature of the program entry point
                 let f: fn(&'static mut $crate::BootInfo) -> ! = $path;

bios/boot_sector/Cargo.toml

@@ -2,7 +2,7 @@
 name = "bootloader-x86_64-bios-boot-sector"
 version.workspace = true
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
-edition = "2021"
+edition = "2024"
 license.workspace = true
 repository.workspace = true
 description = "BIOS boot sector for the `bootloader` crate"

bios/boot_sector/src/fail.rs

@@ -28,7 +28,7 @@ impl<T, E> UnwrapOrFail for Result<T, E> {
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn print_char(c: u8) {
     let ax = u16::from(c) | 0x0e00;
     unsafe {
@@ -38,7 +38,7 @@ pub extern "C" fn print_char(c: u8) {
 
 #[cold]
 #[inline(never)]
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn fail(code: u8) -> ! {
     print_char(b'!');
     print_char(code);

bios/boot_sector/src/main.rs

@@ -11,7 +11,7 @@ mod dap;
 mod fail;
 mod mbr;
 
-extern "C" {
+unsafe extern "C" {
     static _partition_table: u8;
     static _second_stage_start: u8;
 }
@@ -25,7 +25,7 @@ fn second_stage_start() -> *const () {
     ptr as *const ()
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn first_stage(disk_number: u16) {
     // read partition table and look for second stage partition
     let partition_table = unsafe { slice::from_raw_parts(partition_table_raw(), 16 * 4) };

bios/common/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bootloader-x86_64-bios-common"
 version.workspace = true
-edition = "2021"
+edition = "2024"
 license.workspace = true
 repository.workspace = true
 description = "Common code for BIOS stages of the `bootloader` crate"

bios/stage-2/Cargo.toml

@@ -2,7 +2,7 @@
 name = "bootloader-x86_64-bios-stage-2"
 version.workspace = true
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
-edition = "2021"
+edition = "2024"
 license.workspace = true
 repository.workspace = true
 description = "Second BIOS stage of the `bootloader` crate"

bios/stage-2/src/dap.rs

@@ -37,20 +37,22 @@ impl DiskAddressPacket {
 
     pub unsafe fn perform_load(&self, disk_number: u16) {
         let self_addr = self as *const Self as u16;
-        asm!(
-            "push 'z'", // error code `z`, passed to `fail` on error
-            "mov {1:x}, si",
-            "mov si, {0:x}",
-            "int 0x13",
-            "jnc 2f", // carry is set on fail
-            "call fail",
-            "2:",
-            "pop si", // remove error code again
-            "mov si, {1:x}",
-            in(reg) self_addr,
-            out(reg) _,
-            in("ax") 0x4200u16,
-            in("dx") disk_number,
-        );
+        unsafe {
+            asm!(
+                "push 'z'", // error code `z`, passed to `fail` on error
+                "mov {1:x}, si",
+                "mov si, {0:x}",
+                "int 0x13",
+                "jnc 2f", // carry is set on fail
+                "call fail",
+                "2:",
+                "pop si", // remove error code again
+                "mov si, {1:x}",
+                in(reg) self_addr,
+                out(reg) _,
+                in("ax") 0x4200u16,
+                in("dx") disk_number,
+            );
+        }
     }
 }

bios/stage-2/src/disk.rs

@@ -15,6 +15,7 @@ impl Read for DiskAccess {
         static mut TMP_BUF: AlignedArrayBuffer<1024> = AlignedArrayBuffer {
             buffer: [0; 512 * 2],
         };
+        #[allow(static_mut_refs)]
         let buf = unsafe { &mut TMP_BUF };
         assert!(current_sector_offset + len <= buf.buffer.len());