Make all auto trait suggestions message only

estebank · estebank · commit 5bd1041b1117 · 2025-03-01T19:03:47.000Z
diff --git a/compiler/rustc_ast_passes/src/errors.rs b/compiler/rustc_ast_passes/src/errors.rs
@@ -343,7 +343,7 @@ pub(crate) struct ModuleNonAscii {
 #[diag(ast_passes_auto_generic, code = E0567)]
 pub(crate) struct AutoTraitGeneric {
     #[primary_span]
-    #[suggestion(code = "", applicability = "machine-applicable", style = "verbose")]
+    #[suggestion(code = "", applicability = "machine-applicable", style = "hidden")]
     pub span: Span,
     #[label]
     pub ident: Span,
@@ -354,7 +354,7 @@ pub(crate) struct AutoTraitGeneric {
 pub(crate) struct AutoTraitBounds {
     #[primary_span]
     pub span: Vec<Span>,
-    #[suggestion(code = "", applicability = "machine-applicable", style = "verbose")]
+    #[suggestion(code = "", applicability = "machine-applicable", style = "hidden")]
     pub removal: Span,
     #[label]
     pub ident: Span,
diff --git a/tests/ui/auto-traits/auto-trait-validation.stderr b/tests/ui/auto-traits/auto-trait-validation.stderr
@@ -6,11 +6,7 @@ LL | auto trait Generic<T> {}
    |            |
    |            auto trait cannot have generic parameters
    |
-help: remove the parameters
-   |
-LL - auto trait Generic<T> {}
-LL + auto trait Generic {}
-   |
+   = help: remove the parameters
 
 error[E0568]: auto traits cannot have super traits or lifetime bounds
   --> $DIR/auto-trait-validation.rs:8:20
@@ -20,11 +16,7 @@ LL | auto trait Bound : Copy {}
    |            |
    |            auto traits cannot have super traits or lifetime bounds
    |
-help: remove the super traits or lifetime bounds
-   |
-LL - auto trait Bound : Copy {}
-LL + auto trait Bound {}
-   |
+   = help: remove the super traits or lifetime bounds
 
 error[E0568]: auto traits cannot have super traits or lifetime bounds
   --> $DIR/auto-trait-validation.rs:10:28
@@ -34,11 +26,7 @@ LL | auto trait LifetimeBound : 'static {}
    |            |
    |            auto traits cannot have super traits or lifetime bounds
    |
-help: remove the super traits or lifetime bounds
-   |
-LL - auto trait LifetimeBound : 'static {}
-LL + auto trait LifetimeBound {}
-   |
+   = help: remove the super traits or lifetime bounds
 
 error[E0380]: auto traits cannot have associated items
   --> $DIR/auto-trait-validation.rs:12:25
diff --git a/tests/ui/auto-traits/bad-generics-on-dyn.stderr b/tests/ui/auto-traits/bad-generics-on-dyn.stderr
@@ -6,11 +6,7 @@ LL | auto trait Trait1<'a> {}
    |            |
    |            auto trait cannot have generic parameters
    |
-help: remove the parameters
-   |
-LL - auto trait Trait1<'a> {}
-LL + auto trait Trait1 {}
-   |
+   = help: remove the parameters
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/auto-traits/has-arguments.stderr b/tests/ui/auto-traits/has-arguments.stderr
@@ -6,11 +6,7 @@ LL | auto trait Trait1<'outer> {}
    |            |
    |            auto trait cannot have generic parameters
    |
-help: remove the parameters
-   |
-LL - auto trait Trait1<'outer> {}
-LL + auto trait Trait1 {}
-   |
+   = help: remove the parameters
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/auto-traits/issue-117789.stderr b/tests/ui/auto-traits/issue-117789.stderr
@@ -6,11 +6,7 @@ LL | auto trait Trait<P> {}
    |            |
    |            auto trait cannot have generic parameters
    |
-help: remove the parameters
-   |
-LL - auto trait Trait<P> {}
-LL + auto trait Trait {}
-   |
+   = help: remove the parameters
 
 error[E0658]: auto traits are experimental and possibly buggy
   --> $DIR/issue-117789.rs:1:1
diff --git a/tests/ui/auto-traits/issue-84075.stderr b/tests/ui/auto-traits/issue-84075.stderr
@@ -6,11 +6,7 @@ LL | auto trait Magic where Self: Copy {}
    |            |
    |            auto traits cannot have super traits or lifetime bounds
    |
-help: remove the super traits or lifetime bounds
-   |
-LL - auto trait Magic where Self: Copy {}
-LL + auto trait Magic  {}
-   |
+   = help: remove the super traits or lifetime bounds
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/auto-traits/typeck-auto-trait-no-supertraits-2.stderr b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits-2.stderr
@@ -6,11 +6,7 @@ LL | auto trait Magic : Sized where Option<Self> : Magic {}
    |            |
    |            auto traits cannot have super traits or lifetime bounds
    |
-help: remove the super traits or lifetime bounds
-   |
-LL - auto trait Magic : Sized where Option<Self> : Magic {}
-LL + auto trait Magic where Option<Self> : Magic {}
-   |
+   = help: remove the super traits or lifetime bounds
 
 error[E0568]: auto traits cannot have super traits or lifetime bounds
   --> $DIR/typeck-auto-trait-no-supertraits-2.rs:4:26
@@ -20,11 +16,7 @@ LL | auto trait Magic : Sized where Option<Self> : Magic {}
    |            |
    |            auto traits cannot have super traits or lifetime bounds
    |
-help: remove the super traits or lifetime bounds
-   |
-LL - auto trait Magic : Sized where Option<Self> : Magic {}
-LL + auto trait Magic : Sized  {}
-   |
+   = help: remove the super traits or lifetime bounds
 
 error[E0382]: use of moved value: `x`
   --> $DIR/typeck-auto-trait-no-supertraits-2.rs:8:41
diff --git a/tests/ui/auto-traits/typeck-auto-trait-no-supertraits.stderr b/tests/ui/auto-traits/typeck-auto-trait-no-supertraits.stderr
@@ -6,11 +6,7 @@ LL | auto trait Magic: Copy {}
    |            |
    |            auto traits cannot have super traits or lifetime bounds
    |
-help: remove the super traits or lifetime bounds
-   |
-LL - auto trait Magic: Copy {}
-LL + auto trait Magic {}
-   |
+   = help: remove the super traits or lifetime bounds
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/traits/inductive-overflow/supertrait-auto-trait.stderr b/tests/ui/traits/inductive-overflow/supertrait-auto-trait.stderr
@@ -6,11 +6,7 @@ LL | auto trait Magic: Copy {}
    |            |
    |            auto traits cannot have super traits or lifetime bounds
    |
-help: remove the super traits or lifetime bounds
-   |
-LL - auto trait Magic: Copy {}
-LL + auto trait Magic {}
-   |
+   = help: remove the super traits or lifetime bounds
 
 error[E0277]: the trait bound `NoClone: Magic` is not satisfied
   --> $DIR/supertrait-auto-trait.rs:16:23
