Skip to content

Commit f3da29c

Browse files
treemanalexcrichton
authored andcommitted
---
yaml --- r: 124819 b: refs/heads/auto c: 9aaaa6b h: refs/heads/master i: 124817: 627f0dc 124815: 0f15496 v: v3
1 parent 8a53429 commit f3da29c

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: c86873bda4d0d32a595dbaf24745c1f7cd9b89da
16+
refs/heads/auto: 9aaaa6b31e644f174051e30a48ec6fa350e7591d
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcollections/bitv.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -723,30 +723,6 @@ impl BitvSet {
723723
bitv.nbits = trunc_len * uint::BITS;
724724
}
725725

726-
/// Union in-place with the specified other bit vector
727-
#[inline]
728-
pub fn union_with(&mut self, other: &BitvSet) {
729-
self.other_op(other, |w1, w2| w1 | w2);
730-
}
731-
732-
/// Intersect in-place with the specified other bit vector
733-
#[inline]
734-
pub fn intersect_with(&mut self, other: &BitvSet) {
735-
self.other_op(other, |w1, w2| w1 & w2);
736-
}
737-
738-
/// Difference in-place with the specified other bit vector
739-
#[inline]
740-
pub fn difference_with(&mut self, other: &BitvSet) {
741-
self.other_op(other, |w1, w2| w1 & !w2);
742-
}
743-
744-
/// Symmetric difference in-place with the specified other bit vector
745-
#[inline]
746-
pub fn symmetric_difference_with(&mut self, other: &BitvSet) {
747-
self.other_op(other, |w1, w2| w1 ^ w2);
748-
}
749-
750726
/// Iterator over each uint stored in the BitvSet
751727
#[inline]
752728
pub fn iter<'a>(&'a self) -> BitPositions<'a> {
@@ -801,6 +777,30 @@ impl BitvSet {
801777
next_idx: 0
802778
}
803779
}
780+
781+
/// Union in-place with the specified other bit vector
782+
#[inline]
783+
pub fn union_with(&mut self, other: &BitvSet) {
784+
self.other_op(other, |w1, w2| w1 | w2);
785+
}
786+
787+
/// Intersect in-place with the specified other bit vector
788+
#[inline]
789+
pub fn intersect_with(&mut self, other: &BitvSet) {
790+
self.other_op(other, |w1, w2| w1 & w2);
791+
}
792+
793+
/// Difference in-place with the specified other bit vector
794+
#[inline]
795+
pub fn difference_with(&mut self, other: &BitvSet) {
796+
self.other_op(other, |w1, w2| w1 & !w2);
797+
}
798+
799+
/// Symmetric difference in-place with the specified other bit vector
800+
#[inline]
801+
pub fn symmetric_difference_with(&mut self, other: &BitvSet) {
802+
self.other_op(other, |w1, w2| w1 ^ w2);
803+
}
804804
}
805805

806806
impl fmt::Show for BitvSet {

0 commit comments

Comments
 (0)