Skip to content

Commit

Permalink
Merge pull request #1020 from hermit-os/dependabot/cargo/talc-4.0.0
Browse files Browse the repository at this point in the history
build(deps): bump talc from 3.1.2 to 4.0.0
  • Loading branch information
mkroening authored Jan 2, 2024
2 parents c35354b + ab2d4b8 commit 4cd8885
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
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.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ rand_chacha = { version = "0.3", default-features = false }
shell-words = { version = "1.1", default-features = false }
smallvec = { version = "1", features = ["const_new"] }
take-static = "0.1"
talc = { version = "3" }
talc = { version = "4" }
time = { version = "0.3", default-features = false }
zerocopy = { version = "0.7", features = ["derive"] }

Expand Down
2 changes: 1 addition & 1 deletion src/mm/allocator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl LockedAllocator {
pub unsafe fn init(&self, heap_bottom: *mut u8, heap_size: usize) {
let arena = Span::from_base_size(heap_bottom, heap_size);
unsafe {
self.0.talc().claim(arena).unwrap();
self.0.lock().claim(arena).unwrap();
}
}
}
Expand Down

0 comments on commit 4cd8885

Please sign in to comment.