feat: update rust edition to 2024 and change asm! to naked_asm!

Author: guttatus

Cargo.toml

@@ -1,3 +1,4 @@
 [workspace]
+resolver = "3"
 members = ["xtask", "fast-trap", "test-app"]
 default-members = ["xtask"]

fast-trap/Cargo.toml

@@ -2,7 +2,7 @@
 name = "fast-trap"
 description = "Provide a framework for bare-metal trap handling, aiming at ensuring performance while reusing code."
 version = "0.0.1"
-edition = "2021"
+edition = "2024"
 authors = ["YdrMaster <[email protected]>"]
 repository = "https://github.com/YdrMaster/fast-trap.git"
 documentation = "https://docs.rs/fast-trap"

fast-trap/src/hal/riscv/mod.rs

@@ -111,14 +111,13 @@ impl FlowContext {
 #[naked]
 pub unsafe extern "C" fn reuse_stack_for_trap() {
     const LAYOUT: Layout = Layout::new::<TrapHandler>();
-    core::arch::asm!(
+    core::arch::naked_asm!(
         "   addi sp, sp, {size}
             andi sp, sp, {mask}
             ret
         ",
         size = const -(LAYOUT.size() as isize),
         mask = const !(LAYOUT.align() as isize - 1) ,
-        options(noreturn)
     )
 }
 
@@ -127,7 +126,7 @@ pub unsafe extern "C" fn reuse_stack_for_trap() {
 /// See [proto](crate::hal::doc::trap_entry).
 #[naked]
 pub unsafe extern "C" fn trap_entry() {
-    core::arch::asm!(
+    core::arch::naked_asm!(
         ".align 2",
         // 换栈
         exchange!(),
@@ -242,6 +241,5 @@ pub unsafe extern "C" fn trap_entry() {
         load!(a1[ 9] => a1),
         exchange!(),
         r#return!(),
-        options(noreturn),
     )
 }

test-app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "test-app"
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 authors = ["YdrMaster <[email protected]>"]
 publish = false
 

xtask/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "xtask"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 authors = ["YdrMaster <[email protected]>"]
 publish = false