diff options
| author | bors <bors@rust-lang.org> | 2016-08-25 20:45:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 20:45:32 -0700 |
| commit | eaf71f8d1034f16140791f566cab3f3c9a0bf96a (patch) | |
| tree | d7bdca8083a5457af6f42e4e93693fcd272c0ac8 /src/libstd/thread | |
| parent | e07dd59eaeb7be95afd2fb3dc131108ae750c91c (diff) | |
| parent | a9a2979dbaddc540673cf66da52e8eb45e66b055 (diff) | |
| download | rust-eaf71f8d1034f16140791f566cab3f3c9a0bf96a.tar.gz rust-eaf71f8d1034f16140791f566cab3f3c9a0bf96a.zip | |
Auto merge of #35906 - jseyfried:local_prelude, r=eddyb
Use `#[prelude_import]` in `libcore` and `libstd` r? @eddyb
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 7 | ||||
| -rw-r--r-- | src/libstd/thread/mod.rs | 6 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 152b9771086..c44dee49f14 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -369,7 +369,6 @@ pub mod elf { // Due to rust-lang/rust#18804, make sure this is not generic! #[cfg(target_os = "linux")] unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { - use prelude::v1::*; use mem; use libc; use sys_common::thread_local as os; @@ -460,8 +459,6 @@ pub mod elf { #[doc(hidden)] pub mod os { - use prelude::v1::*; - use cell::{Cell, UnsafeCell}; use marker; use ptr; @@ -529,8 +526,6 @@ pub mod os { #[cfg(test)] mod tests { - use prelude::v1::*; - use sync::mpsc::{channel, Sender}; use cell::{Cell, UnsafeCell}; use super::LocalKeyState; @@ -693,8 +688,6 @@ mod tests { #[cfg(test)] mod dynamic_tests { - use prelude::v1::*; - use cell::RefCell; use collections::HashMap; diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index f06c105d30e..f3e1710f50b 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -161,8 +161,6 @@ #![stable(feature = "rust1", since = "1.0.0")] -use prelude::v1::*; - use any::Any; use cell::UnsafeCell; use ffi::{CStr, CString}; @@ -732,8 +730,6 @@ fn _assert_sync_and_send() { #[cfg(test)] mod tests { - use prelude::v1::*; - use any::Any; use sync::mpsc::{channel, Sender}; use result; @@ -786,8 +782,6 @@ mod tests { #[test] fn test_spawn_sched() { - use clone::Clone; - let (tx, rx) = channel(); fn f(i: i32, tx: Sender<()>) { |