diff options
| author | Aaron Turon <aturon@mozilla.com> | 2014-11-23 19:21:17 -0800 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2014-12-18 23:31:34 -0800 |
| commit | 2b3477d373603527d23cc578f3737857b7b253d7 (patch) | |
| tree | 56022ebf11d5d27a6ef15f15d00d014a84a35837 /src/libstd/task.rs | |
| parent | 840de072085df360733c48396224e9966e2dc72c (diff) | |
libs: merge librustrt into libstd
This commit merges the `rustrt` crate into `std`, undoing part of the facade. This merger continues the paring down of the runtime system. Code relying on the public API of `rustrt` will break; some of this API is now available through `std::rt`, but is likely to change and/or be removed very soon. [breaking-change]
Diffstat (limited to 'src/libstd/task.rs')
| -rw-r--r-- | src/libstd/task.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/task.rs b/src/libstd/task.rs index 324b594209a..127cad186f6 100644 --- a/src/libstd/task.rs +++ b/src/libstd/task.rs @@ -53,9 +53,9 @@ use kinds::Send; use option::Option; use option::Option::{None, Some}; use result::Result; -use rustrt::local::Local; -use rustrt::task::Task; -use rustrt::task; +use rt::local::Local; +use rt::task; +use rt::task::Task; use str::SendStr; use string::{String, ToString}; use thunk::{Thunk}; @@ -252,7 +252,7 @@ pub fn try_future<T,F>(f: F) -> Future<Result<T, Box<Any + Send>>> /// Read the name of the current task. #[stable] pub fn name() -> Option<String> { - use rustrt::task::Task; + use rt::task::Task; let task = Local::borrow(None::<Task>); match task.name { @@ -264,7 +264,7 @@ pub fn name() -> Option<String> { /// Yield control to the task scheduler. #[unstable = "Name will change."] pub fn deschedule() { - use rustrt::task::Task; + use rt::task::Task; Task::yield_now(); } @@ -272,7 +272,7 @@ pub fn deschedule() { /// destructor that is run while unwinding the stack after a call to `panic!()`). #[unstable = "May move to a different module."] pub fn failing() -> bool { - use rustrt::task::Task; + use rt::task::Task; Local::borrow(None::<Task>).unwinder.unwinding() } |
