Move mimalloc feature to imageflow_helpers and fix conflict with syst…

…em alloc
imazen · Jan 21, 2025 · 15ac8fb · 15ac8fb
1 parent 25438a7
commit 15ac8fb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/imageflow_core/Cargo.toml b/imageflow_core/Cargo.toml
@@ -77,7 +77,6 @@ evalchroma = "1"
 libpng-sys = { version = "1.1.9", features = ["static", "static-libz", "libz-sys"] }
 
 
-mimalloc = { version = "*", features = ["secure"], optional = true }
 
 [dev-dependencies]
 hyper = "1.4"
@@ -90,8 +89,6 @@ rand = "*"
 default = []
 nightly = []
 c_rendering = []
-mimalloc = ["dep:mimalloc"]
-
 [[bench]]
 name="bench_graphics"
 path = "benches/bench_graphics.rs"

diff --git a/imageflow_core/src/lib.rs b/imageflow_core/src/lib.rs
@@ -151,10 +151,3 @@ pub mod for_other_imageflow_crates {
         }
     }
 }
-
-#[cfg(feature = "mimalloc")]
-use mimalloc::MiMalloc;
-
-#[cfg(feature = "mimalloc")]
-#[global_allocator]
-static GLOBAL: MiMalloc = MiMalloc;
diff --git a/imageflow_helpers/Cargo.toml b/imageflow_helpers/Cargo.toml
@@ -52,9 +52,13 @@ unicase = "2"
 
 backtrace = "0.3"
 
+mimalloc = { version = "*", features = ["secure"], optional = true }
+
+
 [dev-dependencies]
 mockito = "*"
 
 [features]
 nightly = []
+mimalloc = ["dep:mimalloc"]
 
diff --git a/imageflow_helpers/src/lib.rs b/imageflow_helpers/src/lib.rs
@@ -21,11 +21,19 @@
 //    }
 //}
 
+#[cfg(not(feature = "mimalloc"))]
 use std::alloc::System;
+#[cfg(not(feature = "mimalloc"))]
 
 #[global_allocator]
 static GLOBAL: System = System;
 
+#[cfg(feature = "mimalloc")]
+use mimalloc::MiMalloc;
+
+#[cfg(feature = "mimalloc")]
+#[global_allocator]
+static GLOBAL: MiMalloc = MiMalloc;
 
 //#[macro_use]
 //extern crate error_chain;