Bump lock_api

To include Amanieu/parking_lot#426 Signed-off-by: Nick Spinale <[email protected]>
seL4 · May 2, 2024 · 7b5cb21 · 7b5cb21
1 parent 96e2b8c
commit 7b5cb21
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/examples/microkit/http-server/helpers/virtio-hal-impl/src/lib.rs b/crates/examples/microkit/http-server/helpers/virtio-hal-impl/src/lib.rs
@@ -56,7 +56,7 @@ impl HalImpl {
             BounceBufferAllocator::new(Basic::new(dma_region_size), max_alignment);
 
         GLOBAL_STATE
-            .set(Mutex::const_new(
+            .set(Mutex::from_raw(
                 GenericRawMutex::new(PanickingMutexSyncOps::new()),
                 State {
                     dma_region,

diff --git a/crates/private/tests/capdl/threads/components/test/src/main.rs b/crates/private/tests/capdl/threads/components/test/src/main.rs
@@ -32,7 +32,7 @@ const INITIAL_VALUE: i32 = 0;
 fn main(config: Config) {
     debug_println!("{:#?}", config);
 
-    let lock = Arc::new(Mutex::const_new(
+    let lock = Arc::new(Mutex::from_raw(
         GenericRawMutex::new(config.lock_nfn.get()),
         INITIAL_VALUE,
     ));

diff --git a/crates/sel4-dlmalloc/Cargo.toml b/crates/sel4-dlmalloc/Cargo.toml
@@ -18,4 +18,4 @@ license = "BSD-2-Clause"
 
 [dependencies]
 dlmalloc = "0.2.3"
-lock_api = "0.4.11"
+lock_api = "0.4.12"
diff --git a/crates/sel4-dlmalloc/src/lib.rs b/crates/sel4-dlmalloc/src/lib.rs
@@ -19,7 +19,7 @@ pub type StaticDlmallocGlobalAlloc<R, T> = DlmallocGlobalAlloc<R, StaticDlmalloc
 impl<R, T> StaticDlmallocGlobalAlloc<R, T> {
     pub const fn new(raw_mutex: R, get_bounds: T) -> Self {
         Self {
-            dlmalloc: Mutex::const_new(
+            dlmalloc: Mutex::from_raw(
                 raw_mutex,
                 Dlmalloc::new_with_allocator(StaticDlmallocAllocator::new(get_bounds)),
             ),

diff --git a/crates/sel4-sync/Cargo.toml b/crates/sel4-sync/Cargo.toml
@@ -17,6 +17,6 @@ edition = "2021"
 license = "MIT"
 
 [dependencies]
-lock_api = "0.4.11"
+lock_api = "0.4.12"
 sel4 = { path = "../sel4" }
 sel4-immediate-sync-once-cell = { path = "../sel4-immediate-sync-once-cell" }
diff --git a/hacking/cargo-manifest-management/manifest-scope.nix b/hacking/cargo-manifest-management/manifest-scope.nix
@@ -97,7 +97,7 @@ in rec {
     getrandom = "0.2.10";
     gimli = "0.28.0";
     heapless = "0.7.16";
-    lock_api = "0.4.11";
+    lock_api = "0.4.12";
     log = "0.4.17";
     num = "0.4.1";
     num_enum = "0.5.9";