summary refs log tree commit diff
path: root/src/libstd/rt/mod.rs
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2014-04-25 02:19:34 -0400
committerDaniel Micay <danielmicay@gmail.com>2014-05-10 19:58:17 -0400
commit1b1ca6d5465ef4de12b1adf25cd4598f261c660d (patch)
tree29c49a2ad0b6fdb69610019f84a5fa70ca62319e /src/libstd/rt/mod.rs
parent11571cd9c1cde63c3b46ca65e608b84647785ac8 (diff)
downloadrust-1b1ca6d5465ef4de12b1adf25cd4598f261c660d.tar.gz
rust-1b1ca6d5465ef4de12b1adf25cd4598f261c660d.zip
add back jemalloc to the tree
This adds a `std::rt::heap` module with a nice allocator API. It's a
step towards fixing #13094 and is a starting point for working on a
generic allocator trait.

The revision used for the jemalloc submodule is the stable 3.6.0 release.

Closes #11807
Diffstat (limited to 'src/libstd/rt/mod.rs')
-rw-r--r--src/libstd/rt/mod.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index 5b9c314d42b..904921cfa18 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -89,7 +89,10 @@ mod macros;
 // The global (exchange) heap.
 pub mod global_heap;
 
-// Implementations of language-critical runtime features like @.
+/// The low-level memory allocation API.
+pub mod heap;
+
+/// Implementations of language-critical runtime features like @.
 pub mod task;
 
 // The EventLoop and internal synchronous I/O interface.