bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't skip inner const when looking for body for suggestion

Browse source
This commit is contained in:
Michael Goulet 2024-05-23 19:48:54 -04:00
parent 5baee04b63
commit c58b7c9c81
3 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_hir_typeck/src/coercion.rs
View file

@ -1871,11 +1871,8 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
// If this is due to a block, then maybe we forgot a `return`/`break`.
if due_to_block
&& let Some(expr) = expression
&& let Some((parent_fn_decl, parent_id)) = fcx
.tcx
.hir()
.parent_iter(block_or_return_id)
.find_map(|(_, node)| Some((node.fn_decl()?, node.associated_body()?.0)))
&& let Some(parent_fn_decl) =
fcx.tcx.hir().fn_decl_by_hir_id(fcx.tcx.local_def_id_to_hir_id(fcx.body_id))
{
fcx.suggest_missing_break_or_return_expr(
&mut err,
@ -1884,7 +1881,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
expected,
found,
block_or_return_id,
parent_id,
fcx.body_id,
);
}