auto merge of #6775 : yjh0502/rust/issue_6696, r=catamorphism

1 files changed, 16 insertions, 2 deletions

diff --git a/src/libextra/smallintmap.rs b/src/libextra/smallintmap.rs
index 069368d3fea..a3c02b2366d 100644
--- a/src/libextra/smallintmap.rs
+++ b/src/libextra/smallintmap.rs
@@ -246,7 +246,14 @@ impl Set<uint> for SmallIntSet {
     fn symmetric_difference(&self,
                             other: &SmallIntSet,
                             f: &fn(&uint) -> bool) -> bool {
-        self.difference(other, f) && other.difference(self, f)
+        let len = cmp::max(self.map.v.len() ,other.map.v.len());
+
+        for uint::range(0, len) |i| {
+            if self.contains(&i) ^ other.contains(&i) {
+                if !f(&i) { return false; }
+            }
+        }
+        return true;
     }
 
     /// Visit the values representing the uintersection
@@ -256,7 +263,14 @@ impl Set<uint> for SmallIntSet {
 
     /// Visit the values representing the union
     fn union(&self, other: &SmallIntSet, f: &fn(&uint) -> bool) -> bool {
-        self.each(f) && other.each(|v| self.contains(v) || f(v))
+        let len = cmp::max(self.map.v.len() ,other.map.v.len());
+
+        for uint::range(0, len) |i| {
+            if self.contains(&i) || other.contains(&i) {
+                if !f(&i) { return false; }
+            }
+        }
+        return true;
     }
 }