---

yaml
---
r: 42455
b: refs/heads/try
c: 1e5c553
h: refs/heads/master
i:
  42453: b81c75b
  42451: 8b23fd4
  42447: 1ac1260
v: v3

Author: thestinger

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 9cc9a7582c11201c76745f4d190aaa21f4073e32
+refs/heads/try: 1e5c553b7c98185adecf3564e618e70fcd136ce6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libstd/treemap.rs

@@ -39,19 +39,26 @@ pub struct TreeMap<K: Ord, V> {
     priv length: uint
 }
 
-// FIXME: this is a naive O(n*log(m)) implementation, could be O(n)
-impl <K: Ord, V: Eq> TreeMap<K, V>: Eq {
+impl <K: Eq Ord, V: Eq> TreeMap<K, V>: Eq {
     pure fn eq(&self, other: &TreeMap<K, V>) -> bool {
         if self.len() != other.len() {
             return false
         }
-        for self.each |x, y| {
-            match other.find(x) {
-                Some(z) => if z != y { return false },
-                None => return false
+        unsafe { // purity workaround
+            let mut x = self.iter();
+            let mut y = other.iter();
+            for self.len().times {
+                // ICE: x.next() != y.next()
+
+                let (x1, x2) = x.next().unwrap();
+                let (y1, y2) = y.next().unwrap();
+
+                if x1 != y1 || x2 != y2 {
+                    return false
+                }
             }
+            true
         }
-        true
     }
     pure fn ne(&self, other: &TreeMap<K, V>) -> bool {
         !self.eq(other)
@@ -137,8 +144,8 @@ impl <K: Ord, V> TreeMap<K, V> {
         ret
     }
 
-    /// Get a lazy iterator over the nodes in the map. Requires that it
-    /// be frozen (immutable).
+    /// Get a lazy iterator over the key-value pairs in the map.
+    /// Requires that it be frozen (immutable).
     fn iter(&self) -> TreeMapIterator/&self<K, V> {
         TreeMapIterator{stack: ~[], node: &self.root}
     }
@@ -183,7 +190,7 @@ impl <T: Ord> TreeSet<T>: iter::BaseIter<T> {
     pure fn size_hint(&self) -> Option<uint> { Some(self.len()) }
 }
 
-impl <T: Ord> TreeSet<T>: Eq {
+impl <T: Eq Ord> TreeSet<T>: Eq {
     pure fn eq(&self, other: &TreeSet<T>) -> bool { self.map == other.map }
     pure fn ne(&self, other: &TreeSet<T>) -> bool { self.map != other.map }
 }