bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move constructor into the branch that actually uses it

Browse source
This commit is contained in:
Oli Scherer 2022-06-28 10:49:55 +00:00
parent 48316dfea1
commit 970ff3d45d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_mir_build/src/thir/pattern/usefulness.rs
View file

@ -806,11 +806,6 @@ fn is_useful<'p, 'tcx>(
debug_assert!(rows.iter().all(|r| r.len() == v.len())); debug_assert!(rows.iter().all(|r| r.len() == v.len()));
let ty = v.head().ty();
let is_non_exhaustive = cx.is_foreign_non_exhaustive_enum(ty);
debug!("v.head: {:?}, v.span: {:?}", v.head(), v.head().span());
let pcx = PatCtxt { cx, ty, span: v.head().span(), is_top_level, is_non_exhaustive };
// If the first pattern is an or-pattern, expand it. // If the first pattern is an or-pattern, expand it.
let mut ret = Usefulness::new_not_useful(witness_preference); let mut ret = Usefulness::new_not_useful(witness_preference);
if v.head().is_or_pat() { if v.head().is_or_pat() {
@ -832,6 +827,11 @@ fn is_useful<'p, 'tcx>(
} }
} }
} else { } else {
let ty = v.head().ty();
let is_non_exhaustive = cx.is_foreign_non_exhaustive_enum(ty);
debug!("v.head: {:?}, v.span: {:?}", v.head(), v.head().span());
let pcx = PatCtxt { cx, ty, span: v.head().span(), is_top_level, is_non_exhaustive };
let v_ctor = v.head().ctor(); let v_ctor = v.head().ctor();
debug!(?v_ctor); debug!(?v_ctor);
if let Constructor::IntRange(ctor_range) = &v_ctor { if let Constructor::IntRange(ctor_range) = &v_ctor {