Make never pattern suggestions hidden

Author: estebank

compiler/rustc_ast_lowering/src/errors.rs

@@ -346,7 +346,7 @@ pub(crate) struct NeverPatternWithBody {
     #[primary_span]
     #[label]
     pub span: Span,
-    #[suggestion(code = ",", applicability = "maybe-incorrect", style = "verbose")]
+    #[suggestion(code = ",", applicability = "maybe-incorrect", style = "hidden")]
     pub removal_span: Span,
 }
 
@@ -355,7 +355,7 @@ pub(crate) struct NeverPatternWithBody {
 pub(crate) struct NeverPatternWithGuard {
     #[primary_span]
     pub span: Span,
-    #[suggestion(code = ",", applicability = "maybe-incorrect", style = "verbose")]
+    #[suggestion(code = ",", applicability = "maybe-incorrect", style = "hidden")]
     pub removal_span: Span,
 }
 

tests/ui/feature-gates/feature-gate-never_patterns.stderr

@@ -135,11 +135,7 @@ error: a guard on a never pattern will never be run
 LL |         Err(!) if false,
    |                   ^^^^^
    |
-help: remove the match arm guard
-   |
-LL -         Err(!) if false,
-LL +         Err(!),
-   |
+   = help: remove the match arm guard
 
 error: aborting due to 13 previous errors
 

tests/ui/never_type/unused_trait_in_never_pattern_body.stderr

@@ -20,16 +20,7 @@ LL | |             0.add(1)
 LL | |         },
    | |_________^ this will never be executed
    |
-help: remove the match arm expression
-   |
-LL -         ! => || {
-LL -
-LL -
-LL -             use std::ops::Add;
-LL -             0.add(1)
-LL -         },
-LL +         !,
-   |
+   = help: remove the match arm expression
 
 error: mismatched types
   --> $DIR/unused_trait_in_never_pattern_body.rs:3:9

tests/ui/rfcs/rfc-0000-never_patterns/ICE-119271-never-arm-attr-in-guard.stderr

@@ -24,14 +24,7 @@ error: a guard on a never pattern will never be run
 LL |             false
    |             ^^^^^
    |
-help: remove the match arm guard
-   |
-LL -         Some(!)
-LL -
-LL -             if #[deny(unused_mut)]
-LL -             false
-LL +         Some(!),
-   |
+   = help: remove the match arm guard
 
 error: mismatched types
   --> $DIR/ICE-119271-never-arm-attr-in-guard.rs:5:14

tests/ui/rfcs/rfc-0000-never_patterns/ICE-130779-never-arm-no-oatherwise-block-fix.fixed

@@ -0,0 +1,13 @@
+//@ run-rustfix
+#![feature(never_patterns)]
+#![allow(incomplete_features, dead_code, unreachable_patterns)]
+
+enum Void {}
+
+fn foo(v: Void) {
+    match v {
+        ! , //~ ERROR: a never pattern is always unreachable
+    }
+}
+
+fn main() {}

tests/ui/rfcs/rfc-0000-never_patterns/ICE-130779-never-arm-no-oatherwise-block-fix.rs

@@ -0,0 +1,14 @@
+//@ run-rustfix
+#![feature(never_patterns)]
+#![allow(incomplete_features, dead_code, unreachable_patterns)]
+
+enum Void {}
+
+fn foo(v: Void) {
+    match v {
+        ! | //~ ERROR: a trailing `|` is not allowed in an or-pattern
+        if true => {} //~ ERROR: a never pattern is always unreachable
+    }
+}
+
+fn main() {}

tests/ui/rfcs/rfc-0000-never_patterns/ICE-130779-never-arm-no-oatherwise-block-fix.stderr

@@ -0,0 +1,24 @@
+error: a trailing `|` is not allowed in an or-pattern
+  --> $DIR/ICE-130779-never-arm-no-oatherwise-block-fix.rs:9:11
+   |
+LL |         ! |
+   |         - ^
+   |         |
+   |         while parsing this or-pattern starting here
+   |
+help: remove the `|`
+   |
+LL -         ! |
+LL +         !
+   |
+
+error: a never pattern is always unreachable
+  --> $DIR/ICE-130779-never-arm-no-oatherwise-block-fix.rs:10:20
+   |
+LL |         if true => {}
+   |                    ^^ this will never be executed
+   |
+   = help: remove the match arm expression
+
+error: aborting due to 2 previous errors
+

tests/ui/rfcs/rfc-0000-never_patterns/ICE-130779-never-arm-no-oatherwise-block.stderr

@@ -18,13 +18,7 @@ error: a never pattern is always unreachable
 LL |         if true => {}
    |                    ^^ this will never be executed
    |
-help: remove the match arm expression
-   |
-LL -         ! |
-LL -
-LL -         if true => {}
-LL +         ! |,
-   |
+   = help: remove the match arm expression
 
 error: mismatched types
   --> $DIR/ICE-130779-never-arm-no-oatherwise-block.rs:8:9

tests/ui/rfcs/rfc-0000-never_patterns/ICE-133063-never-arm-no-otherwise-block.fixed

@@ -0,0 +1,17 @@
+//@ run-rustfix
+#![feature(never_type)]
+#![feature(never_patterns)]
+#![allow(incomplete_features, dead_code, unreachable_patterns, unused_parens)]
+
+enum Void {}
+
+fn foo(x: Void) {
+    loop {
+        match x {
+            (!|!), //~ ERROR a never pattern is always unreachable
+            _ => {}
+        }
+    }
+}
+
+fn main() {}

tests/ui/rfcs/rfc-0000-never_patterns/ICE-133063-never-arm-no-otherwise-block.rs

@@ -1,6 +1,7 @@
+//@ run-rustfix
 #![feature(never_type)]
 #![feature(never_patterns)]
-#![allow(incomplete_features)]
+#![allow(incomplete_features, dead_code, unreachable_patterns, unused_parens)]
 
 enum Void {}