bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/infer/expr.rs')
-rw-r--r--crates/hir-ty/src/infer/expr.rs37
1 files changed, 35 insertions, 2 deletions
diff --git a/crates/hir-ty/src/infer/expr.rs b/crates/hir-ty/src/infer/expr.rs
index 8b8e97b008..c377a51e7d 100644
--- a/crates/hir-ty/src/infer/expr.rs
+++ b/crates/hir-ty/src/infer/expr.rs
@@ -13,7 +13,7 @@ use hir_def::{
ArithOp, Array, BinaryOp, ClosureKind, Expr, ExprId, LabelId, Literal, Statement, UnaryOp,
},
lang_item::{LangItem, LangItemTarget},
- path::{GenericArg, GenericArgs},
+ path::{GenericArg, GenericArgs, Path},
BlockId, ConstParamId, FieldId, ItemContainerId, Lookup, TupleFieldId, TupleId,
};
use hir_expand::name::{name, Name};
@@ -439,7 +439,17 @@ impl InferenceContext<'_> {
}
Expr::Path(p) => {
let g = self.resolver.update_to_inner_scope(self.db.upcast(), self.owner, tgt_expr);
- let ty = self.infer_path(p, tgt_expr.into()).unwrap_or_else(|| self.err_ty());
+ let ty = match self.infer_path(p, tgt_expr.into()) {
+ Some(ty) => ty,
+ None => {
+ if matches!(p, Path::Normal { mod_path, .. } if mod_path.is_ident()) {
+ self.push_diagnostic(InferenceDiagnostic::UnresolvedIdent {
+ expr: tgt_expr,
+ });
+ }
+ self.err_ty()
+ }
+ };
self.resolver.reset_to_guard(g);
ty
}
@@ -502,6 +512,7 @@ impl InferenceContext<'_> {
self.result.standard_types.never.clone()
}
&Expr::Return { expr } => self.infer_expr_return(tgt_expr, expr),
+ &Expr::Become { expr } => self.infer_expr_become(expr),
Expr::Yield { expr } => {
if let Some((resume_ty, yield_ty)) = self.resume_yield_tys.clone() {
if let Some(expr) = expr {
@@ -1084,6 +1095,27 @@ impl InferenceContext<'_> {
self.result.standard_types.never.clone()
}
+ fn infer_expr_become(&mut self, expr: ExprId) -> Ty {
+ match &self.return_coercion {
+ Some(return_coercion) => {
+ let ret_ty = return_coercion.expected_ty();
+
+ let call_expr_ty =
+ self.infer_expr_inner(expr, &Expectation::HasType(ret_ty.clone()));
+
+ // NB: this should *not* coerce.
+ // tail calls don't support any coercions except lifetimes ones (like `&'static u8 -> &'a u8`).
+ self.unify(&call_expr_ty, &ret_ty);
+ }
+ None => {
+ // FIXME: diagnose `become` outside of functions
+ self.infer_expr_no_expect(expr);
+ }
+ }
+
+ self.result.standard_types.never.clone()
+ }
+
fn infer_expr_box(&mut self, inner_expr: ExprId, expected: &Expectation) -> Ty {
if let Some(box_id) = self.resolve_boxed_box() {
let table = &mut self.table;
@@ -1367,6 +1399,7 @@ impl InferenceContext<'_> {
);
}
}
+ Statement::Item => (),
}
}