bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Factor out IntRange::is_subrange

Browse source
This commit is contained in:
Nadrieril 2019-11-12 13:03:05 +00:00
parent 9165dd056b
commit b679e77f04
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_mir/hair/pattern/_match.rs
View file

@ -1357,6 +1357,10 @@ impl<'tcx> IntRange<'tcx> {
remaining_ranges
}
fn is_subrange(&self, other: &Self) -> bool {
other.range.start() <= self.range.start() && self.range.end() <= other.range.end()
}
fn intersection(&self, tcx: TyCtxt<'tcx>, other: &Self) -> Option<Self> {
let ty = self.ty;
let (lo, hi) = self.boundaries();
@ -1370,7 +1374,7 @@ impl<'tcx> IntRange<'tcx> {
}
} else {
// If the range should not be treated exhaustively, fallback to checking for inclusion.
if other_lo <= lo && hi <= other_hi { Some(self.clone()) } else { None }
if self.is_subrange(other) { Some(self.clone()) } else { None }
}
}
@ -2236,9 +2240,7 @@ fn specialize_one_pattern<'p, 'a: 'p, 'q: 'p, 'tcx>(
Some(pat) => ctor.intersection(cx.tcx, &pat).map(|_| {
// Constructor splitting should ensure that all intersections we encounter
// are actually inclusions.
let (pat_lo, pat_hi) = pat.boundaries();
let (ctor_lo, ctor_hi) = ctor.boundaries();
assert!(pat_lo <= ctor_lo && ctor_hi <= pat_hi);
assert!(ctor.is_subrange(&pat));
PatStack::default()
}),
_ => None,