Skip to content

Commit a22e93e

Browse files
treemanalexcrichton
authored andcommitted
---
yaml --- r: 124821 b: refs/heads/auto c: f4d9dca h: refs/heads/master i: 124819: f3da29c v: v3
1 parent e4c00e4 commit a22e93e

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
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: 2e40078fc3325f336b1e0d27313d67ad6ae19419
16+
refs/heads/auto: f4d9dca10dfa73c7d1a9d3be7c63e943d29a43c9
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: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -170,28 +170,6 @@ impl Bitv {
170170
}
171171
}
172172

173-
/**
174-
* Calculates the union of two bitvectors
175-
*
176-
* Sets `self` to the union of `self` and `v1`. Both bitvectors must be
177-
* the same length. Returns `true` if `self` changed.
178-
*/
179-
#[inline]
180-
pub fn union(&mut self, other: &Bitv) -> bool {
181-
self.process(other, |w1, w2| w1 | w2)
182-
}
183-
184-
/**
185-
* Calculates the intersection of two bitvectors
186-
*
187-
* Sets `self` to the intersection of `self` and `v1`. Both bitvectors
188-
* must be the same length. Returns `true` if `self` changed.
189-
*/
190-
#[inline]
191-
pub fn intersect(&mut self, other: &Bitv) -> bool {
192-
self.process(other, |w1, w2| w1 & w2)
193-
}
194-
195173
/// Retrieve the value at index `i`
196174
#[inline]
197175
pub fn get(&self, i: uint) -> bool {
@@ -229,6 +207,28 @@ impl Bitv {
229207
for w in self.storage.mut_iter() { *w = !*w; }
230208
}
231209

210+
/**
211+
* Calculates the union of two bitvectors
212+
*
213+
* Sets `self` to the union of `self` and `v1`. Both bitvectors must be
214+
* the same length. Returns `true` if `self` changed.
215+
*/
216+
#[inline]
217+
pub fn union(&mut self, other: &Bitv) -> bool {
218+
self.process(other, |w1, w2| w1 | w2)
219+
}
220+
221+
/**
222+
* Calculates the intersection of two bitvectors
223+
*
224+
* Sets `self` to the intersection of `self` and `v1`. Both bitvectors
225+
* must be the same length. Returns `true` if `self` changed.
226+
*/
227+
#[inline]
228+
pub fn intersect(&mut self, other: &Bitv) -> bool {
229+
self.process(other, |w1, w2| w1 & w2)
230+
}
231+
232232
/**
233233
* Calculate the difference between two bitvectors
234234
*

0 commit comments

Comments
 (0)