librustc: Make `use` statements crate-relative by default. r=brson

4 files changed, 11 insertions, 8 deletions

diff --git a/src/libcore/task/local_data.rs b/src/libcore/task/local_data.rs
index cc0353a354b..ca8cc67dc4a 100644
--- a/src/libcore/task/local_data.rs
+++ b/src/libcore/task/local_data.rs
@@ -26,7 +26,7 @@ magic.
 
 */
 
-use local_data_priv::{
+use task::local_data_priv::{
     local_pop,
     local_get,
     local_set,
diff --git a/src/libcore/task/local_data_priv.rs b/src/libcore/task/local_data_priv.rs
index 494801d88ea..a5ae3291b87 100644
--- a/src/libcore/task/local_data_priv.rs
+++ b/src/libcore/task/local_data_priv.rs
@@ -10,8 +10,13 @@
 
 #[doc(hidden)]; // FIXME #3538
 
-use local_data::LocalDataKey;
+use task::local_data::LocalDataKey;
+
+#[cfg(notest)]
 use rt::rust_task;
+#[cfg(test)]
+#[allow(non_camel_case_types)]
+type rust_task = libc::c_void;
 
 pub trait LocalData { }
 impl<T: Owned> @T: LocalData { }
diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs
index 98da3f50318..d9b040abf7b 100644
--- a/src/libcore/task/mod.rs
+++ b/src/libcore/task/mod.rs
@@ -41,12 +41,10 @@
 use cmp::Eq;
 use result::Result;
 use pipes::{stream, Chan, Port};
-use local_data_priv::{local_get, local_set};
+use task::local_data_priv::{local_get, local_set};
+use task::rt::{task_id, rust_task};
 use util::replace;
 
-use rt::task_id;
-use rt::rust_task;
-
 mod local_data_priv;
 pub mod local_data;
 pub mod rt;
diff --git a/src/libcore/task/spawn.rs b/src/libcore/task/spawn.rs
index 61e358e1e30..e2ed853ee29 100644
--- a/src/libcore/task/spawn.rs
+++ b/src/libcore/task/spawn.rs
@@ -73,8 +73,8 @@
 #[doc(hidden)]; // FIXME #3538
 #[warn(deprecated_mode)];
 
-use rt::rust_task;
-use rt::rust_closure;
+use task::rt::rust_task;
+use task::rt::rust_closure;
 
 macro_rules! move_it (
     { $x:expr } => ( unsafe { let y = move *ptr::addr_of(&($x)); move y } )