diff options
| author | bors <bors@rust-lang.org> | 2013-03-02 02:09:38 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-02 02:09:38 -0800 |
| commit | 2f901126d4c2c19334842e539561b15e7e74159d (patch) | |
| tree | 9b306f07aa69766d317e796f6ed31b182f40df48 /src/libcore/task | |
| parent | 10faa521aef3721effc2ac9c2df0ceca4d825f98 (diff) | |
| parent | 9639ca5aa88c59cedc7bbe4bd31ec7dabe8a62ec (diff) | |
| download | rust-2f901126d4c2c19334842e539561b15e7e74159d.tar.gz rust-2f901126d4c2c19334842e539561b15e7e74159d.zip | |
auto merge of #5191 : brson/rust/movert, r=brson
Moving them out of the way so the new scheduler code can occupy core::rt.
Diffstat (limited to 'src/libcore/task')
| -rw-r--r-- | src/libcore/task/local_data_priv.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libcore/task/local_data_priv.rs b/src/libcore/task/local_data_priv.rs index df5a5af74ca..fc152765322 100644 --- a/src/libcore/task/local_data_priv.rs +++ b/src/libcore/task/local_data_priv.rs @@ -19,11 +19,7 @@ use prelude::*; use task::rt; use task::local_data::LocalDataKey; -#[cfg(notest)] -use rt::rust_task; -#[cfg(test)] -#[allow(non_camel_case_types)] -type rust_task = libc::c_void; +use super::rt::rust_task; pub trait LocalData { } impl<T:Durable> LocalData for @T { } |