Clean up test stderr

Author: sjwang05

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

@@ -2156,7 +2156,13 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
             .map(|(name, ty)| {
                 format!(
                     "{name}{}",
-                    if ty.has_infer_types() { String::new() } else { format!(": {ty}") }
+                    if ty.has_infer_types() {
+                        String::new()
+                    } else if ty.references_error() {
+                        ": /* type */".to_string()
+                    } else {
+                        format!(": {ty}")
+                    }
                 )
             })
             .collect();

tests/ui/mismatched_types/issue-118510.rs

@@ -1,11 +1,8 @@
-pub enum Sexpr<'a> {
+pub enum Sexpr<'a, S> {
     Ident(&'a mut S),
-    //~^ ERROR cannot find type `S` in this scope [E0412]
 }
 
-fn map<'a, F: FnOnce(&Foo<'a>) -> T>(f: F) {}
-//~^ ERROR cannot find type `Foo` in this scope [E0412]
-//~| ERROR cannot find type `T` in this scope [E0412]
+fn map<Foo, T, F: FnOnce(&Foo) -> T>(f: F) {}
 
 fn main() {
     map(Sexpr::Ident);

tests/ui/mismatched_types/issue-118510.stderr

@@ -1,30 +1,5 @@
-error[E0412]: cannot find type `S` in this scope
-  --> $DIR/issue-118510.rs:2:19
-   |
-LL |     Ident(&'a mut S),
-   |                   ^ not found in this scope
-   |
-help: you might be missing a type parameter
-   |
-LL | pub enum Sexpr<'a, S> {
-   |                  +++
-
-error[E0412]: cannot find type `Foo` in this scope
-  --> $DIR/issue-118510.rs:6:23
-   |
-LL | fn map<'a, F: FnOnce(&Foo<'a>) -> T>(f: F) {}
-   |                       ^^^ not found in this scope
-
-error[E0412]: cannot find type `T` in this scope
-  --> $DIR/issue-118510.rs:6:35
-   |
-LL | fn map<'a, F: FnOnce(&Foo<'a>) -> T>(f: F) {}
-   |            -                      ^ help: a type parameter with a similar name exists: `F`
-   |            |
-   |            similarly named type parameter `F` defined here
-
 error[E0631]: type mismatch in function arguments
-  --> $DIR/issue-118510.rs:11:9
+  --> $DIR/issue-118510.rs:8:9
    |
 LL |     Ident(&'a mut S),
    |     ----- found signature defined here
@@ -34,19 +9,18 @@ LL |     map(Sexpr::Ident);
    |     |
    |     required by a bound introduced by this call
    |
-   = note: expected function signature `for<'a> fn(&'a {type error}) -> _`
-              found function signature `fn(&mut {type error}) -> _`
+   = note: expected function signature `for<'a> fn(&'a _) -> _`
+              found function signature `fn(&mut _) -> _`
 note: required by a bound in `map`
-  --> $DIR/issue-118510.rs:6:15
+  --> $DIR/issue-118510.rs:5:19
    |
-LL | fn map<'a, F: FnOnce(&Foo<'a>) -> T>(f: F) {}
-   |               ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
+LL | fn map<Foo, T, F: FnOnce(&Foo) -> T>(f: F) {}
+   |                   ^^^^^^^^^^^^^^^^^ required by this bound in `map`
 help: consider wrapping the function in a closure
    |
-LL |     map(|arg0: &{type error}| Sexpr::Ident(&mut *arg0));
-   |         +++++++++++++++++++++             ++++++++++++
+LL |     map(|arg0| Sexpr::Ident(&mut *arg0));
+   |         ++++++             ++++++++++++
 
-error: aborting due to 4 previous errors
+error: aborting due to 1 previous error
 
-Some errors have detailed explanations: E0412, E0631.
-For more information about an error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0631`.