From 2e56f9318ff22ba4502b3a779d4a7f29b6ba1dfb Mon Sep 17 00:00:00 2001 From: Dorus Janssens Date: Wed, 4 Feb 2026 15:24:58 +0800 Subject: [PATCH 1/2] Bump mimalloc v2 and v3 submodules --- libmimalloc-sys/c_src/mimalloc/v2 | 2 +- libmimalloc-sys/c_src/mimalloc/v3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libmimalloc-sys/c_src/mimalloc/v2 b/libmimalloc-sys/c_src/mimalloc/v2 index fbd8b99..6a53d72 160000 --- a/libmimalloc-sys/c_src/mimalloc/v2 +++ b/libmimalloc-sys/c_src/mimalloc/v2 @@ -1 +1 @@ -Subproject commit fbd8b99c2b828428947d70fdc046bb55609be93e +Subproject commit 6a53d72d46a1a641d8e5793db37cb2da60e04192 diff --git a/libmimalloc-sys/c_src/mimalloc/v3 b/libmimalloc-sys/c_src/mimalloc/v3 index dfa50c3..7b7fca4 160000 --- a/libmimalloc-sys/c_src/mimalloc/v3 +++ b/libmimalloc-sys/c_src/mimalloc/v3 @@ -1 +1 @@ -Subproject commit dfa50c37d951128b1e77167dd9291081aa88eea4 +Subproject commit 7b7fca4b7013d77e356d96e055fec309cb3cbbd6 From 7c6c94939bfd3b76dc87fd1a9f2a902a380951b5 Mon Sep 17 00:00:00 2001 From: Dorus Janssens Date: Wed, 4 Feb 2026 15:40:57 +0800 Subject: [PATCH 2/2] Update to version 2024 --- Cargo.toml | 4 ++-- libmimalloc-sys/Cargo.toml | 4 ++-- libmimalloc-sys/src/lib.rs | 2 +- src/lib.rs | 10 ++++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4aee4be..899166d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "mimalloc" -version = "0.1.48" +version = "0.1.49" authors = [ "Octavian Oncescu ", "Vincent Rouillé ", "Thom Chiovoloni ", ] -edition = "2018" +edition = "2024" repository = "https://github.com/purpleprotocol/mimalloc_rust" keywords = ["mimalloc", "allocator", "encrypted-heap", "performance"] categories = ["memory-management", "api-bindings"] diff --git a/libmimalloc-sys/Cargo.toml b/libmimalloc-sys/Cargo.toml index 67eeb4c..e6db689 100644 --- a/libmimalloc-sys/Cargo.toml +++ b/libmimalloc-sys/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "libmimalloc-sys" -version = "0.1.44" +version = "0.1.45" authors = ["Octavian Oncescu "] -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"] diff --git a/libmimalloc-sys/src/lib.rs b/libmimalloc-sys/src/lib.rs index ff2442e..f371d98 100644 --- a/libmimalloc-sys/src/lib.rs +++ b/libmimalloc-sys/src/lib.rs @@ -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 diff --git a/src/lib.rs b/src/lib.rs index 4288b2f..c12c383 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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 } } }