Make allocator opt-in

rusterlium · Feb 15, 2024 · 62aba90 · 62aba90
1 parent 7f837ab
commit 62aba90
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,3 +13,9 @@ members = [
   "rustler_tests/native/rustler_compile_tests",
   "rustler_benchmarks/native/benchmark",
 ]
+default-members = [
+  "rustler",
+  "rustler_bigint",
+  "rustler_codegen",
+  "rustler_sys",
+]
diff --git a/rustler/Cargo.toml b/rustler/Cargo.toml
@@ -9,7 +9,7 @@ readme = "../README.md"
 edition = "2021"
 
 [features]
-default = ["derive", "nif_version_2_15", "allocator"]
+default = ["derive", "nif_version_2_15"]
 derive = ["rustler_codegen"]
 alternative_nif_init_name = []
 allocator = []

diff --git a/rustler/src/alloc.rs b/rustler/src/alloc.rs
@@ -1,5 +1,9 @@
 use std::alloc::{GlobalAlloc, Layout};
 
+#[cfg(feature = "allocator")]
+#[global_allocator]
+static ALLOCATOR: EnifAllocator = EnifAllocator;
+
 /// Allocator implementation that forwards all allocation calls to Erlang's allocator. Allows the
 /// memory usage to be tracked by the BEAM.
 pub struct EnifAllocator;

diff --git a/rustler/src/lib.rs b/rustler/src/lib.rs
@@ -30,11 +30,6 @@ pub mod wrapper;
 pub mod codegen_runtime;
 
 mod alloc;
-pub use alloc::EnifAllocator;
-
-#[cfg(feature = "allocator")]
-#[global_allocator]
-static ALLOCATOR: EnifAllocator = EnifAllocator;
 
 pub use lazy_static;
 

diff --git a/rustler_tests/native/deprecated_macros/Cargo.toml b/rustler_tests/native/deprecated_macros/Cargo.toml
@@ -10,4 +10,4 @@ path = "src/lib.rs"
 crate-type = ["cdylib"]
 
 [dependencies]
-rustler = { path = "../../../rustler" }
+rustler = { path = "../../../rustler", features = ["allocator"]}
diff --git a/rustler_tests/native/dynamic_load/Cargo.toml b/rustler_tests/native/dynamic_load/Cargo.toml
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rustler_bigint = { path = "../../../rustler_bigint" }
-rustler = { path = "../../../rustler" }
+rustler = { path = "../../../rustler", features = ["allocator"] }
diff --git a/rustler_tests/native/rustler_bigint_test/Cargo.toml b/rustler_tests/native/rustler_bigint_test/Cargo.toml
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rustler_bigint = { path = "../../../rustler_bigint" }
-rustler = { path = "../../../rustler" }
+rustler = { path = "../../../rustler", features = ["allocator"] }
diff --git a/rustler_tests/native/rustler_compile_tests/Cargo.toml b/rustler_tests/native/rustler_compile_tests/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 lazy_static = "1.4"
-rustler = { path = "../../../rustler" }
+rustler = { path = "../../../rustler", features = ["allocator"] }
diff --git a/rustler_tests/native/rustler_test/Cargo.toml b/rustler_tests/native/rustler_test/Cargo.toml
@@ -21,4 +21,4 @@ nif_version_2_17 = ["nif_version_2_16", "rustler/nif_version_2_17"]
 
 [dependencies]
 lazy_static = "1.4"
-rustler = { path = "../../../rustler" }
+rustler = { path = "../../../rustler", features = ["allocator"] }