bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix suggestion regression with incorrect syntactic combination of trait bounds

Browse source
This commit is contained in:
Will Crichton 2022-07-15 18:02:26 -07:00
parent e5bb7d80d6
commit 2f15dfab0b
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -599,7 +599,19 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
if let Some(proj_pred) = proj_pred {
let ProjectionPredicate { projection_ty, term } = proj_pred.skip_binder();
let item = self.tcx.associated_item(projection_ty.item_def_id);
constraint.push_str(&format!("<{}={}>", item.name, term.to_string()));
// FIXME: this case overlaps with code in TyCtxt::note_and_explain_type_err.
// That should be extracted into a helper function.
if constraint.ends_with('>') {
constraint = format!(
"{}, {}={}>",
&constraint[..constraint.len() - 1],
item.name,
term.to_string()
);
} else {
constraint.push_str(&format!("<{}={}>", item.name, term.to_string()));
}
}
if suggest_constraining_type_param(