bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert closure mismatch spans

Browse source
This commit is contained in:
Michael Goulet 2022-08-16 23:54:54 +00:00
parent 3a1aa3c76e
commit 52e2065ed4
9 changed files with 94 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_typeck/src/check/fn_ctxt/checks.rs
View file

@ -1630,6 +1630,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
{
return;
}
// Skip over closure arg mismatch, which has a better heuristic
// to determine what span to point at.
if let traits::FulfillmentErrorCode::CodeSelectionError(
traits::SelectionError::OutputTypeParameterMismatch(_, expected, _),
) = error.code
&& let ty::Closure(..) | ty::Generator(..) = expected.skip_binder().self_ty().kind()
{
return;
}
let Some(unsubstituted_pred) =
self.tcx.predicates_of(def_id).instantiate_identity(self.tcx).predicates.into_iter().nth(idx) else { return; };