Skip to content

double_comparisons: check for expressions such as x != y && x >= y #16033

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+69 −1
Open

double_comparisons: check for expressions such as x != y && x >= y #16033

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
12 changes: 12 additions & 0 deletions clippy_lints/src/operators/double_comparison.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ pub(super) fn check(cx: &LateContext<'_>, op: BinOpKind, lhs: &Expr<'_>, rhs: &E
| (BinOpKind::And, BinOpKind::Ge, BinOpKind::Le) => {
"=="
},
// x != y && x >= y => x > y
(BinOpKind::And, BinOpKind::Ne, BinOpKind::Ge)
// x >= y && x != y => x > y
| (BinOpKind::And, BinOpKind::Ge, BinOpKind::Ne) => {
">"
},
// x != y && x <= y => x < y
(BinOpKind::And, BinOpKind::Ne, BinOpKind::Le)
// x <= y && x != y => x < y
| (BinOpKind::And, BinOpKind::Le, BinOpKind::Ne) => {
"<"
},
_ => return,
};

Expand Down
16 changes: 16 additions & 0 deletions tests/ui/double_comparison.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,20 @@ fn main() {
//~^ double_comparisons
// do something
}
if x < y {
//~^ double_comparisons
// do something
}
if x < y {
//~^ double_comparisons
// do something
}
if x > y {
//~^ double_comparisons
// do something
}
if x > y {
//~^ double_comparisons
// do something
}
}
16 changes: 16 additions & 0 deletions tests/ui/double_comparison.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,20 @@ fn main() {
//~^ double_comparisons
// do something
}
if x != y && x <= y {
//~^ double_comparisons
// do something
}
if x <= y && x != y {
//~^ double_comparisons
// do something
}
if x != y && x >= y {
//~^ double_comparisons
// do something
}
if x >= y && x != y {
//~^ double_comparisons
// do something
}
}
26 changes: 25 additions & 1 deletion tests/ui/double_comparison.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,29 @@ error: this binary expression can be simplified
LL | if x >= y && x <= y {
| ^^^^^^^^^^^^^^^^ help: try: `x == y`

error: aborting due to 8 previous errors
error: this binary expression can be simplified
--> tests/ui/double_comparison.rs:38:8
|
LL | if x != y && x <= y {
| ^^^^^^^^^^^^^^^^ help: try: `x < y`

error: this binary expression can be simplified
--> tests/ui/double_comparison.rs:42:8
|
LL | if x <= y && x != y {
| ^^^^^^^^^^^^^^^^ help: try: `x < y`

error: this binary expression can be simplified
--> tests/ui/double_comparison.rs:46:8
|
LL | if x != y && x >= y {
| ^^^^^^^^^^^^^^^^ help: try: `x > y`

error: this binary expression can be simplified
--> tests/ui/double_comparison.rs:50:8
|
LL | if x >= y && x != y {
| ^^^^^^^^^^^^^^^^ help: try: `x > y`

error: aborting due to 12 previous errors

Loading