bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #83952 - estebank:issue-83943, r=petrochenkov

Browse source 
Account for `ExprKind::Block` when suggesting .into() and deref

Fix #83943.
This commit is contained in:
Dylan DPC 2021-04-08 01:01:45 +02:00 • committed by GitHub
commit 97c50d529b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs
View file

@ -205,6 +205,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
found: Ty<'tcx>,
expected_ty_expr: Option<&'tcx hir::Expr<'tcx>>,
) {
let expr = expr.peel_blocks();
if let Some((sp, msg, suggestion, applicability)) = self.check_ref(expr, found, expected) {
err.span_suggestion(sp, msg, suggestion, applicability);
} else if let (ty::FnDef(def_id, ..), true) =