stdtest: Fix all leaked trait imports

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 libc;
-    use option::Some;
-    use ptr;
     use extra::test::BenchHarness;
+    use libc;
+    use prelude::*;
+    use ptr;
 
     #[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]

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::*;

src/libstd/option.rs

@@ -457,6 +457,7 @@ pub fn collect<T, Iter: Iterator<Option<T>>, V: FromIterator<T>>(iter: Iter) ->
 #[cfg(test)]
 mod tests {
     use super::*;
+    use prelude::*;
 
     use iter::range;
     use str::StrSlice;

src/libstd/os.rs

@@ -1239,16 +1239,14 @@ pub mod consts {
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use c_str::ToCStr;
-    use option::Some;
     use option;
     use os::{env, getcwd, getenv, make_absolute, args};
     use os::{setenv, unsetenv};
     use os;
-    use path::Path;
     use rand::Rng;
     use rand;
-    use str::StrSlice;
 
 
     #[test]

src/libstd/path/mod.rs

@@ -687,6 +687,7 @@ fn from_utf8_with_replacement(mut v: &[u8]) -> ~str {
 }
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use super::{GenericPath, PosixPath, WindowsPath};
     use c_str::ToCStr;
 

src/libstd/path/posix.rs

@@ -442,11 +442,9 @@ static dot_dot_static: &'static [u8] = bytes!("..");
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use super::*;
-    use option::{Option, Some, None};
-    use iter::Iterator;
     use str;
-    use vec::Vector;
 
     macro_rules! t(
         (s: $path:expr, $exp:expr) => (
@@ -1325,6 +1323,7 @@ mod tests {
 mod bench {
     use extra::test::BenchHarness;
     use super::*;
+    use prelude::*;
 
     #[bench]
     fn join_home_dir(bh: &mut BenchHarness) {

src/libstd/path/windows.rs

@@ -1053,11 +1053,9 @@ fn prefix_len(p: Option<PathPrefix>) -> uint {
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use super::*;
     use super::parse_prefix;
-    use option::{Some,None};
-    use iter::Iterator;
-    use vec::Vector;
 
     macro_rules! t(
         (s: $path:expr, $exp:expr) => (

src/libstd/rand/distributions/exponential.rs

@@ -91,10 +91,10 @@ impl IndependentSample<f64> for Exp {
 
 #[cfg(test)]
 mod test {
+    use rand::distributions::*;
+    use prelude::*;
     use rand::*;
     use super::*;
-    use iter::range;
-    use option::{Some, None};
 
     #[test]
     fn test_exp() {
@@ -120,11 +120,11 @@ mod test {
 #[cfg(test)]
 mod bench {
     use extra::test::BenchHarness;
+    use mem::size_of;
+    use prelude::*;
     use rand::{XorShiftRng, RAND_BENCH_N};
     use super::*;
-    use iter::range;
-    use option::{Some, None};
-    use mem::size_of;
+    use rand::distributions::*;
 
     #[bench]
     fn rand_exp(bh: &mut BenchHarness) {

src/libstd/rand/distributions/gamma.rs

@@ -310,10 +310,10 @@ impl IndependentSample<f64> for StudentT {
 
 #[cfg(test)]
 mod test {
+    use rand::distributions::*;
+    use prelude::*;
     use rand::*;
     use super::*;
-    use iter::range;
-    use option::{Some, None};
 
     #[test]
     fn test_chi_squared_one() {
@@ -371,13 +371,12 @@ mod test {
 
 #[cfg(test)]
 mod bench {
-    use super::*;
+    use extra::test::BenchHarness;
     use mem::size_of;
+    use prelude::*;
     use rand::distributions::IndependentSample;
     use rand::{StdRng, RAND_BENCH_N};
-    use extra::test::BenchHarness;
-    use iter::range;
-    use option::{Some, None};
+    use super::*;
 
 
     #[bench]

src/libstd/rand/distributions/mod.rs

@@ -253,9 +253,9 @@ fn ziggurat<R:Rng>(
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use rand::*;
     use super::*;
-    use option::{Some, None};
 
     #[deriving(Eq)]
     struct ConstRand(uint);

src/libstd/rand/distributions/normal.rs

@@ -148,10 +148,10 @@ impl IndependentSample<f64> for LogNormal {
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use rand::*;
     use super::*;
-    use iter::range;
-    use option::{Some, None};
+    use rand::distributions::*;
 
     #[test]
     fn test_normal() {
@@ -188,11 +188,11 @@ mod tests {
 #[cfg(test)]
 mod bench {
     use extra::test::BenchHarness;
-    use rand::{XorShiftRng, RAND_BENCH_N};
-    use super::*;
-    use iter::range;
-    use option::{Some, None};
     use mem::size_of;
+    use prelude::*;
+    use rand::{XorShiftRng, RAND_BENCH_N};
+    use rand::distributions::*;
+    use super::*;
 
     #[bench]
     fn rand_normal(bh: &mut BenchHarness) {

src/libstd/rand/distributions/range.rs

@@ -163,12 +163,11 @@ float_impl! { f64 }
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use super::*;
     use rand::*;
+    use rand::distributions::*;
     use num::Bounded;
-    use iter::range;
-    use option::{Some, None};
-    use vec::ImmutableVector;
 
     #[should_fail]
     #[test]

src/libstd/rand/isaac.rs

@@ -433,8 +433,7 @@ impl<'a> SeedableRng<&'a [u64]> for Isaac64Rng {
 mod test {
     use super::*;
     use rand::{Rng, SeedableRng, OSRng};
-    use option::Some;
-    use iter::range;
+    use prelude::*;
     use vec;
 
     #[test]

src/libstd/rand/mod.rs

@@ -656,8 +656,7 @@ pub struct Closed01<F>(F);
 
 #[cfg(test)]
 mod test {
-    use iter::{Iterator, range};
-    use option::{Option, Some};
+    use prelude::*;
     use vec;
     use super::*;
 
@@ -845,11 +844,10 @@ static RAND_BENCH_N: u64 = 100;
 
 #[cfg(test)]
 mod bench {
+    use prelude::*;
     use extra::test::BenchHarness;
     use rand::{XorShiftRng, StdRng, IsaacRng, Isaac64Rng, Rng, RAND_BENCH_N};
     use mem::size_of;
-    use iter::range;
-    use option::{Some, None};
 
     #[bench]
     fn rand_xorshift(bh: &mut BenchHarness) {

src/libstd/rand/rand_impls.rs

@@ -226,9 +226,8 @@ impl<T: Rand + 'static> Rand for @T {
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use rand::{Rng, task_rng, Open01, Closed01};
-    use iter::range;
-    use option::{None, Some};
 
     struct ConstantRng(u64);
     impl Rng for ConstantRng {

src/libstd/rand/reader.rs

@@ -78,6 +78,8 @@ mod test {
     use super::*;
     use io::mem::MemReader;
     use cast;
+    use rand::*;
+    use prelude::*;
 
     #[test]
     fn test_reader_rng_u64() {

src/libstd/rand/reseeding.rs

@@ -142,11 +142,9 @@ impl Default for ReseedWithDefault {
 
 #[cfg(test)]
 mod test {
+    use prelude::*;
     use super::*;
     use rand::{SeedableRng, Rng};
-    use default::Default;
-    use iter::range;
-    use option::{None, Some};
 
     struct Counter {
         i: u32

src/libstd/rc.rs

@@ -170,6 +170,7 @@ impl<T> Drop for Rc<T> {
 
 #[cfg(test)]
 mod test_rc {
+    use prelude::*;
     use super::*;
     use cell::RefCell;
 

src/libstd/result.rs

@@ -293,10 +293,9 @@ pub fn fold_<T,E,Iter:Iterator<Result<T,E>>>(iterator: Iter) -> Result<(),E> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use prelude::*;
 
     use iter::range;
-    use to_str::ToStr;
-    use vec::ImmutableVector;
 
     pub fn op1() -> Result<int, ~str> { Ok(666) }
     pub fn op2() -> Result<int, ~str> { Err(~"sadface") }

src/libstd/rt/unwind.rs

@@ -77,6 +77,7 @@ mod libunwind {
     //! Unwind library interface
 
     #[allow(non_camel_case_types)];
+    #[allow(dead_code)] // these are just bindings
 
     use libc::{uintptr_t, uint64_t};
 
@@ -262,7 +263,8 @@ fn rust_exception_class() -> uw::_Unwind_Exception_Class {
 //   This is achieved by overriding the return value in search phase to always
 //   say "catch!".
 
-#[cfg(not(target_arch = "arm"))]
+#[cfg(not(target_arch = "arm"), not(test))]
+#[doc(hidden)]
 pub mod eabi {
     use uw = super::libunwind;
     use libc::c_int;
@@ -278,8 +280,6 @@ pub mod eabi {
 
     #[lang="eh_personality"]
     #[no_mangle] // so we can reference it by name from middle/trans/base.rs
-    #[doc(hidden)]
-    #[cfg(not(test))]
     pub extern "C" fn rust_eh_personality(
         version: c_int,
         actions: uw::_Unwind_Action,
@@ -295,8 +295,6 @@ pub mod eabi {
     }
 
     #[no_mangle] // referenced from rust_try.ll
-    #[doc(hidden)]
-    #[cfg(not(test))]
     pub extern "C" fn rust_eh_personality_catch(
         version: c_int,
         actions: uw::_Unwind_Action,
@@ -319,7 +317,7 @@ pub mod eabi {
 
 // ARM EHABI uses a slightly different personality routine signature,
 // but otherwise works the same.
-#[cfg(target_arch = "arm")]
+#[cfg(target_arch = "arm", not(test))]
 pub mod eabi {
     use uw = super::libunwind;
     use libc::c_int;
@@ -333,8 +331,6 @@ pub mod eabi {
 
     #[lang="eh_personality"]
     #[no_mangle] // so we can reference it by name from middle/trans/base.rs
-    #[doc(hidden)]
-    #[cfg(not(test))]
     pub extern "C" fn rust_eh_personality(
         state: uw::_Unwind_State,
         ue_header: *uw::_Unwind_Exception,
@@ -347,8 +343,6 @@ pub mod eabi {
     }
 
     #[no_mangle] // referenced from rust_try.ll
-    #[doc(hidden)]
-    #[cfg(not(test))]
     pub extern "C" fn rust_eh_personality_catch(
         state: uw::_Unwind_State,
         ue_header: *uw::_Unwind_Exception,

src/libstd/run.rs

@@ -330,16 +330,15 @@ pub fn process_output(prog: &str, args: &[~str]) -> Option<ProcessOutput> {
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use libc::c_int;
-    use option::{Option, None, Some};
     use os;
-    use path::Path;
     use run;
     use str;
     use task::spawn;
     use unstable::running_on_valgrind;
     use io::pipe::PipeStream;
-    use io::{Writer, Reader, io_error, FileNotFound};
+    use io::{io_error, FileNotFound};
 
     #[test]
     #[cfg(not(target_os="android"))] // FIXME(#10380)

src/libstd/send_str.rs

@@ -176,14 +176,8 @@ impl IterBytes for SendStr {
 
 #[cfg(test)]
 mod tests {
-    use clone::{Clone, DeepClone};
-    use cmp::{TotalEq, Ord, TotalOrd, Equiv};
-    use cmp::Equal;
-    use container::Container;
-    use default::Default;
+    use prelude::*;
     use send_str::{SendStrOwned, SendStrStatic};
-    use str::Str;
-    use to_str::ToStr;
 
     #[test]
     fn test_send_str_traits() {

src/libstd/str.rs

@@ -2768,14 +2768,11 @@ impl Default for @str {
 
 #[cfg(test)]
 mod tests {
-    use container::Container;
-    use option::{None, Some, Option};
+    use iter::AdditiveIterator;
+    use prelude::*;
     use ptr;
     use str::*;
-    use vec::{Vector, ImmutableVector, CopyableVector};
-    use cmp::{TotalOrd, Less, Equal, Greater};
     use send_str::{SendStrOwned, SendStrStatic};
-    use from_str::from_str;
 
     #[test]
     fn test_eq() {

src/libstd/unstable/stack.rs

@@ -24,8 +24,6 @@
 //! detection is not guaranteed to continue in the future. Usage of this module
 //! is discouraged unless absolutely necessary.
 
-use str::Str;
-
 static RED_ZONE: uint = 20 * 1024;
 
 /// This function is invoked from rust's current __morestack function. Segmented

src/libstd/util.rs

@@ -78,10 +78,7 @@ impl Void {
 #[cfg(test)]
 mod tests {
     use super::*;
-
-    use clone::Clone;
-    use ops::Drop;
-    use option::{None, Some};
+    use prelude::*;
     use mem::size_of;
 
     #[test]

src/libstd/vec.rs

@@ -2970,10 +2970,10 @@ impl<A> Extendable<A> for ~[A] {
 
 #[cfg(test)]
 mod tests {
+    use prelude::*;
     use mem;
     use vec::*;
     use cmp::*;
-    use prelude::*;
     use rand::{Rng, task_rng};
 
     fn square(n: uint) -> uint { n * n }
@@ -4454,13 +4454,11 @@ mod tests {
 #[cfg(test)]
 mod bench {
     use extra::test::BenchHarness;
-    use iter::range;
-    use vec;
-    use vec::{VectorVector, MutableTotalOrdVector};
-    use option::*;
+    use mem;
+    use prelude::*;
     use ptr;
     use rand::{weak_rng, Rng};
-    use mem;
+    use vec;
 
     #[bench]
     fn iterator(bh: &mut BenchHarness) {