auto merge of #6329 : sonwow/rust/issue-6306, r=ILyoan

Fix for #6306 

9 files changed, 11 insertions, 10 deletions

diff --git a/src/libcore/condition.rs b/src/libcore/condition.rs
index 1240fe03dd5..75c6cf0e969 100644
--- a/src/libcore/condition.rs
+++ b/src/libcore/condition.rs
@@ -12,7 +12,7 @@
 
 use prelude::*;
 use task;
-use task::local_data::{local_data_pop, local_data_set};
+use local_data::{local_data_pop, local_data_set};
 
 // helper for transmutation, shown below.
 type RustClosure = (int, int);
@@ -24,14 +24,14 @@ pub struct Handler<T, U> {
 
 pub struct Condition<'self, T, U> {
     name: &'static str,
-    key: task::local_data::LocalDataKey<'self, Handler<T, U>>
+    key: local_data::LocalDataKey<'self, Handler<T, U>>
 }
 
 pub impl<'self, T, U> Condition<'self, T, U> {
     fn trap(&'self self, h: &'self fn(T) -> U) -> Trap<'self, T, U> {
         unsafe {
             let p : *RustClosure = ::cast::transmute(&h);
-            let prev = task::local_data::local_data_get(self.key);
+            let prev = local_data::local_data_get(self.key);
             let h = @Handler { handle: *p, prev: prev };
             Trap { cond: self, handler: h }
         }
diff --git a/src/libcore/core.rc b/src/libcore/core.rc
index 31229967e93..3cc95e5a175 100644
--- a/src/libcore/core.rc
+++ b/src/libcore/core.rc
@@ -215,6 +215,7 @@ pub mod trie;
 pub mod task;
 pub mod comm;
 pub mod pipes;
+pub mod local_data;
 
 
 /* Runtime and platform support */
diff --git a/src/libcore/task/local_data.rs b/src/libcore/local_data.rs
index d4b02a0ad9b..d4b02a0ad9b 100644
--- a/src/libcore/task/local_data.rs
+++ b/src/libcore/local_data.rs
diff --git a/src/libcore/os.rs b/src/libcore/os.rs
index 574618026d9..26d4790705a 100644
--- a/src/libcore/os.rs
+++ b/src/libcore/os.rs
@@ -1208,7 +1208,7 @@ fn overridden_arg_key(_v: @OverriddenArgs) {}
 
 pub fn args() -> ~[~str] {
     unsafe {
-        match task::local_data::local_data_get(overridden_arg_key) {
+        match local_data::local_data_get(overridden_arg_key) {
             None => real_args(),
             Some(args) => copy args.val
         }
@@ -1218,7 +1218,7 @@ pub fn args() -> ~[~str] {
 pub fn set_args(new_args: ~[~str]) {
     unsafe {
         let overridden_args = @OverriddenArgs { val: copy new_args };
-        task::local_data::local_data_set(overridden_arg_key, overridden_args);
+        local_data::local_data_set(overridden_arg_key, overridden_args);
     }
 }
 
diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs
index d263d2cdbee..22172db9302 100644
--- a/src/libcore/prelude.rs
+++ b/src/libcore/prelude.rs
@@ -81,6 +81,7 @@ pub use io;
 pub use iter;
 pub use old_iter;
 pub use libc;
+pub use local_data;
 pub use num;
 pub use ops;
 pub use option;
diff --git a/src/libcore/rand.rs b/src/libcore/rand.rs
index f11840c95d5..2eb429a5e9c 100644
--- a/src/libcore/rand.rs
+++ b/src/libcore/rand.rs
@@ -836,13 +836,13 @@ fn tls_rng_state(_v: @@mut IsaacRng) {}
 pub fn task_rng() -> @@mut IsaacRng {
     let r : Option<@@mut IsaacRng>;
     unsafe {
-        r = task::local_data::local_data_get(tls_rng_state);
+        r = local_data::local_data_get(tls_rng_state);
     }
     match r {
         None => {
             unsafe {
                 let rng = @@mut IsaacRng::new_seeded(seed());
-                task::local_data::local_data_set(tls_rng_state, rng);
+                local_data::local_data_set(tls_rng_state, rng);
                 rng
             }
         }
diff --git a/src/libcore/rt/local_services.rs b/src/libcore/rt/local_services.rs
index 5ca7a72e84e..01bef5e2458 100644
--- a/src/libcore/rt/local_services.rs
+++ b/src/libcore/rt/local_services.rs
@@ -198,7 +198,7 @@ mod test {
 
     #[test]
     fn tls() {
-        use task::local_data::*;
+        use local_data::*;
         do run_in_newsched_task() {
             unsafe {
                 fn key(_x: @~str) { }
diff --git a/src/libcore/task/local_data_priv.rs b/src/libcore/task/local_data_priv.rs
index 97628f38a7b..a30db039f30 100644
--- a/src/libcore/task/local_data_priv.rs
+++ b/src/libcore/task/local_data_priv.rs
@@ -15,7 +15,7 @@ use cmp::Eq;
 use libc;
 use prelude::*;
 use task::rt;
-use task::local_data::LocalDataKey;
+use local_data::LocalDataKey;
 
 use super::rt::rust_task;
 use rt::local_services::LocalStorage;
diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs
index e58aa14572b..2484d8c5fed 100644
--- a/src/libcore/task/mod.rs
+++ b/src/libcore/task/mod.rs
@@ -47,7 +47,6 @@ use unstable::finally::Finally;
 #[cfg(test)] use comm::SharedChan;
 
 mod local_data_priv;
-pub mod local_data;
 pub mod rt;
 pub mod spawn;