about summary refs log tree commit diff
path: root/src/libstd/thread.rs
diff options
context:
space:
mode:
authorEduard Burtescu <edy.burt@gmail.com>2014-12-19 14:02:22 +0200
committerEduard Burtescu <edy.burt@gmail.com>2014-12-20 07:49:37 +0200
commitb45d30da34142fc33dd41bbf67c7dfc1a69ddf01 (patch)
treecff82472a01b56c5a8f0113a33c4821db3a8a87f /src/libstd/thread.rs
parentf95e0c21aaf752cf1401c872dfb1d8de1a22b6f2 (diff)
downloadrust-b45d30da34142fc33dd41bbf67c7dfc1a69ddf01.tar.gz
rust-b45d30da34142fc33dd41bbf67c7dfc1a69ddf01.zip
Fix fallout of removing import_shadowing in tests.
Diffstat (limited to 'src/libstd/thread.rs')
-rw-r--r--src/libstd/thread.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs
index ff9ee01b40a..89773207347 100644
--- a/src/libstd/thread.rs
+++ b/src/libstd/thread.rs
@@ -428,13 +428,11 @@ impl<T: Send> Drop for JoinGuard<T> {
 
 #[cfg(test)]
 mod test {
+    use prelude::*;
     use any::{Any, AnyRefExt};
     use boxed::BoxAny;
-    use prelude::*;
-    use result::Result::{Ok, Err};
     use result;
     use std::io::{ChanReader, ChanWriter};
-    use string::String;
     use thunk::Thunk;
     use super::{Thread, Builder};