revert the previous commit, update linkme to 0.3.31

arceos-org · Dec 20, 2024 · 16a27d7 · 16a27d7
1 parent 0aab899
commit 16a27d7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 env:
   qemu-version: 8.2.0
   rust-toolchain: nightly-2024-12-12
-  arceos-apps: 'beb8d3d'
+  arceos-apps: '66d6a80'
 
 jobs:
   unit-test:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/modules/axhal/Cargo.toml b/modules/axhal/Cargo.toml
@@ -22,7 +22,7 @@ default = []
 [dependencies]
 log = "=0.4.21"
 cfg-if = "1.0"
-linkme = "0.3"
+linkme = "0.3.31"
 bitflags = "2.6"
 static_assertions = "1.1.0"
 kernel_guard = "0.1"

diff --git a/modules/axhal/src/trap.rs b/modules/axhal/src/trap.rs
@@ -7,11 +7,11 @@ use page_table_entry::MappingFlags;
 pub use linkme::distributed_slice as register_trap_handler;
 
 /// A slice of IRQ handler functions.
-#[unsafe(def_trap_handler)]
+#[def_trap_handler]
 pub static IRQ: [fn(usize) -> bool];
 
 /// A slice of page fault handler functions.
-#[unsafe(def_trap_handler)]
+#[def_trap_handler]
 pub static PAGE_FAULT: [fn(VirtAddr, MappingFlags, bool) -> bool];
 
 #[allow(unused_macros)]