Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump lock_api dependency #135

Merged
merged 1 commit into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
));
Expand Down
2 changes: 1 addition & 1 deletion crates/sel4-dlmalloc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ license = "BSD-2-Clause"

[dependencies]
dlmalloc = "0.2.3"
lock_api = "0.4.11"
lock_api = "0.4.12"
2 changes: 1 addition & 1 deletion crates/sel4-dlmalloc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
),
Expand Down
2 changes: 1 addition & 1 deletion crates/sel4-sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion hacking/cargo-manifest-management/manifest-scope.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading