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

traits diagnostics: Don't print closure/generator upvar_tys tuple

Browse source 
Co-authored-by: Roxane Fruytier <roxane.fruytier@hotmail.com>
This commit is contained in:
Aman Arora 2020-10-08 00:28:53 -04:00
parent 08d1ab0bf1
commit 3c46fd67f8
11 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -1922,7 +1922,29 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
return;
}
err.note(&format!("required because it appears within the type `{}`", ty));
// If the obligation for a tuple is set directly by a Generator or Closure,
// then the tuple must be the one containing capture types.
let is_upvar_tys_infer_tuple = if !matches!(ty.kind(), ty::Tuple(..)) {
false
} else {
if let ObligationCauseCode::BuiltinDerivedObligation(ref data) =
*data.parent_code
{
let parent_trait_ref =
self.resolve_vars_if_possible(&data.parent_trait_ref);
let ty = parent_trait_ref.skip_binder().self_ty();
matches!(ty.kind(), ty::Generator(..))
|| matches!(ty.kind(), ty::Closure(..))
} else {
false
}
};
// Don't print the tuple of capture types
if !is_upvar_tys_infer_tuple {
err.note(&format!("required because it appears within the type `{}`", ty));
}
obligated_types.push(ty);
let parent_predicate = parent_trait_ref.without_const().to_predicate(tcx);