nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-28 15:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

No need to expose Matrix internals

Browse Source
This commit is contained in:
Nadrieril 2020-11-21 23:12:53 +00:00
parent d447bdff9b
commit 3715f1ed00
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_mir_build/src/thir/pattern/_match.rs
View File

@ -476,6 +476,11 @@ impl<'p, 'tcx> Matrix<'p, 'tcx> {
Matrix { patterns: vec![] } Matrix { patterns: vec![] }
} }
/// Number of columns of this matrix. `None` is the matrix is empty.
fn column_count(&self) -> Option<usize> {
self.patterns.get(0).map(|r| r.len())
}
/// Pushes a new row to the matrix. If the row starts with an or-pattern, this expands it. /// Pushes a new row to the matrix. If the row starts with an or-pattern, this expands it.
fn push(&mut self, row: PatStack<'p, 'tcx>) { fn push(&mut self, row: PatStack<'p, 'tcx>) {
if let Some(rows) = row.expand_or_pat() { if let Some(rows) = row.expand_or_pat() {
@ -1897,7 +1902,7 @@ impl<'tcx> IntRange<'tcx> {
// Collect the span and range of all the intersecting ranges to lint on likely // Collect the span and range of all the intersecting ranges to lint on likely
// incorrect range patterns. (#63987) // incorrect range patterns. (#63987)
let mut overlaps = vec![]; let mut overlaps = vec![];
let row_len = pcx.matrix.patterns.get(0).map(|r| r.len()).unwrap_or(0); let row_len = pcx.matrix.column_count().unwrap_or(0);
// `borders` is the set of borders between equivalence classes: each equivalence // `borders` is the set of borders between equivalence classes: each equivalence
// class lies between 2 borders. // class lies between 2 borders.
let row_borders = pcx let row_borders = pcx