stdtest: Fix all leaked trait imports

Author: alexcrichton

src/libstd/ascii.rs

@@ -478,10 +478,10 @@ static ASCII_UPPER_MAP: &'static [u8] = &[
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use super::*;
     use str::from_char;
     use char::from_u32;
-    use option::{Some, None};
 
     macro_rules! v2ascii (
         ( [$($e:expr),*]) => ( [$(Ascii{chr:$e}),*]);

src/libstd/bool.rs

@@ -317,10 +317,7 @@ impl Zero for bool {
 
 #[cfg(test)]
 mod tests {
-    use cmp::{Equal, Greater, Less, Eq, TotalOrd};
-    use ops::{BitAnd, BitXor, BitOr};
-    use from_str::{FromStr, from_str};
-    use option::{Some, None};
+    use prelude::*;
     use super::all_values;
 
     #[test]

src/libstd/c_str.rs

@@ -377,10 +377,10 @@ pub unsafe fn from_c_multistring(buf: *libc::c_char,
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use super::*;
     use libc;
     use ptr;
-    use option::{Some, None};
 
     #[test]
     fn test_str_multistring_parsing() {
@@ -568,11 +568,10 @@ mod tests {
 
 #[cfg(test)]
 mod bench {
-    use iter::range;
+    use extra::test::BenchHarness;
     use libc;
-    use option::Some;
+    use prelude::*;
     use ptr;
-    use extra::test::BenchHarness;
 
     #[inline]
     fn check(s: &str, c_str: *libc::c_char) {

src/libstd/gc.rs

@@ -54,6 +54,7 @@ impl<T: DeepClone + Send + 'static> DeepClone for Gc<T> {
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use super::*;
     use cell::RefCell;
 

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;
 

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.

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]

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() {

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;

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]