Skip to content

Commit ecd98ba

Browse files
committed
Bless tests.
1 parent f7d59b2 commit ecd98ba

File tree

2 files changed

+77
-25
lines changed

2 files changed

+77
-25
lines changed

tests/ui/manual_assert.edition2018.fixed

+11-24
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ fn main() {
2929
panic!("qaqaq{:?}", a);
3030
}
3131
assert!(a.is_empty(), "qaqaq{:?}", a);
32-
if !a.is_empty() {
33-
panic!("qwqwq");
34-
}
32+
assert!(a.is_empty(), "qwqwq");
3533
if a.len() == 3 {
3634
println!("qwq");
3735
println!("qwq");
@@ -46,21 +44,11 @@ fn main() {
4644
println!("qwq");
4745
}
4846
let b = vec![1, 2, 3];
49-
if b.is_empty() {
50-
panic!("panic1");
51-
}
52-
if b.is_empty() && a.is_empty() {
53-
panic!("panic2");
54-
}
55-
if a.is_empty() && !b.is_empty() {
56-
panic!("panic3");
57-
}
58-
if b.is_empty() || a.is_empty() {
59-
panic!("panic4");
60-
}
61-
if a.is_empty() || !b.is_empty() {
62-
panic!("panic5");
63-
}
47+
assert!(!b.is_empty(), "panic1");
48+
assert!(!(b.is_empty() && a.is_empty()), "panic2");
49+
assert!(!(a.is_empty() && !b.is_empty()), "panic3");
50+
assert!(!(b.is_empty() || a.is_empty()), "panic4");
51+
assert!(!(a.is_empty() || !b.is_empty()), "panic5");
6452
assert!(!a.is_empty(), "with expansion {}", one!());
6553
if a.is_empty() {
6654
let _ = 0;
@@ -71,12 +59,11 @@ fn main() {
7159

7260
fn issue7730(a: u8) {
7361
// Suggestion should preserve comment
74-
if a > 2 {
75-
// comment
76-
/* this is a
62+
// comment
63+
/* this is a
7764
multiline
7865
comment */
79-
/// Doc comment
80-
panic!("panic with comment") // comment after `panic!`
81-
}
66+
/// Doc comment
67+
// comment after `panic!`
68+
assert!(!(a > 2), "panic with comment");
8269
}

tests/ui/manual_assert.edition2018.stderr

+66-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,54 @@ LL | | }
88
|
99
= note: `-D clippy::manual-assert` implied by `-D warnings`
1010

11+
error: only a `panic!` in `if`-then statement
12+
--> $DIR/manual_assert.rs:34:5
13+
|
14+
LL | / if !a.is_empty() {
15+
LL | | panic!("qwqwq");
16+
LL | | }
17+
| |_____^ help: try instead: `assert!(a.is_empty(), "qwqwq");`
18+
19+
error: only a `panic!` in `if`-then statement
20+
--> $DIR/manual_assert.rs:51:5
21+
|
22+
LL | / if b.is_empty() {
23+
LL | | panic!("panic1");
24+
LL | | }
25+
| |_____^ help: try instead: `assert!(!b.is_empty(), "panic1");`
26+
27+
error: only a `panic!` in `if`-then statement
28+
--> $DIR/manual_assert.rs:54:5
29+
|
30+
LL | / if b.is_empty() && a.is_empty() {
31+
LL | | panic!("panic2");
32+
LL | | }
33+
| |_____^ help: try instead: `assert!(!(b.is_empty() && a.is_empty()), "panic2");`
34+
35+
error: only a `panic!` in `if`-then statement
36+
--> $DIR/manual_assert.rs:57:5
37+
|
38+
LL | / if a.is_empty() && !b.is_empty() {
39+
LL | | panic!("panic3");
40+
LL | | }
41+
| |_____^ help: try instead: `assert!(!(a.is_empty() && !b.is_empty()), "panic3");`
42+
43+
error: only a `panic!` in `if`-then statement
44+
--> $DIR/manual_assert.rs:60:5
45+
|
46+
LL | / if b.is_empty() || a.is_empty() {
47+
LL | | panic!("panic4");
48+
LL | | }
49+
| |_____^ help: try instead: `assert!(!(b.is_empty() || a.is_empty()), "panic4");`
50+
51+
error: only a `panic!` in `if`-then statement
52+
--> $DIR/manual_assert.rs:63:5
53+
|
54+
LL | / if a.is_empty() || !b.is_empty() {
55+
LL | | panic!("panic5");
56+
LL | | }
57+
| |_____^ help: try instead: `assert!(!(a.is_empty() || !b.is_empty()), "panic5");`
58+
1159
error: only a `panic!` in `if`-then statement
1260
--> $DIR/manual_assert.rs:66:5
1361
|
@@ -16,5 +64,22 @@ LL | | panic!("with expansion {}", one!())
1664
LL | | }
1765
| |_____^ help: try instead: `assert!(!a.is_empty(), "with expansion {}", one!());`
1866

19-
error: aborting due to 2 previous errors
67+
error: only a `panic!` in `if`-then statement
68+
--> $DIR/manual_assert.rs:78:5
69+
|
70+
LL | / if a > 2 {
71+
LL | | // comment
72+
LL | | /* this is a
73+
LL | | multiline
74+
... |
75+
LL | | panic!("panic with comment") // comment after `panic!`
76+
LL | | }
77+
| |_____^
78+
|
79+
help: try instead
80+
|
81+
LL | assert!(!(a > 2), "panic with comment");
82+
|
83+
84+
error: aborting due to 9 previous errors
2085

0 commit comments

Comments
 (0)