---

yaml
---
r: 42110
b: refs/heads/master
c: 456af7a
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a388e2c1a49ccb238741e01b9a53aac0f1bf7795
+refs/heads/master: 456af7a79da586a3c64d810a9157bba0616b6b53
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libstd/treemap.rs

@@ -49,10 +49,9 @@ impl <K: Eq Ord, V: Eq> TreeMap<K, V>: Eq {
             let mut y = other.iter();
             for self.len().times {
                 unsafe { // unsafe as a purity workaround
-                    // ICE: x.next() != y.next()
-
                     x = x.next();
                     y = y.next();
+                    // FIXME: #4492 (ICE), x.get() == y.get()
                     let (x1, x2) = x.get().unwrap();
                     let (y1, y2) = y.get().unwrap();
 
@@ -967,9 +966,7 @@ mod test_treemap {
         let m = m;
         let mut iter = m.iter();
 
-        // ICE:
-        //assert iter.next() == Some((&x1, &y1));
-        //assert iter.next().eq(&Some((&x1, &y1)));
+        // FIXME: #4492 (ICE): iter.next() == Some((&x1, &y1))
 
         iter = iter.next();
         assert iter.get().unwrap() == (&x1, &y1);
@@ -982,10 +979,6 @@ mod test_treemap {
         iter = iter.next();
         assert iter.get().unwrap() == (&x5, &y5);
 
-        // ICE:
-        //assert iter.next() == None;
-        //assert iter.next().eq(&None);
-
         iter = iter.next();
         assert iter.get().is_none();
     }