fix incorrect suggestion for !(a as type >= b)

This commit is contained in:
Folkert 2024-04-03 10:10:00 +02:00
parent 367f7aac5a
commit 6a2cb33029
No known key found for this signature in database
GPG Key ID: 1F17F6FFD112B97C
4 changed files with 47 additions and 6 deletions

View File

@ -346,11 +346,18 @@ fn simplify_not(cx: &LateContext<'_>, expr: &Expr<'_>) -> Option<String> {
_ => None, _ => None,
} }
.and_then(|op| { .and_then(|op| {
Some(format!( let lhs_snippet = snippet_opt(cx, lhs.span)?;
"{}{op}{}", let rhs_snippet = snippet_opt(cx, rhs.span)?;
snippet_opt(cx, lhs.span)?,
snippet_opt(cx, rhs.span)? if !(lhs_snippet.starts_with('(') && lhs_snippet.ends_with(')')) {
)) if let (ExprKind::Cast(..), BinOpKind::Ge) = (&lhs.kind, binop.node) {
// e.g. `(a as u64) < b`. Without the parens the `<` is
// interpreted as a start of generic arguments for `u64`
return Some(format!("({lhs_snippet}){op}{rhs_snippet}"));
}
}
Some(format!("{lhs_snippet}{op}{rhs_snippet}"))
}) })
}, },
ExprKind::MethodCall(path, receiver, [], _) => { ExprKind::MethodCall(path, receiver, [], _) => {

View File

@ -109,4 +109,12 @@ fn dont_warn_for_negated_partial_ord_comparison() {
let _ = !(a >= b); let _ = !(a >= b);
} }
fn issue_12625() {
let a = 0;
let b = 0;
if (a as u64) < b {} //~ ERROR: this boolean expression can be simplified
if (a as u64) < b {} //~ ERROR: this boolean expression can be simplified
if a as u64 > b {} //~ ERROR: this boolean expression can be simplified
}
fn main() {} fn main() {}

View File

@ -109,4 +109,12 @@ fn dont_warn_for_negated_partial_ord_comparison() {
let _ = !(a >= b); let _ = !(a >= b);
} }
fn issue_12625() {
let a = 0;
let b = 0;
if !(a as u64 >= b) {} //~ ERROR: this boolean expression can be simplified
if !((a as u64) >= b) {} //~ ERROR: this boolean expression can be simplified
if !(a as u64 <= b) {} //~ ERROR: this boolean expression can be simplified
}
fn main() {} fn main() {}

View File

@ -79,5 +79,23 @@ error: this boolean expression can be simplified
LL | if !res.is_none() {} LL | if !res.is_none() {}
| ^^^^^^^^^^^^^^ help: try: `res.is_some()` | ^^^^^^^^^^^^^^ help: try: `res.is_some()`
error: aborting due to 13 previous errors error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool_methods.rs:115:8
|
LL | if !(a as u64 >= b) {}
| ^^^^^^^^^^^^^^^^ help: try: `(a as u64) < b`
error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool_methods.rs:116:8
|
LL | if !((a as u64) >= b) {}
| ^^^^^^^^^^^^^^^^^^ help: try: `(a as u64) < b`
error: this boolean expression can be simplified
--> tests/ui/nonminimal_bool_methods.rs:117:8
|
LL | if !(a as u64 <= b) {}
| ^^^^^^^^^^^^^^^^ help: try: `a as u64 > b`
error: aborting due to 16 previous errors