From ff449daccd43e00c087e063fa7b1ac6572ab4813 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Thu, 2 May 2024 08:34:23 +0000 Subject: [PATCH] Bump lock_api To include https://github.com/Amanieu/parking_lot/pull/426 Signed-off-by: Nick Spinale --- Cargo.lock | 4 ++-- .../microkit/http-server/helpers/virtio-hal-impl/src/lib.rs | 2 +- .../private/tests/capdl/threads/components/test/src/main.rs | 2 +- crates/sel4-dlmalloc/Cargo.toml | 2 +- crates/sel4-dlmalloc/src/lib.rs | 2 +- crates/sel4-sync/Cargo.toml | 2 +- hacking/cargo-manifest-management/manifest-scope.nix | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4cdc63cb9..345d90ba1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -938,9 +938,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", 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 index 19de6df34..521312c0b 100644 --- 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 index 38c727dcd..8925e453c 100644 --- 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 index 831fca5ae..a74df52e9 100644 --- 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 index 147412d21..8c72d80ee 100644 --- a/crates/sel4-dlmalloc/src/lib.rs +++ b/crates/sel4-dlmalloc/src/lib.rs @@ -19,7 +19,7 @@ pub type StaticDlmallocGlobalAlloc = DlmallocGlobalAlloc StaticDlmallocGlobalAlloc { 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 index 8de908bbf..fe344833f 100644 --- 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 index 961ff793f..82ca0491e 100644 --- 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";