bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Small fixes

Browse source
This commit is contained in:
Will Crichton 2021-08-25 22:54:26 -07:00
parent 2110ac303e
commit 800d6531a9
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -271,10 +271,10 @@ fn dense_sparse_intersect<T: Idx>(
dense: &BitSet<T>, dense: &BitSet<T>,
sparse: &SparseBitSet<T>, sparse: &SparseBitSet<T>,
) -> (SparseBitSet<T>, bool) { ) -> (SparseBitSet<T>, bool) {
let n = dense.count();
let mut sparse_copy = sparse.clone(); let mut sparse_copy = sparse.clone();
sparse_intersect(&mut sparse_copy, |el| !dense.contains(*el)); sparse_intersect(&mut sparse_copy, |el| !dense.contains(*el));
(sparse_copy, dense.count() != n) let n = sparse_copy.len();
(sparse_copy, n != dense.count())
} }
impl<T: Idx> BitRelations<HybridBitSet<T>> for BitSet<T> { impl<T: Idx> BitRelations<HybridBitSet<T>> for BitSet<T> {
@ -303,7 +303,10 @@ impl<T: Idx> BitRelations<HybridBitSet<T>> for BitSet<T> {
match other { match other {
HybridBitSet::Sparse(sparse) => { HybridBitSet::Sparse(sparse) => {
let (updated, changed) = dense_sparse_intersect(self, sparse); let (updated, changed) = dense_sparse_intersect(self, sparse);
*self = updated.to_dense(); self.clear();
for elem in updated.iter() {
self.insert(*elem);
}
changed changed
} }
HybridBitSet::Dense(dense) => self.intersect(dense), HybridBitSet::Dense(dense) => self.intersect(dense),