language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

infer: update resolver when descending into block

Browse source
This commit is contained in:
Jonas Schievink 2021-02-10 14:41:54 +01:00
parent 82a1b91f20
commit e837df8479
2 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
crates/hir_ty/src/infer/expr.rs
View file

@ -137,24 +137,28 @@ impl<'a> InferenceContext<'a> {
self.coerce_merge_branch(&then_ty, &else_ty) self.coerce_merge_branch(&then_ty, &else_ty)
} }
Expr::Block { statements, tail, label, id: _ } => match label { Expr::Block { statements, tail, label, id: _ } => {
Some(_) => { self.resolver = resolver_for_expr(self.db.upcast(), self.owner, tgt_expr);
let break_ty = self.table.new_type_var(); match label {
self.breakables.push(BreakableContext { Some(_) => {
may_break: false, let break_ty = self.table.new_type_var();
break_ty: break_ty.clone(), self.breakables.push(BreakableContext {
label: label.map(|label| self.body[label].name.clone()), may_break: false,
}); break_ty: break_ty.clone(),
let ty = self.infer_block(statements, *tail, &Expectation::has_type(break_ty)); label: label.map(|label| self.body[label].name.clone()),
let ctxt = self.breakables.pop().expect("breakable stack broken"); });
if ctxt.may_break { let ty =
ctxt.break_ty self.infer_block(statements, *tail, &Expectation::has_type(break_ty));
} else { let ctxt = self.breakables.pop().expect("breakable stack broken");
ty if ctxt.may_break {
ctxt.break_ty
} else {
ty
}
} }
None => self.infer_block(statements, *tail, expected),
} }
None => self.infer_block(statements, *tail, expected), }
},
Expr::Unsafe { body } | Expr::Const { body } => self.infer_expr(*body, expected), Expr::Unsafe { body } | Expr::Const { body } => self.infer_expr(*body, expected),
Expr::TryBlock { body } => { Expr::TryBlock { body } => {
let _inner = self.infer_expr(*body, expected); let _inner = self.infer_expr(*body, expected);

19
crates/hir_ty/src/tests/simple.rs
View file

@ -2415,3 +2415,22 @@ fn infer_const_params() {
"#]], "#]],
); );
} }
#[test]
fn infer_inner_type() {
check_infer(r#"
fn foo() {
struct S { field: u32 }
let s = S { field: 0 };
let f = s.field;
}
"#, expect![[r#"
9..89 '{ ...eld; }': ()
47..48 's': S
51..65 'S { field: 0 }': S
62..63 '0': u32
75..76 'f': u32
79..80 's': S
79..86 's.field': u32
"#]]);
}