Skip to content

Commit 437921f

Browse files
committed
call infer_pats from infer::expr with context
1 parent 14ab466 commit 437921f

File tree

1 file changed

+4
-5
lines changed
  • src/tools/rust-analyzer/crates/hir-ty/src/infer

1 file changed

+4
-5
lines changed

src/tools/rust-analyzer/crates/hir-ty/src/infer/expr.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ impl InferenceContext<'_> {
334334
ExprIsRead::No
335335
};
336336
let input_ty = self.infer_expr(expr, &Expectation::none(), child_is_read);
337-
self.infer_top_pat(pat, &input_ty);
337+
self.infer_top_pat(pat, &input_ty, None);
338338
self.result.standard_types.bool_.clone()
339339
}
340340
Expr::Block { statements, tail, label, id } => {
@@ -461,7 +461,7 @@ impl InferenceContext<'_> {
461461

462462
// Now go through the argument patterns
463463
for (arg_pat, arg_ty) in args.iter().zip(&sig_tys) {
464-
self.infer_top_pat(*arg_pat, arg_ty);
464+
self.infer_top_pat(*arg_pat, arg_ty, None);
465465
}
466466

467467
// FIXME: lift these out into a struct
@@ -582,7 +582,7 @@ impl InferenceContext<'_> {
582582
let mut all_arms_diverge = Diverges::Always;
583583
for arm in arms.iter() {
584584
let input_ty = self.resolve_ty_shallow(&input_ty);
585-
self.infer_top_pat(arm.pat, &input_ty);
585+
self.infer_top_pat(arm.pat, &input_ty, None);
586586
}
587587

588588
let expected = expected.adjust_for_branches(&mut self.table);
@@ -927,7 +927,7 @@ impl InferenceContext<'_> {
927927
let resolver_guard =
928928
self.resolver.update_to_inner_scope(self.db.upcast(), self.owner, tgt_expr);
929929
self.inside_assignment = true;
930-
self.infer_top_pat(target, &rhs_ty);
930+
self.infer_top_pat(target, &rhs_ty, None);
931931
self.inside_assignment = false;
932932
self.resolver.reset_to_guard(resolver_guard);
933933
}
@@ -1632,7 +1632,6 @@ impl InferenceContext<'_> {
16321632
decl_ty
16331633
};
16341634

1635-
this.infer_top_pat(*pat, &ty);
16361635
let decl = DeclContext {
16371636
has_else: else_branch.is_some(),
16381637
origin: DeclOrigin::LocalDecl,

0 commit comments

Comments
 (0)