Merge pull request #19 from hermit-os/interrupt-mutex-crate

chore: migrate to interrupt-mutex crate
hermit-os · Oct 8, 2023 · 548cc85 · 548cc85
2 parents f71f5e7 + 1fb8bfd
commit 548cc85
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 77 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ categories = ["rust-patterns", "no-std"]
 exclusive_cell = "0.1"
 generic_once_cell = "0.1"
 interrupts = "0.1"
+interrupt-mutex = "0.1"
 lock_api = "0.4"
 
 [dev-dependencies]

diff --git a/src/lib.rs b/src/lib.rs
@@ -93,8 +93,8 @@ pub(crate) mod mutex;
 pub(crate) mod rwlock;
 
 pub use exclusive_cell::{CallOnce, CallOnceError, ExclusiveCell};
+pub use interrupt_mutex::{InterruptMutex, InterruptMutexGuard, RawInterruptMutex};
 pub use interrupts::without as without_interrupts;
-pub use mutex::interrupt::{InterruptMutex, InterruptMutexGuard, RawInterruptMutex};
 pub use mutex::spin::{RawSpinMutex, SpinMutex, SpinMutexGuard};
 pub use mutex::ticket::{RawTicketMutex, TicketMutex, TicketMutexGuard};
 pub use mutex::{

diff --git a/src/mutex/interrupt.rs b/src/mutex/interrupt.rs
diff --git a/src/mutex/mod.rs b/src/mutex/mod.rs
@@ -1,8 +1,7 @@
-pub(crate) mod interrupt;
 pub(crate) mod spin;
 pub(crate) mod ticket;
 
-use interrupt::RawInterruptMutex;
+use interrupt_mutex::RawInterruptMutex;
 use spin::RawSpinMutex;
 use ticket::RawTicketMutex;