---

yaml
---
r: 60201
b: refs/heads/master
c: d807f00
h: refs/heads/master
i:
  60199: 8680d0c
v: v3

Author: samebchase

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7d4bb90e76207f3715126562fd50193fda97ff49
+refs/heads/master: d807f00bfded3804d5f3d01e522dfa086871f8ed
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/src/libcore/to_str.rs

@@ -15,6 +15,10 @@ The `ToStr` trait for converting to strings
 */
 
 use str;
+use hashmap::HashMap;
+use container::Map;
+use hash::Hash;
+use cmp::Eq;
 
 pub trait ToStr {
     fn to_str(&self) -> ~str;
@@ -46,6 +50,26 @@ impl<A:ToStr> ToStr for (A,) {
     }
 }
 
+impl<A:ToStr+Hash+Eq, B:ToStr+Hash+Eq> ToStr for HashMap<A, B> {
+    #[inline(always)]
+    fn to_str(&self) -> ~str {
+        let mut acc = ~"{", first = true;
+        for self.each |key, value| {
+            if first {
+                first = false;
+            }
+            else {
+                str::push_str(&mut acc, ~", ");
+            }
+            str::push_str(&mut acc, key.to_str());
+            str::push_str(&mut acc, ~" : ");
+            str::push_str(&mut acc, value.to_str());
+        }
+        str::push_char(&mut acc, '}');
+        acc
+    }
+}
+
 impl<A:ToStr,B:ToStr> ToStr for (A, B) {
     #[inline(always)]
     fn to_str(&self) -> ~str {
@@ -149,4 +173,16 @@ mod tests {
         assert!((~[~[], ~[1], ~[1, 1]]).to_str() ==
                ~"[[], [1], [1, 1]]");
     }
+
+    #[test]
+    fn test_hashmap() {
+        let mut table: HashMap<int, int> = HashMap::new();
+        let mut empty: HashMap<int, int> = HashMap::new();
+
+        table.insert(3, 4);
+        table.insert(1, 2);
+
+        assert!(table.to_str() == ~"{1 : 2, 3 : 4}");
+        assert!(empty.to_str() == ~"{}");
+    }
 }

trunk/src/librustc/middle/resolve.rs

@@ -1909,6 +1909,7 @@ pub impl Resolver {
             }
 
             if self.unresolved_imports == prev_unresolved_imports {
+                self.session.err(~"failed to resolve imports");
                 self.report_unresolved_imports(module_root);
                 break;
             }