bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #101629 - compiler-errors:issue-101623, r=sanxiyn

Browse source 
Be careful about `expr_ty_adjusted` when noting block tail type

Fixes #101623
This commit is contained in:
bors 2022-09-19 07:41:54 +00:00
commit 503e19d01e
4 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -2714,12 +2714,13 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
Some(t) if t.hir_owner == parent_id => t,
_ => self.tcx.typeck(parent_id),
};
let ty = typeck_results.expr_ty_adjusted(expr);
let span = expr.peel_blocks().span;
let expr = expr.peel_blocks();
let ty = typeck_results.expr_ty_adjusted_opt(expr).unwrap_or(tcx.ty_error());
let span = expr.span;
if Some(span) != err.span.primary_span() {
err.span_label(
span,
&if ty.references_error() {
if ty.references_error() {
String::new()
} else {
format!("this tail expression is of type `{:?}`", ty)