bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Ensure suggestion correctness

Browse source
This commit is contained in:
Esteban Küber 2023-01-08 19:12:15 +00:00
parent fcf0ed9018
commit df81147b51
6 changed files with 130 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_hir_typeck/src/demand.rs
View file

@ -713,6 +713,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
if Some(e.did()) != self.tcx.get_diagnostic_item(sym::Result) {
return false;
}
let map = self.tcx.hir();
if let Some(hir::Node::Expr(expr)) = map.find_parent(expr.hir_id)
&& let hir::ExprKind::Ret(_) = expr.kind
{
// `return foo;`
} else if map.get_return_block(expr.hir_id).is_some() {
// Function's tail expression.
} else {
return false;
}
let e = substs_e.type_at(1);
let f = substs_f.type_at(1);
if self