auto merge of #13096 : sstewartgallus/rust/cleanup-test-warnings, r=huonw

4 files changed, 5 insertions, 6 deletions

diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs
index 870f33733f4..8681ab21f10 100644
--- a/src/libstd/io/fs.rs
+++ b/src/libstd/io/fs.rs
@@ -1282,10 +1282,10 @@ mod test {
     }
 
     iotest!(fn binary_file() {
-        use rand::{rng, Rng};
+        use rand::{Rng, task_rng};
 
         let mut bytes = [0, ..1024];
-        rng().fill_bytes(bytes);
+        task_rng().fill_bytes(bytes);
 
         let tmpdir = tmpdir();
 
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs
index 53b8db8499d..fc9e571b270 100644
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -66,7 +66,6 @@ mod imp {
     use cast;
     use clone::Clone;
     use option::{Option, Some, None};
-    use ptr::RawPtr;
     use iter::Iterator;
     use unstable::mutex::{StaticNativeMutex, NATIVE_MUTEX_INIT};
     use mem;
@@ -124,6 +123,7 @@ mod imp {
     #[cfg(not(test))]
     unsafe fn load_argc_and_argv(argc: int, argv: **u8) -> ~[~[u8]] {
         use c_str::CString;
+        use ptr::RawPtr;
         use {slice, libc};
         use slice::CloneableVector;
 
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index f6d4579156e..cd047c815e9 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -433,8 +433,8 @@ mod test {
 
     #[test]
     fn rng() {
-        use rand::{rng, Rng};
-        let mut r = rng();
+        use rand::{Rng, task_rng};
+        let mut r = task_rng();
         let _ = r.next_u32();
     }
 
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index d00a411e9a0..4b2953204d0 100644
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -1360,7 +1360,6 @@ mod tests {
     use mem::{drop, size_of};
     use ops::Drop;
     use option::{Some, None};
-    use ptr;
     use container::Container;
     use slice::{Vector, MutableVector, ImmutableVector};