mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove BitSet::words.

Browse Source
This commit is contained in:
Nicholas Nethercote 2023-11-13 16:24:16 +11:00
parent 2b603f95a4
commit 06faf589ac
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_index/src/bit_set.rs
View File

@ -237,11 +237,6 @@ pub fn remove(&mut self, elem: T) -> bool {
new_word != word new_word != word
} }
/// Gets a slice of the underlying words.
pub fn words(&self) -> &[Word] {
&self.words
}
/// Iterates over the indices of set bits in a sorted order. /// Iterates over the indices of set bits in a sorted order.
#[inline] #[inline]
pub fn iter(&self) -> BitIter<'_, T> { pub fn iter(&self) -> BitIter<'_, T> {
@ -1601,11 +1596,11 @@ pub fn new(num_rows: usize, num_columns: usize) -> BitMatrix<R, C> {
pub fn from_row_n(row: &BitSet<C>, num_rows: usize) -> BitMatrix<R, C> { pub fn from_row_n(row: &BitSet<C>, num_rows: usize) -> BitMatrix<R, C> {
let num_columns = row.domain_size(); let num_columns = row.domain_size();
let words_per_row = num_words(num_columns); let words_per_row = num_words(num_columns);
assert_eq!(words_per_row, row.words().len()); assert_eq!(words_per_row, row.words.len());
BitMatrix { BitMatrix {
num_rows, num_rows,
num_columns, num_columns,
words: iter::repeat(row.words()).take(num_rows).flatten().cloned().collect(), words: iter::repeat(&row.words).take(num_rows).flatten().cloned().collect(),
marker: PhantomData, marker: PhantomData,
} }
} }
@ -1700,9 +1695,9 @@ pub fn union_row_with(&mut self, with: &BitSet<C>, write: R) -> bool {
assert_eq!(with.domain_size(), self.num_columns); assert_eq!(with.domain_size(), self.num_columns);
let (write_start, write_end) = self.range(write); let (write_start, write_end) = self.range(write);
let mut changed = false; let mut changed = false;
for (read_index, write_index) in iter::zip(0..with.words().len(), write_start..write_end) { for (read_index, write_index) in iter::zip(0..with.words.len(), write_start..write_end) {
let word = self.words[write_index]; let word = self.words[write_index];
let new_word = word | with.words()[read_index]; let new_word = word | with.words[read_index];
self.words[write_index] = new_word; self.words[write_index] = new_word;
changed |= word != new_word; changed |= word != new_word;
} }