Skip to content

Commit fa6ceba

Browse files
committed
Remove ChunkedBitSet impls that are no longer needed.
`ChunkedBitSet` is no longer used directly by dataflow analyses, with `MixedBitSet` replacing it in those contexts.
1 parent 34f45f0 commit fa6ceba

File tree

2 files changed

+2
-24
lines changed

2 files changed

+2
-24
lines changed

Diff for: compiler/rustc_mir_dataflow/src/framework/lattice.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
4141
use std::iter;
4242

43-
use rustc_index::bit_set::{BitSet, ChunkedBitSet, MixedBitSet};
43+
use rustc_index::bit_set::{BitSet, MixedBitSet};
4444
use rustc_index::{Idx, IndexVec};
4545

4646
use crate::framework::BitSetExt;
@@ -126,12 +126,6 @@ impl<T: Idx> JoinSemiLattice for BitSet<T> {
126126
}
127127
}
128128

129-
impl<T: Idx> JoinSemiLattice for ChunkedBitSet<T> {
130-
fn join(&mut self, other: &Self) -> bool {
131-
self.union(other)
132-
}
133-
}
134-
135129
impl<T: Idx> JoinSemiLattice for MixedBitSet<T> {
136130
fn join(&mut self, other: &Self) -> bool {
137131
self.union(other)

Diff for: compiler/rustc_mir_dataflow/src/framework/mod.rs

+1-17
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
use std::cmp::Ordering;
3636

3737
use rustc_data_structures::work_queue::WorkQueue;
38-
use rustc_index::bit_set::{BitSet, ChunkedBitSet, MixedBitSet};
38+
use rustc_index::bit_set::{BitSet, MixedBitSet};
3939
use rustc_index::{Idx, IndexVec};
4040
use rustc_middle::bug;
4141
use rustc_middle::mir::{self, BasicBlock, CallReturnPlaces, Location, TerminatorEdges, traversal};
@@ -71,12 +71,6 @@ impl<T: Idx> BitSetExt<T> for BitSet<T> {
7171
}
7272
}
7373

74-
impl<T: Idx> BitSetExt<T> for ChunkedBitSet<T> {
75-
fn contains(&self, elem: T) -> bool {
76-
self.contains(elem)
77-
}
78-
}
79-
8074
impl<T: Idx> BitSetExt<T> for MixedBitSet<T> {
8175
fn contains(&self, elem: T) -> bool {
8276
self.contains(elem)
@@ -333,16 +327,6 @@ impl<T: Idx> GenKill<T> for BitSet<T> {
333327
}
334328
}
335329

336-
impl<T: Idx> GenKill<T> for ChunkedBitSet<T> {
337-
fn gen_(&mut self, elem: T) {
338-
self.insert(elem);
339-
}
340-
341-
fn kill(&mut self, elem: T) {
342-
self.remove(elem);
343-
}
344-
}
345-
346330
impl<T: Idx> GenKill<T> for MixedBitSet<T> {
347331
fn gen_(&mut self, elem: T) {
348332
self.insert(elem);

0 commit comments

Comments
 (0)