bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix for issue 91058

Browse source
This commit is contained in:
Michael Goulet 2021-11-19 14:57:33 -08:00
parent 3ba27e7dfa
commit 01b24045fa
6 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file

@ -1695,11 +1695,23 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
}
_ => exp_found,
};
debug!("exp_found {:?} terr {:?}", exp_found, terr);
debug!("exp_found {:?} terr {:?} cause.code {:?}", exp_found, terr, cause.code);
if let Some(exp_found) = exp_found {
self.suggest_as_ref_where_appropriate(span, &exp_found, diag);
self.suggest_accessing_field_where_appropriate(cause, &exp_found, diag);
self.suggest_await_on_expect_found(cause, span, &exp_found, diag);
let should_suggest_fixes = if let ObligationCauseCode::Pattern { root_ty, .. } =
&cause.code
{
// Skip if the root_ty of the pattern is not the same as the expected_ty.
// If these types aren't equal then we've probably peeled off a layer of arrays.
same_type_modulo_infer(self.resolve_vars_if_possible(*root_ty), exp_found.expected)
} else {
true
};
if should_suggest_fixes {
self.suggest_as_ref_where_appropriate(span, &exp_found, diag);
self.suggest_accessing_field_where_appropriate(cause, &exp_found, diag);
self.suggest_await_on_expect_found(cause, span, &exp_found, diag);
}
}
// In some (most?) cases cause.body_id points to actual body, but in some cases