bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix HybridBitSet port issue

Browse source
This commit is contained in:
Will Crichton 2021-08-24 18:14:39 -07:00
parent 79e0a0faf9
commit 6cf3786ba4
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_index/src/bit_set.rs
View file

@ -247,10 +247,13 @@ impl<T: Idx> BitRelations<BitSet<T>> for BitSet<T> {
} }
} }
fn sequential_update<T: Idx>(mut f: impl FnMut(T) -> bool, it: impl Iterator<Item = T>) -> bool { fn sequential_update<T: Idx>(
mut self_update: impl FnMut(T) -> bool,
it: impl Iterator<Item = T>,
) -> bool {
let mut changed = false; let mut changed = false;
for elem in it { for elem in it {
changed |= f(elem); changed |= self_update(elem);
} }
changed changed
} }
@ -342,7 +345,17 @@ impl<T: Idx> BitRelations<HybridBitSet<T>> for HybridBitSet<T> {
match self { match self {
HybridBitSet::Sparse(self_sparse) => { HybridBitSet::Sparse(self_sparse) => {
match other { match other {
HybridBitSet::Sparse(other_sparse) => self_sparse.union(other_sparse), HybridBitSet::Sparse(other_sparse) => {
// Both sets are sparse. Add the elements in
// `other_sparse` to `self` one at a time. This
// may or may not cause `self` to be densified.
assert_eq!(self.domain_size(), other.domain_size());
let mut changed = false;
for elem in other_sparse.iter() {
changed |= self.insert(*elem);
}
changed
}
HybridBitSet::Dense(other_dense) => { HybridBitSet::Dense(other_dense) => {
// `self` is sparse and `other` is dense. To // `self` is sparse and `other` is dense. To