librustc: Make unqualified identifier searches terminate at the nearest module scope. r=tjc

4 files changed, 11 insertions, 1 deletions

diff --git a/src/libcore/task/local_data.rs b/src/libcore/task/local_data.rs
index 0cfceb6358a..990d309a159 100644
--- a/src/libcore/task/local_data.rs
+++ b/src/libcore/task/local_data.rs
@@ -26,6 +26,7 @@ magic.
 
 */
 
+use prelude::*;
 use rt;
 use task::local_data_priv::{local_get, local_pop, local_modify, local_set};
 use task;
diff --git a/src/libcore/task/local_data_priv.rs b/src/libcore/task/local_data_priv.rs
index c6b3cfa6626..c08f0f9c997 100644
--- a/src/libcore/task/local_data_priv.rs
+++ b/src/libcore/task/local_data_priv.rs
@@ -11,9 +11,11 @@
 #[doc(hidden)]; // FIXME #3538
 
 use cast;
+use cmp::Eq;
 use dvec;
 use libc;
 use option;
+use prelude::*;
 use task::rt;
 use task::local_data::LocalDataKey;
 
diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs
index 245b955c871..62d30bdc45c 100644
--- a/src/libcore/task/mod.rs
+++ b/src/libcore/task/mod.rs
@@ -48,6 +48,7 @@ use option;
 use result::Result;
 use pipes::{stream, Chan, Port};
 use pipes;
+use prelude::*;
 use ptr;
 use result;
 use task::local_data_priv::{local_get, local_set};
diff --git a/src/libcore/task/spawn.rs b/src/libcore/task/spawn.rs
index a904cbec3e5..1ffd7fee6b1 100644
--- a/src/libcore/task/spawn.rs
+++ b/src/libcore/task/spawn.rs
@@ -76,13 +76,19 @@
 use cast;
 use oldcomm;
 use option;
+use pipes::{Chan, Port};
 use pipes;
+use prelude::*;
 use private;
 use ptr;
 use send_map;
-use task::rt;
+use task::local_data_priv::{local_get, local_set};
 use task::rt::rust_task;
 use task::rt::rust_closure;
+use task::rt;
+use task::{Failure, ManualThreads, PlatformThread, SchedOpts, SingleThreaded};
+use task::{Success, TaskOpts, TaskResult, ThreadPerCore, ThreadPerTask};
+use task::{default_task_opts, unkillable};
 use uint;
 use util;