---

yaml
---
r: 41804
b: refs/heads/master
c: 9fb4908
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8935771377207f74c69d6011cde006998c3a8fb8
+refs/heads/master: 9fb49088b35ae82c290ed112cdc87b71986d3d7e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libstd/treemap.rs

@@ -237,8 +237,24 @@ impl <T: Ord> TreeSet<T> {
     /// Return true if the set has no elements in common with `other`.
     /// This is equivalent to checking for an empty intersection.
     pure fn is_disjoint(&self, other: &TreeSet<T>) -> bool {
-        // FIXME: this is a naive O(n*log(m)) implementation, could be O(n + m)
-        !iter::any(self, |x| other.contains(x))
+        let mut x = self.iter();
+        let mut y = other.iter();
+        unsafe { // purity workaround
+            let mut a = x.next();
+            let mut b = y.next();
+            while a.is_some() && b.is_some() {
+                let a1 = a.unwrap();
+                let b1 = b.unwrap();
+                if a1 < b1 {
+                    a = x.next();
+                } else if b1 < a1 {
+                    b = y.next();
+                } else {
+                    return false;
+                }
+            }
+        }
+        true
     }
 
     /// Check of the set is a subset of another