user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not do match check if lowering failed.

Browse source
This commit is contained in:
Dawer 2021-05-06 13:32:35 +05:00
parent de6f430140
commit e50ce67631
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/hir_ty/src/diagnostics/expr.rs
View file

@ -388,14 +388,26 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
let pattern_arena = RefCell::new(PatternArena::new());
let mut have_errors = false;
let m_arms: Vec<_> = arms
.iter()
.map(|arm| usefulness::MatchArm {
pat: self.lower_pattern(arm.pat, &mut pattern_arena.borrow_mut(), db, &body),
pat: self.lower_pattern(
arm.pat,
&mut pattern_arena.borrow_mut(),
db,
&body,
&mut have_errors,
),
has_guard: arm.guard.is_some(),
})
.collect();
// Bail out early if lowering failed.
if have_errors {
return;
}
let cx = usefulness::MatchCheckCtx {
module: self.owner.module(db.upcast()),
match_expr,
@ -442,10 +454,15 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
pattern_arena: &mut PatternArena,
db: &dyn HirDatabase,
body: &Body,
have_errors: &mut bool,
) -> pattern::PatId {
let mut patcx = pattern::PatCtxt::new(db, &self.infer, body);
let pattern = patcx.lower_pattern(pat);
pattern_arena.alloc(expand_pattern(pattern))
let pattern = pattern_arena.alloc(expand_pattern(pattern));
if !patcx.errors.is_empty() {
*have_errors = true;
}
pattern
}
fn validate_results_in_tail_expr(&mut self, body_id: ExprId, id: ExprId, db: &dyn HirDatabase) {