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

Apply suggestions from code review

Browse Source
This commit is contained in:
Nadrieril 2019-11-12 13:23:27 +00:00
parent b679e77f04
commit addd8a9003
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/librustc_mir/hair/pattern/_match.rs
View File

@ -1231,9 +1231,9 @@ impl<'tcx> IntRange<'tcx> {
(*self.range.start(), *self.range.end()) (*self.range.start(), *self.range.end())
} }
/// Don't treat `usize`/`isize` exhaustively unless the `precise_pointer_size_matching` feature
/// is enabled.
fn treat_exhaustively(&self, tcx: TyCtxt<'tcx>) -> bool { fn treat_exhaustively(&self, tcx: TyCtxt<'tcx>) -> bool {
// Don't treat `usize`/`isize` exhaustively unless the `precise_pointer_size_matching`
// feature is enabled.
!self.ty.is_ptr_sized_integral() || tcx.features().precise_pointer_size_matching !self.ty.is_ptr_sized_integral() || tcx.features().precise_pointer_size_matching
} }
@ -1416,7 +1416,7 @@ impl<'tcx> IntRange<'tcx> {
} }
} }
// Ignore spans when comparing, they don't carry semantic information as they are only for lints. /// Ignore spans when comparing, they don't carry semantic information as they are only for lints.
impl<'tcx> std::cmp::PartialEq for IntRange<'tcx> { impl<'tcx> std::cmp::PartialEq for IntRange<'tcx> {
fn eq(&self, other: &Self) -> bool { fn eq(&self, other: &Self) -> bool {
self.range == other.range && self.ty == other.ty self.range == other.range && self.ty == other.ty
@ -2079,9 +2079,9 @@ fn constructor_covered_by_range<'tcx>(
param_env: ty::ParamEnv<'tcx>, param_env: ty::ParamEnv<'tcx>,
ctor: &Constructor<'tcx>, ctor: &Constructor<'tcx>,
pat: &Pat<'tcx>, pat: &Pat<'tcx>,
) -> bool { ) -> Option<()> {
if let Single = ctor { if let Single = ctor {
return true; return Some(());
} }
let (pat_from, pat_to, pat_end, ty) = match *pat.kind { let (pat_from, pat_to, pat_end, ty) = match *pat.kind {
@ -2096,16 +2096,11 @@ fn constructor_covered_by_range<'tcx>(
}; };
trace!("constructor_covered_by_range {:#?}, {:#?}, {:#?}, {}", ctor, pat_from, pat_to, ty); trace!("constructor_covered_by_range {:#?}, {:#?}, {:#?}, {}", ctor, pat_from, pat_to, ty);
let to = match compare_const_vals(tcx, ctor_to, pat_to, param_env, ty) { let to = compare_const_vals(tcx, ctor_to, pat_to, param_env, ty)?;
Some(to) => to, let from = compare_const_vals(tcx, ctor_from, pat_from, param_env, ty)?;
None => return false, let intersects = (from == Ordering::Greater || from == Ordering::Equal)
}; && (to == Ordering::Less || (pat_end == ctor_end && to == Ordering::Equal));
let from = match compare_const_vals(tcx, ctor_from, pat_from, param_env, ty) { if intersects { Some(()) } else { None }
Some(from) => from,
None => return false,
};
(from == Ordering::Greater || from == Ordering::Equal)
&& (to == Ordering::Less || (pat_end == ctor_end && to == Ordering::Equal))
} }
fn patterns_for_variant<'p, 'a: 'p, 'tcx>( fn patterns_for_variant<'p, 'a: 'p, 'tcx>(
@ -2251,11 +2246,8 @@ fn specialize_one_pattern<'p, 'a: 'p, 'q: 'p, 'tcx>(
// by `IntRange`. For these cases, the constructor may not be a // by `IntRange`. For these cases, the constructor may not be a
// range so intersection actually devolves into being covered // range so intersection actually devolves into being covered
// by the pattern. // by the pattern.
if constructor_covered_by_range(cx.tcx, cx.param_env, constructor, pat) { constructor_covered_by_range(cx.tcx, cx.param_env, constructor, pat)
Some(PatStack::default()) .map(|()| PatStack::default())
} else {
None
}
} }
} }