Skip to content
Open
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.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "mimalloc"
version = "0.1.48"
version = "0.1.49"
authors = [
"Octavian Oncescu <octavonce@gmail.com>",
"Vincent Rouillé <vincent@speedy37.fr>",
"Thom Chiovoloni <chiovolonit@gmail.com>",
]
edition = "2018"
edition = "2024"
repository = "https://github.com/purpleprotocol/mimalloc_rust"
keywords = ["mimalloc", "allocator", "encrypted-heap", "performance"]
categories = ["memory-management", "api-bindings"]
Expand Down
4 changes: 2 additions & 2 deletions libmimalloc-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "libmimalloc-sys"
version = "0.1.44"
version = "0.1.45"
authors = ["Octavian Oncescu <octavonce@gmail.com>"]
edition = "2018"
edition = "2024"
repository = "https://github.com/purpleprotocol/mimalloc_rust/tree/master/libmimalloc-sys"
keywords = ["allocator", "encrypted-heap", "performance"]
categories = ["memory-management", "api-bindings"]
Expand Down
2 changes: 1 addition & 1 deletion libmimalloc-sys/c_src/mimalloc/v3
Submodule v3 updated 172 files
2 changes: 1 addition & 1 deletion libmimalloc-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ mod extended;
#[cfg(feature = "extended")]
pub use extended::*;

extern "C" {
unsafe extern "C" {
/// Allocate zero-initialized `size` bytes.
///
/// Returns a pointer to newly allocated zero-initialized memory, or null if
Expand Down
10 changes: 6 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,24 @@ pub struct MiMalloc;
unsafe impl GlobalAlloc for MiMalloc {
#[inline]
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
mi_malloc_aligned(layout.size(), layout.align()) as *mut u8
unsafe { mi_malloc_aligned(layout.size(), layout.align()) as *mut u8 }
}

#[inline]
unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
mi_zalloc_aligned(layout.size(), layout.align()) as *mut u8
unsafe { mi_zalloc_aligned(layout.size(), layout.align()) as *mut u8 }
}

#[inline]
unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {
mi_free(ptr as *mut c_void);
unsafe {
mi_free(ptr as *mut c_void);
}
}

#[inline]
unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
mi_realloc_aligned(ptr as *mut c_void, new_size, layout.align()) as *mut u8
unsafe { mi_realloc_aligned(ptr as *mut c_void, new_size, layout.align()) as *mut u8 }
}
}

Expand Down