---

yaml
---
r: 132036
b: refs/heads/dist-snap
c: 26047f1
h: refs/heads/master
v: v3

Author: treeman

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: b05f6050b67d1485702ff5ffed666290d4bd1e4d
+refs/heads/dist-snap: 26047f15e5f1db33d66979554c29fba3cf4d2c33
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcollections/bitv.rs

@@ -1124,8 +1124,8 @@ impl BitvSet {
         }
     }
 
-    /// Iterator over each uint stored in the `self` setminus `other`.
-    /// See [difference_with](#method.difference_with) for an efficient in-place version.
+    /// Iterator over each uint stored in `self` intersect `other`.
+    /// See [intersect_with](#method.intersect_with) for an efficient in-place version.
     ///
     /// # Example
     ///
@@ -1136,32 +1136,25 @@ impl BitvSet {
     /// let a = BitvSet::from_bitv(from_bytes([0b01101000]));
     /// let b = BitvSet::from_bitv(from_bytes([0b10100000]));
     ///
-    /// // Print 2, 4 in arbitrary order
-    /// for x in a.difference(&b) {
-    ///     println!("{}", x);
-    /// }
-    ///
-    /// // Note that difference is not symmetric,
-    /// // and `b - a` means something else.
-    /// // This prints 0
-    /// for x in b.difference(&a) {
+    /// // Print 2
+    /// for x in a.intersection(&b) {
     ///     println!("{}", x);
     /// }
     /// ```
     #[inline]
-    pub fn difference<'a>(&'a self, other: &'a BitvSet) -> TwoBitPositions<'a> {
+    pub fn intersection<'a>(&'a self, other: &'a BitvSet) -> Take<TwoBitPositions<'a>> {
+        let min = cmp::min(self.capacity(), other.capacity());
         TwoBitPositions {
             set: self,
             other: other,
-            merge: |w1, w2| w1 & !w2,
+            merge: |w1, w2| w1 & w2,
             current_word: 0,
             next_idx: 0
-        }
+        }.take(min)
     }
 
-    /// Iterator over each uint stored in the symmetric difference of `self` and `other`.
-    /// See [symmetric_difference_with](#method.symmetric_difference_with) for
-    /// an efficient in-place version.
+    /// Iterator over each uint stored in the `self` setminus `other`.
+    /// See [difference_with](#method.difference_with) for an efficient in-place version.
     ///
     /// # Example
     ///
@@ -1172,24 +1165,32 @@ impl BitvSet {
     /// let a = BitvSet::from_bitv(from_bytes([0b01101000]));
     /// let b = BitvSet::from_bitv(from_bytes([0b10100000]));
     ///
-    /// // Print 0, 1, 4 in arbitrary order
-    /// for x in a.symmetric_difference(&b) {
+    /// // Print 2, 4 in arbitrary order
+    /// for x in a.difference(&b) {
+    ///     println!("{}", x);
+    /// }
+    ///
+    /// // Note that difference is not symmetric,
+    /// // and `b - a` means something else.
+    /// // This prints 0
+    /// for x in b.difference(&a) {
     ///     println!("{}", x);
     /// }
     /// ```
     #[inline]
-    pub fn symmetric_difference<'a>(&'a self, other: &'a BitvSet) -> TwoBitPositions<'a> {
+    pub fn difference<'a>(&'a self, other: &'a BitvSet) -> TwoBitPositions<'a> {
         TwoBitPositions {
             set: self,
             other: other,
-            merge: |w1, w2| w1 ^ w2,
+            merge: |w1, w2| w1 & !w2,
             current_word: 0,
             next_idx: 0
         }
     }
 
-    /// Iterator over each uint stored in `self` intersect `other`.
-    /// See [intersect_with](#method.intersect_with) for an efficient in-place version.
+    /// Iterator over each uint stored in the symmetric difference of `self` and `other`.
+    /// See [symmetric_difference_with](#method.symmetric_difference_with) for
+    /// an efficient in-place version.
     ///
     /// # Example
     ///
@@ -1200,21 +1201,20 @@ impl BitvSet {
     /// let a = BitvSet::from_bitv(from_bytes([0b01101000]));
     /// let b = BitvSet::from_bitv(from_bytes([0b10100000]));
     ///
-    /// // Print 2
-    /// for x in a.intersection(&b) {
+    /// // Print 0, 1, 4 in arbitrary order
+    /// for x in a.symmetric_difference(&b) {
     ///     println!("{}", x);
     /// }
     /// ```
     #[inline]
-    pub fn intersection<'a>(&'a self, other: &'a BitvSet) -> Take<TwoBitPositions<'a>> {
-        let min = cmp::min(self.capacity(), other.capacity());
+    pub fn symmetric_difference<'a>(&'a self, other: &'a BitvSet) -> TwoBitPositions<'a> {
         TwoBitPositions {
             set: self,
             other: other,
-            merge: |w1, w2| w1 & w2,
+            merge: |w1, w2| w1 ^ w2,
             current_word: 0,
             next_idx: 0
-        }.take(min)
+        }
     }
 
     /// Union in-place with the specified other bit vector.