fix rebase

Author: estebank

tests/ui/never_type/unused_trait_in_never_pattern_body.stderr

@@ -18,10 +18,18 @@ LL | |
 LL | |             use std::ops::Add;
 LL | |             0.add(1)
 LL | |         },
-   | |         ^
-   | |         |
-   | |_________this will never be executed
-   |           help: remove this expression
+   | |_________^ 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 +         !,
+   |
 
 error: mismatched types
   --> $DIR/unused_trait_in_never_pattern_body.rs:3:9