From b45d30da34142fc33dd41bbf67c7dfc1a69ddf01 Mon Sep 17 00:00:00 2001
From: Eduard Burtescu <edy.burt@gmail.com>
Date: Fri, 19 Dec 2014 14:02:22 +0200
Subject: Fix fallout of removing import_shadowing in tests.

---
 src/libstd/io/buffered.rs | 1 -
 src/libstd/io/fs.rs       | 4 ----
 src/libstd/io/mem.rs      | 5 ++---
 src/libstd/io/timer.rs    | 6 +++---
 4 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/libstd/io')

diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index 25f05940807..9d9e8827571 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -409,7 +409,6 @@ mod test {
     use super::super::{IoResult, EndOfFile};
     use super::super::mem::MemReader;
     use self::test::Bencher;
-    use str::StrPrelude;
 
     /// A type, free to create, primarily intended for benchmarking creation of
     /// wrappers that, just for construction, don't need a Reader/Writer that
diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs
index fd3bae73cd3..4e736908c37 100644
--- a/src/libstd/io/fs.rs
+++ b/src/libstd/io/fs.rs
@@ -823,10 +823,6 @@ mod test {
     use io;
     use str;
     use io::fs::*;
-    use path::Path;
-    use io;
-    use ops::Drop;
-    use str::StrPrelude;
 
     macro_rules! check { ($e:expr) => (
         match $e {
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index 71e8cb4b5ec..431e11cf9ca 100644
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@ -398,13 +398,12 @@ impl<'a> Buffer for BufReader<'a> {
 
 #[cfg(test)]
 mod test {
-    extern crate test;
+    extern crate "test" as test_crate;
     use prelude::*;
     use super::*;
     use io::*;
     use io;
-    use self::test::Bencher;
-    use str::StrPrelude;
+    use self::test_crate::Bencher;
 
     #[test]
     fn test_vec_writer() {
diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs
index 79048c37ab5..953effe4345 100644
--- a/src/libstd/io/timer.rs
+++ b/src/libstd/io/timer.rs
@@ -225,11 +225,11 @@ fn in_ms_u64(d: Duration) -> u64 {
 
 #[cfg(test)]
 mod test {
-    use super::*;
-    use time::Duration;
-    use task::spawn;
     use prelude::*;
 
+    use super::Timer;
+    use time::Duration;
+
     #[test]
     fn test_io_timer_sleep_simple() {
         let mut timer = Timer::new().unwrap();
-- 
cgit 1.4.1-3-g733a5