stdtest: Fix all leaked trait imports

7 files changed, 12 insertions, 11 deletions

diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index fd8fd0c6814..fa85f286af7 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -318,9 +318,10 @@ impl<S: Stream> Decorator<S> for BufferedStream<S> {
 
 #[cfg(test)]
 mod test {
+    use io::Decorator;
+    use io;
     use prelude::*;
     use super::*;
-    use io;
     use super::super::mem::{MemReader, MemWriter};
     use Harness = extra::test::BenchHarness;
 
diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs
index 5fed9d74527..860ff644018 100644
--- a/src/libstd/io/extensions.rs
+++ b/src/libstd/io/extensions.rs
@@ -131,10 +131,11 @@ pub fn u64_from_be_bytes(data: &[u8],
 
 #[cfg(test)]
 mod test {
-    use option::{None, Option, Some};
+    use unstable::finally::Finally;
+    use io::Decorator;
+    use prelude::*;
     use io::mem::{MemReader, MemWriter};
-    use io::{Reader, io_error, placeholder_error};
-    use vec::ImmutableVector;
+    use io::{io_error, placeholder_error};
 
     struct InitialZeroByteReader {
         count: int,
@@ -376,7 +377,7 @@ mod test {
     fn push_bytes_fail_reset_len() {
         // push_bytes unsafely sets the vector length. This is testing that
         // upon failure the length is reset correctly.
-        let mut reader = ErroringLaterReader {
+        let reader = ErroringLaterReader {
             count: 0,
         };
         // FIXME (#7049): Figure out some other way to do this.
diff --git a/src/libstd/io/net/addrinfo.rs b/src/libstd/io/net/addrinfo.rs
index 6d968de209c..fe29a112262 100644
--- a/src/libstd/io/net/addrinfo.rs
+++ b/src/libstd/io/net/addrinfo.rs
@@ -100,8 +100,8 @@ fn lookup(hostname: Option<&str>, servname: Option<&str>, hint: Option<Hint>)
 
 #[cfg(test)]
 mod test {
-    use option::Some;
     use io::net::ip::Ipv4Addr;
+    use prelude::*;
     use super::*;
 
     #[test]
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs
index 00f66f1e9c7..4fb631eb3d6 100644
--- a/src/libstd/io/net/ip.rs
+++ b/src/libstd/io/net/ip.rs
@@ -337,9 +337,8 @@ impl FromStr for SocketAddr {
 
 #[cfg(test)]
 mod test {
+    use prelude::*;
     use super::*;
-    use from_str::FromStr;
-    use option::{Option, Some, None};
 
     #[test]
     fn test_from_str_ipv4() {
diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs
index 8994f6b461a..eaee48dc6e0 100644
--- a/src/libstd/io/net/udp.rs
+++ b/src/libstd/io/net/udp.rs
@@ -100,8 +100,6 @@ impl Writer for UdpStream {
 mod test {
     use super::*;
     use io::net::ip::{SocketAddr};
-    use io::*;
-    use prelude::*;
 
     iotest!(fn bind_error() {
         let mut called = false;
diff --git a/src/libstd/io/option.rs b/src/libstd/io/option.rs
index a661d6ab7eb..60e63e95dcc 100644
--- a/src/libstd/io/option.rs
+++ b/src/libstd/io/option.rs
@@ -104,8 +104,9 @@ impl<T, A: Acceptor<T>> Acceptor<T> for Option<A> {
 
 #[cfg(test)]
 mod test {
-    use option::*;
+    use prelude::*;
     use super::super::mem::*;
+    use io::Decorator;
     use super::super::{PreviousIoError, io_error};
 
     #[test]
diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs
index 48030543336..86538c37249 100644
--- a/src/libstd/io/util.rs
+++ b/src/libstd/io/util.rs
@@ -193,6 +193,7 @@ pub fn copy<R: Reader, W: Writer>(r: &mut R, w: &mut W) {
 
 #[cfg(test)]
 mod test {
+    use io::Decorator;
     use io::mem::{MemReader, MemWriter};
     use super::*;
     use prelude::*;