Skip to content

Remove double expr lint #12401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2024
Merged

Remove double expr lint #12401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions clippy_lints/src/booleans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ impl<'tcx> LateLintPass<'tcx> for NonminimalBool {

fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
match expr.kind {
ExprKind::Unary(UnOp::Not, sub) => check_inverted_condition(cx, expr.span, sub),
// This check the case where an element in a boolean comparison is inverted, like:
//
// ```
Expand Down Expand Up @@ -119,27 +118,6 @@ fn bin_op_eq_str(op: BinOpKind) -> Option<&'static str> {
}
}

fn check_inverted_condition(cx: &LateContext<'_>, expr_span: Span, sub_expr: &Expr<'_>) {
if !expr_span.from_expansion()
&& let ExprKind::Binary(op, left, right) = sub_expr.kind
&& let Some(left) = snippet_opt(cx, left.span)
&& let Some(right) = snippet_opt(cx, right.span)
{
let Some(op) = inverted_bin_op_eq_str(op.node) else {
return;
};
span_lint_and_sugg(
cx,
NONMINIMAL_BOOL,
expr_span,
"this boolean expression can be simplified",
"try",
format!("{left} {op} {right}",),
Applicability::MachineApplicable,
);
}
}

fn check_inverted_bool_in_condition(
cx: &LateContext<'_>,
expr_span: Span,
Expand Down
1 change: 0 additions & 1 deletion tests/ui/nonminimal_bool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@no-rustfix: overlapping suggestions
//@compile-flags: -Zdeduplicate-diagnostics=yes

#![feature(lint_reasons)]
#![allow(
Expand Down
58 changes: 29 additions & 29 deletions tests/ui/nonminimal_bool.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:20:13
--> tests/ui/nonminimal_bool.rs:19:13
|
LL | let _ = !true;
| ^^^^^ help: try: `false`
Expand All @@ -8,43 +8,43 @@ LL | let _ = !true;
= help: to override `-D warnings` add `#[allow(clippy::nonminimal_bool)]`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:23:13
--> tests/ui/nonminimal_bool.rs:22:13
|
LL | let _ = !false;
| ^^^^^^ help: try: `true`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:25:13
--> tests/ui/nonminimal_bool.rs:24:13
|
LL | let _ = !!a;
| ^^^ help: try: `a`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:27:13
--> tests/ui/nonminimal_bool.rs:26:13
|
LL | let _ = false || a;
| ^^^^^^^^^^ help: try: `a`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:32:13
--> tests/ui/nonminimal_bool.rs:31:13
|
LL | let _ = !(!a && b);
| ^^^^^^^^^^ help: try: `a || !b`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:34:13
--> tests/ui/nonminimal_bool.rs:33:13
|
LL | let _ = !(!a || b);
| ^^^^^^^^^^ help: try: `a && !b`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:36:13
--> tests/ui/nonminimal_bool.rs:35:13
|
LL | let _ = !a && !(b && c);
| ^^^^^^^^^^^^^^^ help: try: `!(a || b && c)`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:45:13
--> tests/ui/nonminimal_bool.rs:44:13
|
LL | let _ = a == b && c == 5 && a == b;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -57,7 +57,7 @@ LL | let _ = a == b && c == 5;
| ~~~~~~~~~~~~~~~~

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:47:13
--> tests/ui/nonminimal_bool.rs:46:13
|
LL | let _ = a == b || c == 5 || a == b;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -70,7 +70,7 @@ LL | let _ = a == b || c == 5;
| ~~~~~~~~~~~~~~~~

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:49:13
--> tests/ui/nonminimal_bool.rs:48:13
|
LL | let _ = a == b && c == 5 && b == a;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -83,7 +83,7 @@ LL | let _ = a == b && c == 5;
| ~~~~~~~~~~~~~~~~

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:51:13
--> tests/ui/nonminimal_bool.rs:50:13
|
LL | let _ = a != b || !(a != b || c == d);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -96,7 +96,7 @@ LL | let _ = a != b || c != d;
| ~~~~~~~~~~~~~~~~

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:53:13
--> tests/ui/nonminimal_bool.rs:52:13
|
LL | let _ = a != b && !(a != b && c == d);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -109,43 +109,43 @@ LL | let _ = a != b && c != d;
| ~~~~~~~~~~~~~~~~

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:84:8
--> tests/ui/nonminimal_bool.rs:83:8
|
LL | if matches!(true, true) && true {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `matches!(true, true)`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:164:8
--> tests/ui/nonminimal_bool.rs:163:8
|
LL | if !(12 == a) {}
| ^^^^^^^^^^ help: try: `12 != a`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:165:8
--> tests/ui/nonminimal_bool.rs:164:8
|
LL | if !(a == 12) {}
| ^^^^^^^^^^ help: try: `a != 12`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:166:8
--> tests/ui/nonminimal_bool.rs:165:8
|
LL | if !(12 != a) {}
| ^^^^^^^^^^ help: try: `12 == a`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:167:8
--> tests/ui/nonminimal_bool.rs:166:8
|
LL | if !(a != 12) {}
| ^^^^^^^^^^ help: try: `a == 12`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:171:8
--> tests/ui/nonminimal_bool.rs:170:8
|
LL | if !b == true {}
| ^^^^^^^^^^ help: try: `b != true`

error: this comparison might be written more concisely
--> tests/ui/nonminimal_bool.rs:171:8
--> tests/ui/nonminimal_bool.rs:170:8
|
LL | if !b == true {}
| ^^^^^^^^^^ help: try simplifying it as shown: `b != true`
Expand All @@ -154,61 +154,61 @@ LL | if !b == true {}
= help: to override `-D warnings` add `#[allow(clippy::bool_comparison)]`

error: equality checks against true are unnecessary
--> tests/ui/nonminimal_bool.rs:171:8
--> tests/ui/nonminimal_bool.rs:170:8
|
LL | if !b == true {}
| ^^^^^^^^^^ help: try simplifying it as shown: `!b`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:172:8
--> tests/ui/nonminimal_bool.rs:171:8
|
LL | if !b != true {}
| ^^^^^^^^^^ help: try: `b == true`

error: inequality checks against true can be replaced by a negation
--> tests/ui/nonminimal_bool.rs:172:8
--> tests/ui/nonminimal_bool.rs:171:8
|
LL | if !b != true {}
| ^^^^^^^^^^ help: try simplifying it as shown: `!(!b)`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:173:8
--> tests/ui/nonminimal_bool.rs:172:8
|
LL | if true == !b {}
| ^^^^^^^^^^ help: try: `true != b`

error: this comparison might be written more concisely
--> tests/ui/nonminimal_bool.rs:173:8
--> tests/ui/nonminimal_bool.rs:172:8
|
LL | if true == !b {}
| ^^^^^^^^^^ help: try simplifying it as shown: `true != b`

error: equality checks against true are unnecessary
--> tests/ui/nonminimal_bool.rs:173:8
--> tests/ui/nonminimal_bool.rs:172:8
|
LL | if true == !b {}
| ^^^^^^^^^^ help: try simplifying it as shown: `!b`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:174:8
--> tests/ui/nonminimal_bool.rs:173:8
|
LL | if true != !b {}
| ^^^^^^^^^^ help: try: `true == b`

error: inequality checks against true can be replaced by a negation
--> tests/ui/nonminimal_bool.rs:174:8
--> tests/ui/nonminimal_bool.rs:173:8
|
LL | if true != !b {}
| ^^^^^^^^^^ help: try simplifying it as shown: `!(!b)`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:175:8
--> tests/ui/nonminimal_bool.rs:174:8
|
LL | if !b == !c {}
| ^^^^^^^^ help: try: `b == c`

error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool.rs:176:8
--> tests/ui/nonminimal_bool.rs:175:8
|
LL | if !b != !c {}
| ^^^^^^^^ help: try: `b != c`
Expand Down