summary refs log tree commit diff
path: root/src/libstd/rt/mod.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-05-13 16:10:05 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-17 21:52:23 -0700
commit639759b7f46b2ea7fd93cbfdb6fa39ab24f8774f (patch)
treec6c817beed1f623f9d933326c75e0a45e6f196c9 /src/libstd/rt/mod.rs
parent3da5a5cd18dc2a2177160772725946c3b4512f7c (diff)
downloadrust-639759b7f46b2ea7fd93cbfdb6fa39ab24f8774f.tar.gz
rust-639759b7f46b2ea7fd93cbfdb6fa39ab24f8774f.zip
std: Refactor liballoc out of lib{std,sync}
This commit is part of the libstd facade RFC, issue #13851. This creates a new
library, liballoc, which is intended to be the core allocation library for all
of Rust. It is pinned on the basic assumption that an allocation failure is an
abort or failure.

This module has inherited the heap/libc_heap modules from std::rt, the owned/rc
modules from std, and the arc module from libsync. These three pointers are
currently the three most core pointer implementations in Rust.

The UnsafeArc type in std::sync should be considered deprecated and replaced by
Arc<Unsafe<T>>. This commit does not currently migrate to this type, but future
commits will continue this refactoring.
Diffstat (limited to 'src/libstd/rt/mod.rs')
-rw-r--r--src/libstd/rt/mod.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index a04cbabedd6..daf18346fee 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -74,6 +74,8 @@ pub use self::unwind::{begin_unwind, begin_unwind_fmt};
 
 pub use self::util::{Stdio, Stdout, Stderr};
 
+pub use alloc::{heap, libc_heap};
+
 // FIXME: these probably shouldn't be public...
 #[doc(hidden)]
 pub mod shouldnt_be_public {
@@ -86,12 +88,6 @@ pub mod shouldnt_be_public {
 // Internal macros used by the runtime.
 mod macros;
 
-/// Wrappers around malloc / realloc aborting on out-of-memory.
-pub mod libc_heap;
-
-/// The low-level memory allocation API.
-pub mod heap;
-
 /// Implementations of language-critical runtime features like @.
 pub mod task;