parity-util-mem: define the default allocator explicitly

paritytech · Mar 23, 2020 · c97538a · c97538a
1 parent 939151e
commit c97538a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/parity-util-mem/CHANGELOG.md b/parity-util-mem/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog].
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
+### Breaking
+- Explicitly specify the default global allocator. [#363](https://github.com/paritytech/parity-common/pull/363)
 
 ## [0.6.0] - 2020-03-13
 - Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361)

diff --git a/parity-util-mem/src/lib.rs b/parity-util-mem/src/lib.rs
@@ -39,8 +39,14 @@ cfg_if::cfg_if! {
 		/// Global allocator
 		#[global_allocator]
 		pub static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
-	} else {
+	} else if #[cfg(feature = "std")] {
 		// default allocator used
+		use std::alloc;
+		// We define it explicitly to prevent specifiying a global allocator
+		// ouside of this library.
+		/// Global allocator
+		#[global_allocator]
+		pub static ALLOC: alloc::System = alloc::System;
 	}
 }