Skip to content

Commit 93a77f2

Browse files
committed
[nonminimal_bool]: Deduplicate diagnostics
1 parent 674c641 commit 93a77f2

File tree

4 files changed

+16
-22
lines changed

4 files changed

+16
-22
lines changed

clippy_lints/src/booleans.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,5 @@ impl<'a, 'tcx> Visitor<'tcx> for NotSimplificationVisitor<'a, 'tcx> {
609609
Applicability::MachineApplicable,
610610
);
611611
}
612-
613-
walk_expr(self, expr);
614612
}
615613
}

tests/ui/nonminimal_bool_methods.fixed

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//@compile-flags: -Zdeduplicate-diagnostics=yes
2-
31
#![allow(unused, clippy::diverging_sub_expression, clippy::needless_if)]
42
#![warn(clippy::nonminimal_bool)]
53

tests/ui/nonminimal_bool_methods.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//@compile-flags: -Zdeduplicate-diagnostics=yes
2-
31
#![allow(unused, clippy::diverging_sub_expression, clippy::needless_if)]
42
#![warn(clippy::nonminimal_bool)]
53

tests/ui/nonminimal_bool_methods.stderr

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: this boolean expression can be simplified
2-
--> tests/ui/nonminimal_bool_methods.rs:10:13
2+
--> tests/ui/nonminimal_bool_methods.rs:8:13
33
|
44
LL | let _ = !a.is_some();
55
| ^^^^^^^^^^^^ help: try: `a.is_none()`
@@ -8,91 +8,91 @@ LL | let _ = !a.is_some();
88
= help: to override `-D warnings` add `#[allow(clippy::nonminimal_bool)]`
99

1010
error: this boolean expression can be simplified
11-
--> tests/ui/nonminimal_bool_methods.rs:12:13
11+
--> tests/ui/nonminimal_bool_methods.rs:10:13
1212
|
1313
LL | let _ = !a.is_none();
1414
| ^^^^^^^^^^^^ help: try: `a.is_some()`
1515

1616
error: this boolean expression can be simplified
17-
--> tests/ui/nonminimal_bool_methods.rs:14:13
17+
--> tests/ui/nonminimal_bool_methods.rs:12:13
1818
|
1919
LL | let _ = !b.is_err();
2020
| ^^^^^^^^^^^ help: try: `b.is_ok()`
2121

2222
error: this boolean expression can be simplified
23-
--> tests/ui/nonminimal_bool_methods.rs:16:13
23+
--> tests/ui/nonminimal_bool_methods.rs:14:13
2424
|
2525
LL | let _ = !b.is_ok();
2626
| ^^^^^^^^^^ help: try: `b.is_err()`
2727

2828
error: this boolean expression can be simplified
29-
--> tests/ui/nonminimal_bool_methods.rs:18:13
29+
--> tests/ui/nonminimal_bool_methods.rs:16:13
3030
|
3131
LL | let _ = !(a.is_some() && !c);
3232
| ^^^^^^^^^^^^^^^^^^^^ help: try: `a.is_none() || c`
3333

3434
error: this boolean expression can be simplified
35-
--> tests/ui/nonminimal_bool_methods.rs:19:13
35+
--> tests/ui/nonminimal_bool_methods.rs:17:13
3636
|
3737
LL | let _ = !(a.is_some() || !c);
3838
| ^^^^^^^^^^^^^^^^^^^^ help: try: `a.is_none() && c`
3939

4040
error: this boolean expression can be simplified
41-
--> tests/ui/nonminimal_bool_methods.rs:20:26
41+
--> tests/ui/nonminimal_bool_methods.rs:18:26
4242
|
4343
LL | let _ = !(!c ^ c) || !a.is_some();
4444
| ^^^^^^^^^^^^ help: try: `a.is_none()`
4545

4646
error: this boolean expression can be simplified
47-
--> tests/ui/nonminimal_bool_methods.rs:21:25
47+
--> tests/ui/nonminimal_bool_methods.rs:19:25
4848
|
4949
LL | let _ = (!c ^ c) || !a.is_some();
5050
| ^^^^^^^^^^^^ help: try: `a.is_none()`
5151

5252
error: this boolean expression can be simplified
53-
--> tests/ui/nonminimal_bool_methods.rs:22:23
53+
--> tests/ui/nonminimal_bool_methods.rs:20:23
5454
|
5555
LL | let _ = !c ^ c || !a.is_some();
5656
| ^^^^^^^^^^^^ help: try: `a.is_none()`
5757

5858
error: this boolean expression can be simplified
59-
--> tests/ui/nonminimal_bool_methods.rs:94:8
59+
--> tests/ui/nonminimal_bool_methods.rs:92:8
6060
|
6161
LL | if !res.is_ok() {}
6262
| ^^^^^^^^^^^^ help: try: `res.is_err()`
6363

6464
error: this boolean expression can be simplified
65-
--> tests/ui/nonminimal_bool_methods.rs:95:8
65+
--> tests/ui/nonminimal_bool_methods.rs:93:8
6666
|
6767
LL | if !res.is_err() {}
6868
| ^^^^^^^^^^^^^ help: try: `res.is_ok()`
6969

7070
error: this boolean expression can be simplified
71-
--> tests/ui/nonminimal_bool_methods.rs:98:8
71+
--> tests/ui/nonminimal_bool_methods.rs:96:8
7272
|
7373
LL | if !res.is_some() {}
7474
| ^^^^^^^^^^^^^^ help: try: `res.is_none()`
7575

7676
error: this boolean expression can be simplified
77-
--> tests/ui/nonminimal_bool_methods.rs:99:8
77+
--> tests/ui/nonminimal_bool_methods.rs:97:8
7878
|
7979
LL | if !res.is_none() {}
8080
| ^^^^^^^^^^^^^^ help: try: `res.is_some()`
8181

8282
error: this boolean expression can be simplified
83-
--> tests/ui/nonminimal_bool_methods.rs:115:8
83+
--> tests/ui/nonminimal_bool_methods.rs:113:8
8484
|
8585
LL | if !(a as u64 >= b) {}
8686
| ^^^^^^^^^^^^^^^^ help: try: `(a as u64) < b`
8787

8888
error: this boolean expression can be simplified
89-
--> tests/ui/nonminimal_bool_methods.rs:116:8
89+
--> tests/ui/nonminimal_bool_methods.rs:114:8
9090
|
9191
LL | if !((a as u64) >= b) {}
9292
| ^^^^^^^^^^^^^^^^^^ help: try: `(a as u64) < b`
9393

9494
error: this boolean expression can be simplified
95-
--> tests/ui/nonminimal_bool_methods.rs:117:8
95+
--> tests/ui/nonminimal_bool_methods.rs:115:8
9696
|
9797
LL | if !(a as u64 <= b) {}
9898
| ^^^^^^^^^^^^^^^^ help: try: `a as u64 > b`

0 commit comments

Comments
 (0)