Unrolled build for rust-lang#121803

rust-timer · web-flow · commit dbd678b53816 · 2024-03-01T21:33:34.000-05:00
Rollup merge of rust-lang#121803 - estebank:dont-mention-type-error-e0277, r=compiler-errors Never say "`Trait` is implemented for `{type error}`" When a trait bound error occurs, we look for alternative types that would have made the bound succeed. For some reason `{type error}` sometimes would appear as a type that would do so. We now remove `{type error}` from the list in every case to avoid nonsensical `note`s.
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs
@@ -1910,6 +1910,9 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
                             ct_op: |ct| ct.normalize(self.tcx, ty::ParamEnv::empty()),
                         },
                     );
+                    if cand.references_error() {
+                        return false;
+                    }
                     err.highlighted_help(vec![
                         StringPart::normal(format!("the trait `{}` ", cand.print_trait_sugared())),
                         StringPart::highlighted("is"),
@@ -1934,7 +1937,8 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
         }
 
         let other = if other { "other " } else { "" };
-        let report = |candidates: Vec<TraitRef<'tcx>>, err: &mut Diag<'_>| {
+        let report = |mut candidates: Vec<TraitRef<'tcx>>, err: &mut Diag<'_>| {
+            candidates.retain(|tr| !tr.references_error());
             if candidates.is_empty() {
                 return false;
             }
diff --git a/tests/ui/associated-consts/issue-105330.stderr b/tests/ui/associated-consts/issue-105330.stderr
@@ -55,7 +55,6 @@ error[E0277]: the trait bound `Demo: TraitWAssocConst` is not satisfied
 LL |     foo::<Demo>()();
    |           ^^^^ the trait `TraitWAssocConst` is not implemented for `Demo`
    |
-   = help: the trait `TraitWAssocConst` is implemented for `{type error}`
 note: required by a bound in `foo`
   --> $DIR/issue-105330.rs:11:11
    |
@@ -92,7 +91,6 @@ error[E0277]: the trait bound `Demo: TraitWAssocConst` is not satisfied
 LL |     foo::<Demo>();
    |           ^^^^ the trait `TraitWAssocConst` is not implemented for `Demo`
    |
-   = help: the trait `TraitWAssocConst` is implemented for `{type error}`
 note: required by a bound in `foo`
   --> $DIR/issue-105330.rs:11:11
    |

Original file line number	Diff line number	Diff line change
@@ -55,7 +55,6 @@ error[E0277]: the trait bound `Demo: TraitWAssocConst` is not satisfied
`55`	`55`	`LL \| foo::<Demo>()();`
`56`	`56`	\| ^^^^ the trait `TraitWAssocConst` is not implemented for `Demo`
`57`	`57`	`\|`
`58`		- = help: the trait `TraitWAssocConst` is implemented for `{type error}`
`59`	`58`	note: required by a bound in `foo`
`60`	`59`	`--> $DIR/issue-105330.rs:11:11`
`61`	`60`	`\|`
@@ -92,7 +91,6 @@ error[E0277]: the trait bound `Demo: TraitWAssocConst` is not satisfied
`92`	`91`	`LL \| foo::<Demo>();`
`93`	`92`	\| ^^^^ the trait `TraitWAssocConst` is not implemented for `Demo`
`94`	`93`	`\|`
`95`		- = help: the trait `TraitWAssocConst` is implemented for `{type error}`
`96`	`94`	note: required by a bound in `foo`
`97`	`95`	`--> $DIR/issue-105330.rs:11:11`
`98`	`96`	`\|`