libcollections test suite fixes

Author: Keegan McAllister

src/libcollections/lib.rs

@@ -30,8 +30,8 @@ extern crate alloc;
 #[cfg(test)] extern crate native;
 #[cfg(test)] extern crate test;
 #[cfg(test)] extern crate debug;
+#[cfg(test)] extern crate std;
 
-#[cfg(test)] #[phase(plugin, link)] extern crate std;
 #[cfg(test)] #[phase(plugin, link)] extern crate log;
 
 use core::prelude::Option;

src/libcollections/slice.rs

@@ -742,10 +742,12 @@ pub mod raw {
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
+    use alloc::boxed::Box;
+    use collections::string::String;
     use std::cell::Cell;
     use std::default::Default;
     use std::mem;
-    use std::prelude::*;
     use std::rand::{Rng, task_rng};
     use std::rc::Rc;
     use std::rt;
@@ -1183,7 +1185,7 @@ mod tests {
             assert_eq!(it.next(), None);
         }
         {
-            let v = ["Hello".to_string()];
+            let v = [String::from_str("Hello")];
             let mut it = v.permutations();
             let (min_size, max_opt) = it.size_hint();
             assert_eq!(min_size, 1);
@@ -1925,20 +1927,20 @@ mod tests {
             })
         )
         let empty: Vec<int> = vec![];
-        test_show_vec!(empty, "[]".to_string());
-        test_show_vec!(vec![1i], "[1]".to_string());
-        test_show_vec!(vec![1i, 2, 3], "[1, 2, 3]".to_string());
+        test_show_vec!(empty, String::from_str("[]"));
+        test_show_vec!(vec![1i], String::from_str("[1]"));
+        test_show_vec!(vec![1i, 2, 3], String::from_str("[1, 2, 3]"));
         test_show_vec!(vec![vec![], vec![1u], vec![1u, 1u]],
-                       "[[], [1], [1, 1]]".to_string());
+                       String::from_str("[[], [1], [1, 1]]"));
 
         let empty_mut: &mut [int] = &mut[];
-        test_show_vec!(empty_mut, "[]".to_string());
+        test_show_vec!(empty_mut, String::from_str("[]"));
         let v: &mut[int] = &mut[1];
-        test_show_vec!(v, "[1]".to_string());
+        test_show_vec!(v, String::from_str("[1]"));
         let v: &mut[int] = &mut[1, 2, 3];
-        test_show_vec!(v, "[1, 2, 3]".to_string());
+        test_show_vec!(v, String::from_str("[1, 2, 3]"));
         let v: &mut [&mut[uint]] = &mut[&mut[], &mut[1u], &mut[1u, 1u]];
-        test_show_vec!(v, "[[], [1], [1, 1]]".to_string());
+        test_show_vec!(v, String::from_str("[[], [1], [1, 1]]"));
     }
 
     #[test]

src/libcollections/smallintmap.rs

@@ -520,12 +520,13 @@ pub type Values<'a, T> =
 
 #[cfg(test)]
 mod test_map {
-    use std::prelude::*;
+    use core::prelude::*;
     use vec::Vec;
     use hash;
 
     use {Map, MutableMap, Mutable, MutableSeq};
     use super::SmallIntMap;
+    use string::String;
 
     #[test]
     fn test_find_mut() {
@@ -764,6 +765,8 @@ mod test_map {
 
     #[test]
     fn test_show() {
+        use std::to_string::ToString;
+
         let mut map = SmallIntMap::new();
         let empty = SmallIntMap::<int>::new();
 
@@ -773,7 +776,7 @@ mod test_map {
         let map_str = map.to_string();
         let map_str = map_str.as_slice();
         assert!(map_str == "{1: 2, 3: 4}" || map_str == "{3: 4, 1: 2}");
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert_eq!(format!("{}", empty), String::from_str("{}"));
     }
 
     #[test]

src/libcollections/string.rs

@@ -890,7 +890,7 @@ pub mod raw {
 
 #[cfg(test)]
 mod tests {
-    use std::prelude::*;
+    use core::prelude::*;
     use test::Bencher;
 
     use {Mutable, MutableSeq};
@@ -901,7 +901,7 @@ mod tests {
 
     #[test]
     fn test_from_str() {
-      let owned: Option<::std::string::String> = from_str("string");
+      let owned: Option<::string::String> = Some(String::from_str("string"));
       assert_eq!(owned.as_ref().map(|s| s.as_slice()), Some("string"));
     }
 

src/libcollections/treemap.rs

@@ -1669,12 +1669,15 @@ impl<S: Writer, T: Ord + Hash<S>> Hash<S> for TreeSet<T> {
 
 #[cfg(test)]
 mod test_treemap {
-    use std::prelude::*;
+    use core::prelude::*;
+    use alloc::boxed::Box;
     use std::rand::Rng;
     use std::rand;
 
     use {Map, MutableMap, Mutable, MutableSeq};
     use super::{TreeMap, TreeNode};
+    use vec::Vec;
+    use string::String;
 
     #[test]
     fn find_empty() {
@@ -2099,8 +2102,8 @@ mod test_treemap {
 
         let map_str = format!("{}", map);
 
-        assert!(map_str == "{1: 2, 3: 4}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(map_str == String::from_str("{1: 2, 3: 4}"));
+        assert_eq!(format!("{}", empty), String::from_str("{}"));
     }
 
     #[test]
@@ -2247,11 +2250,12 @@ mod bench {
 
 #[cfg(test)]
 mod test_set {
-    use std::prelude::*;
+    use core::prelude::*;
 
     use {Set, MutableSet, Mutable, MutableMap, MutableSeq};
     use super::{TreeMap, TreeSet};
     use hash;
+    use string::String;
 
     #[test]
     fn test_clear() {
@@ -2550,7 +2554,7 @@ mod test_set {
 
         let set_str = format!("{}", set);
 
-        assert!(set_str == "{1, 2}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(set_str == String::from_str("{1, 2}"));
+        assert_eq!(format!("{}", empty), String::from_str("{}"));
     }
 }

src/libcollections/trie.rs

@@ -1016,13 +1016,15 @@ impl<'a> Iterator<uint> for SetItems<'a> {
 
 #[cfg(test)]
 mod test_map {
-    use std::prelude::*;
+    use core::prelude::*;
     use std::iter::range_step;
     use std::uint;
 
     use {MutableMap, Map, MutableSeq};
     use super::{TrieMap, TrieNode, Internal, External, Nothing};
     use hash;
+    use vec::Vec;
+    use string::String;
 
     fn check_integrity<T>(trie: &TrieNode<T>) {
         assert!(trie.count != 0);
@@ -1403,8 +1405,8 @@ mod test_map {
 
         let map_str = format!("{}", map);
 
-        assert!(map_str == "{1: a, 2: b}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(map_str == String::from_str("{1: a, 2: b}"));
+        assert_eq!(format!("{}", empty), String::from_str("{}"));
     }
 
     #[test]
@@ -1543,7 +1545,8 @@ mod bench_map {
 
 #[cfg(test)]
 mod test_set {
-    use std::prelude::*;
+    use core::prelude::*;
+    use collections::string::String;
     use std::uint;
 
     use {MutableSet, Set, MutableSeq};
@@ -1589,8 +1592,8 @@ mod test_set {
 
         let set_str = format!("{}", set);
 
-        assert!(set_str == "{1, 2}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(set_str == String::from_str("{1, 2}"));
+        assert_eq!(format!("{}", empty), String::from_str("{}"));
     }
 
     #[test]