nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 08:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reuse bitwise in BitMatrix.

Browse Source
This commit is contained in:
Camille GILLOT 2023-09-24 09:05:18 +00:00
parent af7819477a
commit 0adfe207d7
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1699,14 +1699,15 @@ impl<R: Idx, C: Idx> BitMatrix<R, C> {
let (read_start, read_end) = self.range(read); let (read_start, read_end) = self.range(read);
let (write_start, write_end) = self.range(write); let (write_start, write_end) = self.range(write);
let words = &mut self.words[..]; let words = &mut self.words[..];
let mut changed = false; let mut changed = 0;
for (read_index, write_index) in iter::zip(read_start..read_end, write_start..write_end) { for (read_index, write_index) in iter::zip(read_start..read_end, write_start..write_end) {
let word = words[write_index]; let word = words[write_index];
let new_word = word | words[read_index]; let new_word = word | words[read_index];
words[write_index] = new_word; words[write_index] = new_word;
changed |= word != new_word; // See `bitwise` for the rationale.
changed |= word ^ new_word;
} }
changed changed != 0
} }
/// Adds the bits from `with` to the bits from row `write`, and /// Adds the bits from `with` to the bits from row `write`, and
@ -1715,14 +1716,7 @@ impl<R: Idx, C: Idx> BitMatrix<R, C> {
assert!(write.index() < self.num_rows); assert!(write.index() < self.num_rows);
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; bitwise(&mut self.words[write_start..write_end], &with.words, |a, b| a | b)
for (read_index, write_index) in iter::zip(0..with.words.len(), write_start..write_end) {
let word = self.words[write_index];
let new_word = word | with.words[read_index];
self.words[write_index] = new_word;
changed |= word != new_word;
}
changed
} }
/// Sets every cell in `row` to true. /// Sets every cell in `row` to true.