From ff9b75f26d8784c38ff6fbdb55511204f75a8a72 Mon Sep 17 00:00:00 2001
From: blake2-ppc <blake2-ppc>
Date: Wed, 17 Jul 2013 21:32:49 +0200
Subject: [PATCH] Fix warnings in libstd and librusti tests

---
 src/librusti/rusti.rs | 1 -
 src/libstd/hashmap.rs | 4 ++--
 src/libstd/os.rs      | 1 -
 src/libstd/ptr.rs     | 7 ++++---
 src/libstd/rand.rs    | 1 -
 src/libstd/to_str.rs  | 2 +-
 src/libstd/vec.rs     | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/librusti/rusti.rs b/src/librusti/rusti.rs
index 1bee2146089f..68f871125e13 100644
--- a/src/librusti/rusti.rs
+++ b/src/librusti/rusti.rs
@@ -546,7 +546,6 @@ pub fn main() {
 #[cfg(test)]
 mod tests {
     use std::io;
-    use std::iterator::IteratorUtil;
     use program::Program;
     use super::*;
 
diff --git a/src/libstd/hashmap.rs b/src/libstd/hashmap.rs
index 7cf2c594202e..c81f40b6e59f 100644
--- a/src/libstd/hashmap.rs
+++ b/src/libstd/hashmap.rs
@@ -863,7 +863,7 @@ pub type SetAlgebraIter<'self, T> =
 
 #[cfg(test)]
 mod test_map {
-    use container::{Container, Map, Set};
+    use container::{Container, Map};
     use option::{None, Some};
     use super::*;
     use uint;
@@ -1104,7 +1104,7 @@ mod test_map {
 #[cfg(test)]
 mod test_set {
     use super::*;
-    use container::{Container, Map, Set};
+    use container::Container;
     use vec::ImmutableEqVector;
     use uint;
 
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index a7e3fec51a7e..25bd8f216806 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -1742,7 +1742,6 @@ mod tests {
     use rand;
     use run;
     use str::StrSlice;
-    use vec;
     use vec::CopyableVector;
     use libc::consts::os::posix88::{S_IRUSR, S_IWUSR, S_IXUSR};
 
diff --git a/src/libstd/ptr.rs b/src/libstd/ptr.rs
index caf15120bd71..15651e1aca45 100644
--- a/src/libstd/ptr.rs
+++ b/src/libstd/ptr.rs
@@ -16,8 +16,9 @@ use option::{Option, Some, None};
 use sys;
 use unstable::intrinsics;
 use util::swap;
-use ops::{Add,Sub};
-use num::Int;
+
+#[cfg(not(test))] use ops::{Add,Sub};
+#[cfg(not(test))] use num::Int;
 
 #[cfg(not(test))] use cmp::{Eq, Ord};
 use uint;
@@ -592,7 +593,7 @@ pub mod ptr_tests {
             }
 
             let mut xs_mut = xs.clone();
-            let mut m_start = to_mut_ptr(xs_mut);
+            let m_start = to_mut_ptr(xs_mut);
             let mut m_ptr = m_start + 9u32;
 
             while m_ptr >= m_start {
diff --git a/src/libstd/rand.rs b/src/libstd/rand.rs
index 76dbc6291681..9583e37d0021 100644
--- a/src/libstd/rand.rs
+++ b/src/libstd/rand.rs
@@ -1078,7 +1078,6 @@ mod tests {
         // This is to verify that the implementation of the ISAAC rng is
         // correct (i.e. matches the output of the upstream implementation,
         // which is in the runtime)
-        use vec;
         use libc::size_t;
 
         #[abi = "cdecl"]
diff --git a/src/libstd/to_str.rs b/src/libstd/to_str.rs
index b655dc828bf0..227712e31e67 100644
--- a/src/libstd/to_str.rs
+++ b/src/libstd/to_str.rs
@@ -181,7 +181,7 @@ impl<A:ToStr> ToStr for @[A] {
 mod tests {
     use hashmap::HashMap;
     use hashmap::HashSet;
-    use container::{Set, Map, MutableSet, MutableMap};
+    use container::{MutableSet, MutableMap};
     #[test]
     fn test_simple_types() {
         assert_eq!(1i.to_str(), ~"1");
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index 085510171ee9..cc73c28bba0d 100644
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -16,7 +16,7 @@ use cast::transmute;
 use cast;
 use clone::Clone;
 use container::{Container, Mutable};
-use cmp::{Eq, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
+use cmp::{Eq, TotalOrd, Ordering, Less, Equal, Greater};
 use cmp;
 use iterator::*;
 use libc::c_void;