fix tests

kraktus · kraktus · commit 3ab02aa35965 · 2022-10-02T15:25:50.000+02:00
diff --git a/tests/ui/manual_assert.edition2018.fixed b/tests/ui/manual_assert.edition2018.fixed
@@ -4,8 +4,7 @@
 // run-rustfix
 
 #![warn(clippy::manual_assert)]
-#![allow(clippy::nonminimal_bool)]
-#![allow(dead_code)]
+#![allow(dead_code, unused_doc_comments, clippy::nonminimal_bool)]
 
 macro_rules! one {
     () => {
@@ -52,13 +51,13 @@ fn main() {
     assert!(!a.is_empty(), "with expansion {}", one!());
 }
 
-fn issue7730() {
+fn issue7730(a: u8) {
     // Suggestion should preserve comment
     // comment
 /* this is a
         multiline
         comment */
 /// Doc comment
 // comment after `panic!`
-assert!(!true, "panic with comment");
+assert!(!(a > 2), "panic with comment");
 }
diff --git a/tests/ui/manual_assert.edition2018.stderr b/tests/ui/manual_assert.edition2018.stderr
@@ -1,5 +1,5 @@
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:31:5
+  --> $DIR/manual_assert.rs:30:5
    |
 LL | /     if !a.is_empty() {
 LL | |         panic!("qaqaq{:?}", a);
@@ -13,7 +13,7 @@ LL |     assert!(a.is_empty(), "qaqaq{:?}", a);
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:34:5
+  --> $DIR/manual_assert.rs:33:5
    |
 LL | /     if !a.is_empty() {
 LL | |         panic!("qwqwq");
@@ -26,7 +26,7 @@ LL |     assert!(a.is_empty(), "qwqwq");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:51:5
+  --> $DIR/manual_assert.rs:50:5
    |
 LL | /     if b.is_empty() {
 LL | |         panic!("panic1");
@@ -39,7 +39,7 @@ LL |     assert!(!b.is_empty(), "panic1");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:54:5
+  --> $DIR/manual_assert.rs:53:5
    |
 LL | /     if b.is_empty() && a.is_empty() {
 LL | |         panic!("panic2");
@@ -52,7 +52,7 @@ LL |     assert!(!(b.is_empty() && a.is_empty()), "panic2");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:57:5
+  --> $DIR/manual_assert.rs:56:5
    |
 LL | /     if a.is_empty() && !b.is_empty() {
 LL | |         panic!("panic3");
@@ -65,7 +65,7 @@ LL |     assert!(!(a.is_empty() && !b.is_empty()), "panic3");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:60:5
+  --> $DIR/manual_assert.rs:59:5
    |
 LL | /     if b.is_empty() || a.is_empty() {
 LL | |         panic!("panic4");
@@ -78,7 +78,7 @@ LL |     assert!(!(b.is_empty() || a.is_empty()), "panic4");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:63:5
+  --> $DIR/manual_assert.rs:62:5
    |
 LL | /     if a.is_empty() || !b.is_empty() {
 LL | |         panic!("panic5");
@@ -91,7 +91,7 @@ LL |     assert!(!(a.is_empty() || !b.is_empty()), "panic5");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:66:5
+  --> $DIR/manual_assert.rs:65:5
    |
 LL | /     if a.is_empty() {
 LL | |         panic!("with expansion {}", one!())
@@ -104,9 +104,9 @@ LL |     assert!(!a.is_empty(), "with expansion {}", one!());
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:73:5
+  --> $DIR/manual_assert.rs:72:5
    |
-LL | /     if true {
+LL | /     if a > 2 {
 LL | |         // comment
 LL | |         /* this is a
 LL | |         multiline
@@ -117,7 +117,7 @@ LL | |     }
    |
 help: try instead
    |
-LL |     assert!(!true, "panic with comment");
+LL |     assert!(!(a > 2), "panic with comment");
    |
 
 error: aborting due to 9 previous errors
diff --git a/tests/ui/manual_assert.edition2021.fixed b/tests/ui/manual_assert.edition2021.fixed
@@ -4,8 +4,7 @@
 // run-rustfix
 
 #![warn(clippy::manual_assert)]
-#![allow(clippy::nonminimal_bool)]
-#![allow(dead_code)]
+#![allow(dead_code, unused_doc_comments, clippy::nonminimal_bool)]
 
 macro_rules! one {
     () => {
@@ -52,13 +51,13 @@ fn main() {
     assert!(!a.is_empty(), "with expansion {}", one!());
 }
 
-fn issue7730() {
+fn issue7730(a: u8) {
     // Suggestion should preserve comment
     // comment
 /* this is a
         multiline
         comment */
 /// Doc comment
 // comment after `panic!`
-assert!(!true, "panic with comment");
+assert!(!(a > 2), "panic with comment");
 }
diff --git a/tests/ui/manual_assert.edition2021.stderr b/tests/ui/manual_assert.edition2021.stderr
@@ -1,5 +1,5 @@
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:31:5
+  --> $DIR/manual_assert.rs:30:5
    |
 LL | /     if !a.is_empty() {
 LL | |         panic!("qaqaq{:?}", a);
@@ -13,7 +13,7 @@ LL |     assert!(a.is_empty(), "qaqaq{:?}", a);
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:34:5
+  --> $DIR/manual_assert.rs:33:5
    |
 LL | /     if !a.is_empty() {
 LL | |         panic!("qwqwq");
@@ -26,7 +26,7 @@ LL |     assert!(a.is_empty(), "qwqwq");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:51:5
+  --> $DIR/manual_assert.rs:50:5
    |
 LL | /     if b.is_empty() {
 LL | |         panic!("panic1");
@@ -39,7 +39,7 @@ LL |     assert!(!b.is_empty(), "panic1");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:54:5
+  --> $DIR/manual_assert.rs:53:5
    |
 LL | /     if b.is_empty() && a.is_empty() {
 LL | |         panic!("panic2");
@@ -52,7 +52,7 @@ LL |     assert!(!(b.is_empty() && a.is_empty()), "panic2");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:57:5
+  --> $DIR/manual_assert.rs:56:5
    |
 LL | /     if a.is_empty() && !b.is_empty() {
 LL | |         panic!("panic3");
@@ -65,7 +65,7 @@ LL |     assert!(!(a.is_empty() && !b.is_empty()), "panic3");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:60:5
+  --> $DIR/manual_assert.rs:59:5
    |
 LL | /     if b.is_empty() || a.is_empty() {
 LL | |         panic!("panic4");
@@ -78,7 +78,7 @@ LL |     assert!(!(b.is_empty() || a.is_empty()), "panic4");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:63:5
+  --> $DIR/manual_assert.rs:62:5
    |
 LL | /     if a.is_empty() || !b.is_empty() {
 LL | |         panic!("panic5");
@@ -91,7 +91,7 @@ LL |     assert!(!(a.is_empty() || !b.is_empty()), "panic5");
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:66:5
+  --> $DIR/manual_assert.rs:65:5
    |
 LL | /     if a.is_empty() {
 LL | |         panic!("with expansion {}", one!())
@@ -104,9 +104,9 @@ LL |     assert!(!a.is_empty(), "with expansion {}", one!());
    |
 
 error: only a `panic!` in `if`-then statement
-  --> $DIR/manual_assert.rs:73:5
+  --> $DIR/manual_assert.rs:72:5
    |
-LL | /     if true {
+LL | /     if a > 2 {
 LL | |         // comment
 LL | |         /* this is a
 LL | |         multiline
@@ -117,7 +117,7 @@ LL | |     }
    |
 help: try instead
    |
-LL |     assert!(!true, "panic with comment");
+LL |     assert!(!(a > 2), "panic with comment");
    |
 
 error: aborting due to 9 previous errors
diff --git a/tests/ui/manual_assert.rs b/tests/ui/manual_assert.rs
@@ -4,8 +4,7 @@
 // run-rustfix
 
 #![warn(clippy::manual_assert)]
-#![allow(clippy::nonminimal_bool)]
-#![allow(dead_code)]
+#![allow(dead_code, unused_doc_comments, clippy::nonminimal_bool)]
 
 macro_rules! one {
     () => {
@@ -68,9 +67,9 @@ fn main() {
     }
 }
 
-fn issue7730() {
+fn issue7730(a: u8) {
     // Suggestion should preserve comment
-    if true {
+    if a > 2 {
         // comment
         /* this is a
         multiline

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error: only a `panic!` in `if`-then statement
`2`		`- --> $DIR/manual_assert.rs:31:5`
	`2`	`+ --> $DIR/manual_assert.rs:30:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| / if !a.is_empty() {`
`5`	`5`	`LL \| \| panic!("qaqaq{:?}", a);`
`@@ -13,7 +13,7 @@ LL \| assert!(a.is_empty(), "qaqaq{:?}", a);`
`13`	`13`	`\|`
`14`	`14`
`15`	`15`	error: only a `panic!` in `if`-then statement
`16`		`- --> $DIR/manual_assert.rs:34:5`
	`16`	`+ --> $DIR/manual_assert.rs:33:5`
`17`	`17`	`\|`
`18`	`18`	`LL \| / if !a.is_empty() {`
`19`	`19`	`LL \| \| panic!("qwqwq");`
`@@ -26,7 +26,7 @@ LL \| assert!(a.is_empty(), "qwqwq");`
`26`	`26`	`\|`
`27`	`27`
`28`	`28`	error: only a `panic!` in `if`-then statement
`29`		`- --> $DIR/manual_assert.rs:51:5`
	`29`	`+ --> $DIR/manual_assert.rs:50:5`
`30`	`30`	`\|`
`31`	`31`	`LL \| / if b.is_empty() {`
`32`	`32`	`LL \| \| panic!("panic1");`
`@@ -39,7 +39,7 @@ LL \| assert!(!b.is_empty(), "panic1");`
`39`	`39`	`\|`
`40`	`40`
`41`	`41`	error: only a `panic!` in `if`-then statement
`42`		`- --> $DIR/manual_assert.rs:54:5`
	`42`	`+ --> $DIR/manual_assert.rs:53:5`
`43`	`43`	`\|`
`44`	`44`	`LL \| / if b.is_empty() && a.is_empty() {`
`45`	`45`	`LL \| \| panic!("panic2");`
`@@ -52,7 +52,7 @@ LL \| assert!(!(b.is_empty() && a.is_empty()), "panic2");`
`52`	`52`	`\|`
`53`	`53`
`54`	`54`	error: only a `panic!` in `if`-then statement
`55`		`- --> $DIR/manual_assert.rs:57:5`
	`55`	`+ --> $DIR/manual_assert.rs:56:5`
`56`	`56`	`\|`
`57`	`57`	`LL \| / if a.is_empty() && !b.is_empty() {`
`58`	`58`	`LL \| \| panic!("panic3");`
`@@ -65,7 +65,7 @@ LL \| assert!(!(a.is_empty() && !b.is_empty()), "panic3");`
`65`	`65`	`\|`
`66`	`66`
`67`	`67`	error: only a `panic!` in `if`-then statement
`68`		`- --> $DIR/manual_assert.rs:60:5`
	`68`	`+ --> $DIR/manual_assert.rs:59:5`
`69`	`69`	`\|`
`70`	`70`	`LL \| / if b.is_empty() \|\| a.is_empty() {`
`71`	`71`	`LL \| \| panic!("panic4");`
`@@ -78,7 +78,7 @@ LL \| assert!(!(b.is_empty() \|\| a.is_empty()), "panic4");`
`78`	`78`	`\|`
`79`	`79`
`80`	`80`	error: only a `panic!` in `if`-then statement
`81`		`- --> $DIR/manual_assert.rs:63:5`
	`81`	`+ --> $DIR/manual_assert.rs:62:5`
`82`	`82`	`\|`
`83`	`83`	`LL \| / if a.is_empty() \|\| !b.is_empty() {`
`84`	`84`	`LL \| \| panic!("panic5");`
`@@ -91,7 +91,7 @@ LL \| assert!(!(a.is_empty() \|\| !b.is_empty()), "panic5");`
`91`	`91`	`\|`
`92`	`92`
`93`	`93`	error: only a `panic!` in `if`-then statement
`94`		`- --> $DIR/manual_assert.rs:66:5`
	`94`	`+ --> $DIR/manual_assert.rs:65:5`
`95`	`95`	`\|`
`96`	`96`	`LL \| / if a.is_empty() {`
`97`	`97`	`LL \| \| panic!("with expansion {}", one!())`
`@@ -104,9 +104,9 @@ LL \| assert!(!a.is_empty(), "with expansion {}", one!());`
`104`	`104`	`\|`
`105`	`105`
`106`	`106`	error: only a `panic!` in `if`-then statement
`107`		`- --> $DIR/manual_assert.rs:73:5`
	`107`	`+ --> $DIR/manual_assert.rs:72:5`
`108`	`108`	`\|`
`109`		`-LL \| / if true {`
	`109`	`+LL \| / if a > 2 {`
`110`	`110`	`LL \| \| // comment`
`111`	`111`	`LL \| \| /* this is a`
`112`	`112`	`LL \| \| multiline`
`@@ -117,7 +117,7 @@ LL \| \| }`
`117`	`117`	`\|`
`118`	`118`	`help: try instead`
`119`	`119`	`\|`
`120`		`-LL \| assert!(!true, "panic with comment");`
	`120`	`+LL \| assert!(!(a > 2), "panic with comment");`
`121`	`121`	`\|`
`122`	`122`
`123`	`123`	`error: aborting due to 9 previous errors`