Merge pull request #27 from linkmauve/edition-2024

Bump to edition 2024

Author: ProfElements

Cargo.toml

@@ -2,7 +2,7 @@
 name = "luma"
 version = "0.1.0"
 authors = ["rust-wii"]
-edition = "2018"
+edition = "2024"
 
 [profile]
 dev = { panic = "abort" }

luma_core/Cargo.toml

@@ -2,7 +2,7 @@
 name = "luma_core"
 version = "0.1.0"
 authors = ["rust-wii"]
-edition = "2018"
+edition = "2024"
 
 [dependencies]
 bitflags = "2"

luma_core/src/allocate.rs

@@ -1,4 +1,4 @@
-use alloc::alloc::{alloc, Layout};
+use alloc::alloc::{Layout, alloc};
 use alloc::boxed::Box;
 use core::pin::Pin;
 use core::slice;
@@ -31,6 +31,6 @@ pub unsafe fn ptr_as_pinned_array<T: Copy, const LENGTH: usize>(
     ptr: *mut T,
 ) -> Pin<Box<[T; LENGTH]>> {
     let array = ptr as *mut [T; LENGTH];
-    let boxed = Box::from_raw(array);
+    let boxed = unsafe { Box::from_raw(array) };
     Pin::from(boxed)
 }

luma_core/src/cache.rs

@@ -8,7 +8,7 @@ use core::arch::{asm, global_asm};
 global_asm!(include_str!("../asm/cache.S"));
 
 // Load cache functions from global assembly.
-extern "C" {
+unsafe extern "C" {
     /// Enable the L1 d(ata)-cache.
     ///
     /// **NOTE**: This function calls ``sync`` before enabling.

luma_core/src/lib.rs

@@ -46,10 +46,10 @@ pub mod ipc;
 ///
 /// Unlike puts(), it doesn’t require a null-terminated CStr, so in the optimal case we can pass a
 /// &str’s pointer as is, without doing any extra allocation.
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[inline(never)]
-unsafe extern "C" fn __write_console(_unused: u32, message: *const u8, size: *const u32) {
-    asm!("/* {0} {1} */", in(reg) message, in(reg) size);
+extern "C" fn __write_console(_unused: u32, message: *const u8, size: *const u32) {
+    unsafe { asm!("/* {0} {1} */", in(reg) message, in(reg) size) };
 }
 
 /// Implements Write using Dolphin’s HLE.
@@ -59,7 +59,7 @@ impl fmt::Write for DolphinHle {
     #[inline(always)]
     fn write_str(&mut self, s: &str) -> fmt::Result {
         let len = s.len() as u32;
-        unsafe { __write_console(0, s.as_ptr(), &len as *const u32) };
+        __write_console(0, s.as_ptr(), &len as *const u32);
         Ok(())
     }
 

luma_core/src/vi.rs

@@ -154,11 +154,11 @@ unsafe fn set_xfb(addr: u32, xfb: &Xfb, bottom: bool) {
 }
 
 unsafe fn set_top_xfb(xfb: &Xfb) {
-    set_xfb(BASE + 0x1c, xfb, false);
+    unsafe { set_xfb(BASE + 0x1c, xfb, false) };
 }
 
 unsafe fn set_bottom_xfb(xfb: &Xfb) {
-    set_xfb(BASE + 0x24, xfb, true);
+    unsafe { set_xfb(BASE + 0x24, xfb, true) };
 }
 
 /*
@@ -219,21 +219,23 @@ unsafe fn set_border() {
 }
 
 unsafe fn setup_interlaced(width: usize, height: usize, xfb: &Xfb) {
-    set_vertical_timing(height as u16, 6);
-    configure(ConfigureFlags::PAL | ConfigureFlags::INTERLACED | ConfigureFlags::ENABLE);
-    // TODO: figure out why 0x40 becomes 0x42 once read here…
-    set_horizontal_timing(71, 105, 429, 373, 162, 64);
-    set_field_vertical_timing(3, 24, 2, 25);
-    set_burst_blanking_interval_1(520, 12, 520, 12);
-    set_burst_blanking_interval_2(519, 13, 519, 13);
-    set_top_xfb(xfb);
-    set_bottom_xfb(xfb);
-    set_display_interrupts();
-    // 0x40 and 0x44 are display latch registers, unused?
-    set_scaled_width(width as u16);
-    set_aa_filters();
-    set_clock(27 /* MHz */);
-    set_border();
+    unsafe {
+        set_vertical_timing(height as u16, 6);
+        configure(ConfigureFlags::PAL | ConfigureFlags::INTERLACED | ConfigureFlags::ENABLE);
+        // TODO: figure out why 0x40 becomes 0x42 once read here…
+        set_horizontal_timing(71, 105, 429, 373, 162, 64);
+        set_field_vertical_timing(3, 24, 2, 25);
+        set_burst_blanking_interval_1(520, 12, 520, 12);
+        set_burst_blanking_interval_2(519, 13, 519, 13);
+        set_top_xfb(xfb);
+        set_bottom_xfb(xfb);
+        set_display_interrupts();
+        // 0x40 and 0x44 are display latch registers, unused?
+        set_scaled_width(width as u16);
+        set_aa_filters();
+        set_clock(27 /* MHz */);
+        set_border();
+    }
 }
 
 /// A struct representing the Video Interface, or VI.  This is the piece of hardware which scans

luma_runtime/Cargo.toml

@@ -2,7 +2,7 @@
 name = "luma_runtime"
 version = "0.1.0"
 authors = ["rust-wii"]
-edition = "2018"
+edition = "2024"
 
 [dependencies]
 luma_core = { path = "../luma_core" }

luma_runtime/src/lib.rs

@@ -19,7 +19,7 @@ use luma_core::cache::*;
 use luma_core::println;
 
 // Import linker symbols for allocator initialization.
-extern "C" {
+unsafe extern "C" {
     pub static __stack_addr: usize;
     pub static __stack_end: usize;
 }
@@ -69,13 +69,13 @@ impl Termination for () {}
 
 /// This function is called on panic.
 #[cfg_attr(not(test), panic_handler)]
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn panic(info: &PanicInfo) -> ! {
     println!("{}", info);
     loop {}
 }
 
 /// Error handler personality language item (current no-op, to satisfy clippy).
 #[cfg_attr(not(test), lang = "eh_personality")]
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn rust_eh_personality() {}