Fixup clippy tests

- Don't depend on the fact that `!` falls back to `()` and so panic-ish things can be used in `-> impl ImplementedForUnit` functions - Remove `;` after `unimplemented!()` calls (not necessarily an issue, but there are plans to restrict this in future editions)
rust-lang · May 21, 2024 · cedada8 · cedada8
1 parent 7c91091
commit cedada8
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 41 deletions.
diff --git a/src/tools/clippy/tests/ui/new_ret_no_self.rs b/src/tools/clippy/tests/ui/new_ret_no_self.rs
@@ -73,7 +73,7 @@ struct T;
 impl T {
     // should not trigger lint
     pub fn new() -> Self {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -83,7 +83,7 @@ impl U {
     // should trigger lint
     pub fn new() -> u32 {
         //~^ ERROR: methods called `new` usually return `Self`
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -93,7 +93,7 @@ impl V {
     // should trigger lint
     pub fn new(_: String) -> u32 {
         //~^ ERROR: methods called `new` usually return `Self`
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -102,7 +102,7 @@ struct TupleReturnerOk;
 impl TupleReturnerOk {
     // should not trigger lint
     pub fn new() -> (Self, u32) {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -111,7 +111,7 @@ struct TupleReturnerOk2;
 impl TupleReturnerOk2 {
     // should not trigger lint (it doesn't matter which element in the tuple is Self)
     pub fn new() -> (u32, Self) {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -120,7 +120,7 @@ struct TupleReturnerOk3;
 impl TupleReturnerOk3 {
     // should not trigger lint (tuple can contain multiple Self)
     pub fn new() -> (Self, Self) {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -130,7 +130,7 @@ impl TupleReturnerBad {
     // should trigger lint
     pub fn new() -> (u32, u32) {
         //~^ ERROR: methods called `new` usually return `Self`
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -139,7 +139,7 @@ struct MutPointerReturnerOk;
 impl MutPointerReturnerOk {
     // should not trigger lint
     pub fn new() -> *mut Self {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -148,7 +148,7 @@ struct ConstPointerReturnerOk2;
 impl ConstPointerReturnerOk2 {
     // should not trigger lint
     pub fn new() -> *const Self {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -158,7 +158,7 @@ impl MutPointerReturnerBad {
     // should trigger lint
     pub fn new() -> *mut V {
         //~^ ERROR: methods called `new` usually return `Self`
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -167,7 +167,7 @@ struct GenericReturnerOk;
 impl GenericReturnerOk {
     // should not trigger lint
     pub fn new() -> Option<Self> {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -177,7 +177,7 @@ impl GenericReturnerBad {
     // should trigger lint
     pub fn new() -> Option<u32> {
         //~^ ERROR: methods called `new` usually return `Self`
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -186,7 +186,7 @@ struct NestedReturnerOk;
 impl NestedReturnerOk {
     // should not trigger lint
     pub fn new() -> (Option<Self>, u32) {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -195,7 +195,7 @@ struct NestedReturnerOk2;
 impl NestedReturnerOk2 {
     // should not trigger lint
     pub fn new() -> ((Self, u32), u32) {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -204,7 +204,7 @@ struct NestedReturnerOk3;
 impl NestedReturnerOk3 {
     // should not trigger lint
     pub fn new() -> Option<(Self, u32)> {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -215,7 +215,7 @@ struct WithLifetime<'a> {
 impl<'a> WithLifetime<'a> {
     // should not trigger the lint, because the lifetimes are different
     pub fn new<'b: 'a>(s: &'b str) -> WithLifetime<'b> {
-        unimplemented!();
+        unimplemented!()
     }
 }
 
@@ -236,7 +236,7 @@ mod issue5435 {
     impl TraitRet for StructRet {
         // should not trigger lint as we are in the impl block
         fn new() -> String {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -252,7 +252,7 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -262,7 +262,7 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -272,15 +272,15 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
     trait TupleReturnerBad {
         // should trigger lint
         fn new() -> (u32, u32) {
             //~^ ERROR: methods called `new` usually return `Self`
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -290,7 +290,7 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -300,15 +300,15 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
     trait MutPointerReturnerBad {
         // should trigger lint
         fn new() -> *mut V {
             //~^ ERROR: methods called `new` usually return `Self`
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -318,7 +318,7 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -328,7 +328,7 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -338,7 +338,7 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 
@@ -348,7 +348,7 @@ mod issue5435 {
         where
             Self: Sized,
         {
-            unimplemented!();
+            unimplemented!()
         }
     }
 }
@@ -390,9 +390,7 @@ mod issue7344 {
 
     impl<T> RetImplTraitSelf2<T> {
         // should not trigger lint
-        fn new(t: T) -> impl Trait2<(), Self> {
-            unimplemented!()
-        }
+        fn new(t: T) -> impl Trait2<(), Self> {}
     }
 
     struct RetImplTraitNoSelf2<T>(T);
@@ -401,7 +399,6 @@ mod issue7344 {
         // should trigger lint
         fn new(t: T) -> impl Trait2<(), i32> {
             //~^ ERROR: methods called `new` usually return `Self`
-            unimplemented!()
         }
     }
 

diff --git a/src/tools/clippy/tests/ui/new_ret_no_self.stderr b/src/tools/clippy/tests/ui/new_ret_no_self.stderr
@@ -16,7 +16,7 @@ error: methods called `new` usually return `Self`
    |
 LL | /     pub fn new() -> u32 {
 LL | |
-LL | |         unimplemented!();
+LL | |         unimplemented!()
 LL | |     }
    | |_____^
 
@@ -25,7 +25,7 @@ error: methods called `new` usually return `Self`
    |
 LL | /     pub fn new(_: String) -> u32 {
 LL | |
-LL | |         unimplemented!();
+LL | |         unimplemented!()
 LL | |     }
    | |_____^
 
@@ -34,7 +34,7 @@ error: methods called `new` usually return `Self`
    |
 LL | /     pub fn new() -> (u32, u32) {
 LL | |
-LL | |         unimplemented!();
+LL | |         unimplemented!()
 LL | |     }
    | |_____^
 
@@ -43,7 +43,7 @@ error: methods called `new` usually return `Self`
    |
 LL | /     pub fn new() -> *mut V {
 LL | |
-LL | |         unimplemented!();
+LL | |         unimplemented!()
 LL | |     }
    | |_____^
 
@@ -52,7 +52,7 @@ error: methods called `new` usually return `Self`
    |
 LL | /     pub fn new() -> Option<u32> {
 LL | |
-LL | |         unimplemented!();
+LL | |         unimplemented!()
 LL | |     }
    | |_____^
 
@@ -73,7 +73,7 @@ error: methods called `new` usually return `Self`
    |
 LL | /         fn new() -> (u32, u32) {
 LL | |
-LL | |             unimplemented!();
+LL | |             unimplemented!()
 LL | |         }
    | |_________^
 
@@ -82,7 +82,7 @@ error: methods called `new` usually return `Self`
    |
 LL | /         fn new() -> *mut V {
 LL | |
-LL | |             unimplemented!();
+LL | |             unimplemented!()
 LL | |         }
    | |_________^
 
@@ -96,11 +96,10 @@ LL | |         }
    | |_________^
 
 error: methods called `new` usually return `Self`
-  --> tests/ui/new_ret_no_self.rs:402:9
+  --> tests/ui/new_ret_no_self.rs:400:9
    |
 LL | /         fn new(t: T) -> impl Trait2<(), i32> {
 LL | |
-LL | |             unimplemented!()
 LL | |         }
    | |_________^