diff options
| -rw-r--r-- | src/libcollections/btree/set.rs | 85 |
1 files changed, 84 insertions, 1 deletions
diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index 64ae4f6a508..27c3fd1af3e 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -22,7 +22,6 @@ use core::iter::Peekable; use core::fmt::Show; // FIXME(conventions): implement bounded iterators -// FIXME(conventions): implement BitOr, BitAnd, BitXor, and Sub /// A set based on a B-Tree. /// @@ -340,6 +339,90 @@ impl<T: Ord> Default for BTreeSet<T> { } } +#[unstable = "matches collection reform specification, waiting for dust to settle"] +impl<T: Ord + Clone> Sub<BTreeSet<T>,BTreeSet<T>> for BTreeSet<T> { + /// Returns the difference of `self` and `rhs` as a new `BTreeSet<T>`. + /// + /// # Examples + /// + /// ``` + /// use std::collections::BTreeSet; + /// + /// let a: BTreeSet<int> = vec![1,2,3].into_iter().collect(); + /// let b: BTreeSet<int> = vec![3,4,5].into_iter().collect(); + /// + /// let result: BTreeSet<int> = a - b; + /// let result_vec: Vec<int> = result.into_iter().collect(); + /// assert_eq!(result_vec, vec![1,2]); + /// ``` + fn sub(&self, rhs: &BTreeSet<T>) -> BTreeSet<T> { + self.difference(rhs).cloned().collect() + } +} + +#[unstable = "matches collection reform specification, waiting for dust to settle"] +impl<T: Ord + Clone> BitXor<BTreeSet<T>,BTreeSet<T>> for BTreeSet<T> { + /// Returns the symmetric difference of `self` and `rhs` as a new `BTreeSet<T>`. + /// + /// # Examples + /// + /// ``` + /// use std::collections::BTreeSet; + /// + /// let a: BTreeSet<int> = vec![1,2,3].into_iter().collect(); + /// let b: BTreeSet<int> = vec![2,3,4].into_iter().collect(); + /// + /// let result: BTreeSet<int> = a ^ b; + /// let result_vec: Vec<int> = result.into_iter().collect(); + /// assert_eq!(result_vec, vec![1,4]); + /// ``` + fn bitxor(&self, rhs: &BTreeSet<T>) -> BTreeSet<T> { + self.symmetric_difference(rhs).cloned().collect() + } +} + +#[unstable = "matches collection reform specification, waiting for dust to settle"] +impl<T: Ord + Clone> BitAnd<BTreeSet<T>,BTreeSet<T>> for BTreeSet<T> { + /// Returns the intersection of `self` and `rhs` as a new `BTreeSet<T>`. + /// + /// # Examples + /// + /// ``` + /// use std::collections::BTreeSet; + /// + /// let a: BTreeSet<int> = vec![1,2,3].into_iter().collect(); + /// let b: BTreeSet<int> = vec![2,3,4].into_iter().collect(); + /// + /// let result: BTreeSet<int> = a & b; + /// let result_vec: Vec<int> = result.into_iter().collect(); + /// assert_eq!(result_vec, vec![2,3]); + /// ``` + fn bitand(&self, rhs: &BTreeSet<T>) -> BTreeSet<T> { + self.intersection(rhs).cloned().collect() + } +} + +#[unstable = "matches collection reform specification, waiting for dust to settle"] +impl<T: Ord + Clone> BitOr<BTreeSet<T>,BTreeSet<T>> for BTreeSet<T> { + /// Returns the union of `self` and `rhs` as a new `BTreeSet<T>`. + /// + /// # Examples + /// + /// ``` + /// use std::collections::BTreeSet; + /// + /// let a: BTreeSet<int> = vec![1,2,3].into_iter().collect(); + /// let b: BTreeSet<int> = vec![3,4,5].into_iter().collect(); + /// + /// let result: BTreeSet<int> = a | b; + /// let result_vec: Vec<int> = result.into_iter().collect(); + /// assert_eq!(result_vec, vec![1,2,3,4,5]); + /// ``` + fn bitor(&self, rhs: &BTreeSet<T>) -> BTreeSet<T> { + self.union(rhs).cloned().collect() + } +} + impl<T: Show> Show for BTreeSet<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { try!(write!(f, "{{")); |