diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-04 00:01:40 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-06 23:00:01 -0700 |
| commit | 75014f7b1790e7ebdf13d38acc04dfdab6e450e9 (patch) | |
| tree | 46fb046e002a37ba60f6e8b8ef5ee0675fbb7fd8 /src/libstd/rt | |
| parent | d743b8831e6dc5b390af112cc23159d667cf583b (diff) | |
| download | rust-75014f7b1790e7ebdf13d38acc04dfdab6e450e9.tar.gz rust-75014f7b1790e7ebdf13d38acc04dfdab6e450e9.zip | |
libs: Fix miscellaneous fallout of librustrt
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/backtrace.rs | 6 | ||||
| -rw-r--r-- | src/libstd/rt/mod.rs | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index 4229e9ad32c..766901fa04f 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -603,6 +603,7 @@ mod imp { mod imp { use c_str::CString; use container::Container; + use intrinsics; use io::{IoResult, Writer}; use libc; use mem; @@ -610,11 +611,10 @@ mod imp { use option::{Some, None}; use path::Path; use result::{Ok, Err}; + use rt::mutex::{StaticNativeMutex, NATIVE_MUTEX_INIT}; + use slice::ImmutableVector; use str::StrSlice; use unstable::dynamic_lib::DynamicLibrary; - use intrinsics; - use unstable::mutex::{StaticNativeMutex, NATIVE_MUTEX_INIT}; - use slice::ImmutableVector; #[allow(non_snake_case_functions)] extern "system" { diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index e8df7465a74..a68a632bc37 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -57,10 +57,11 @@ Several modules in `core` are clients of `rt`: use failure; use rustrt; -// TODO: dox +// Reexport some of our utilities which are expected by other crates. pub use self::util::{default_sched_threads, min_stack, running_on_valgrind}; -// TODO: dox +// Reexport functionality from librustrt and other crates underneath the +// standard library which work together to create the entire runtime. pub use alloc::{heap, libc_heap}; pub use rustrt::{task, local, mutex, exclusive, stack, args, rtio}; pub use rustrt::{Stdio, Stdout, Stderr, begin_unwind, begin_unwind_fmt}; |
