diff options
| author | bors <bors@rust-lang.org> | 2015-08-12 17:07:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-12 17:07:11 +0000 |
| commit | 8b5948d5bf08f27bf443356549a25b39d40c159d (patch) | |
| tree | f3d54534ff69927186d3b2a6e892544899b77716 /src/libstd/thread | |
| parent | 81c9ff24fe6d53eb51d9427302ec842da49b9edc (diff) | |
| parent | 6b09eb8e17d1952a930e1411da85703c2c534dde (diff) | |
| download | rust-8b5948d5bf08f27bf443356549a25b39d40c159d.tar.gz rust-8b5948d5bf08f27bf443356549a25b39d40c159d.zip | |
Auto merge of #27688 - alexcrichton:rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 6 | ||||
| -rw-r--r-- | src/libstd/thread/scoped_tls.rs | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 0615033736e..3bf170b5fe2 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -12,9 +12,6 @@ #![unstable(feature = "thread_local_internals")] -#[cfg(stage0)] -use prelude::v1::*; - use cell::UnsafeCell; // Sure wish we had macro hygiene, no? @@ -272,9 +269,6 @@ impl<T: 'static> LocalKey<T> { not(no_elf_tls)))] #[doc(hidden)] mod imp { - #[cfg(stage0)] - use prelude::v1::*; - use cell::{Cell, UnsafeCell}; use intrinsics; use ptr; diff --git a/src/libstd/thread/scoped_tls.rs b/src/libstd/thread/scoped_tls.rs index 1ea33a01791..303ab0f9f01 100644 --- a/src/libstd/thread/scoped_tls.rs +++ b/src/libstd/thread/scoped_tls.rs @@ -42,9 +42,6 @@ #![unstable(feature = "thread_local_internals")] -#[cfg(stage0)] -use prelude::v1::*; - #[doc(hidden)] pub use self::imp::KeyInner as __KeyInner; @@ -250,9 +247,6 @@ mod imp { no_elf_tls))] #[doc(hidden)] mod imp { - #[cfg(stage0)] - use prelude::v1::*; - use cell::Cell; use marker; use sys_common::thread_local::StaticKey as OsStaticKey; @@ -280,8 +274,6 @@ mod imp { #[cfg(test)] mod tests { use cell::Cell; - #[cfg(stage0)] - use prelude::v1::*; scoped_thread_local!(static FOO: u32); |