Fix obfuscated_if_else suggestion on left side of a binary expr

An `if … { … } else { … }` used as the left operand of a binary
expression requires parentheses to be parsed as an expression.
This commit is contained in:
Samuel Tardieu 2025-01-31 23:25:26 +01:00
parent aad3686823
commit ac0a11a8bc
4 changed files with 113 additions and 1 deletions

View file

@ -22,3 +22,29 @@ fn main() {
if true { () } else { a += 2 };
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
}
fn issue11141() {
// Parentheses are required around the left side of a binary expression
let _ = (if true { 40 } else { 17 }) | 2;
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are required only for the leftmost expression
let _ = (if true { 30 } else { 17 }) | if true { 2 } else { 3 } | if true { 10 } else { 1 };
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are not required around the right side of a binary expression
let _ = 2 | if true { 40 } else { 17 };
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are not required for a cast
let _ = if true { 42 } else { 17 } as u8;
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are not required for a deref
let _ = *if true { &42 } else { &17 };
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are not required for a deref followed by a cast
let _ = *if true { &42 } else { &17 } as u8;
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
}

View file

@ -22,3 +22,29 @@ fn main() {
true.then_some(()).unwrap_or(a += 2);
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
}
fn issue11141() {
// Parentheses are required around the left side of a binary expression
let _ = true.then_some(40).unwrap_or(17) | 2;
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are required only for the leftmost expression
let _ = true.then_some(30).unwrap_or(17) | true.then_some(2).unwrap_or(3) | true.then_some(10).unwrap_or(1);
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are not required around the right side of a binary expression
let _ = 2 | true.then_some(40).unwrap_or(17);
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are not required for a cast
let _ = true.then_some(42).unwrap_or(17) as u8;
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are not required for a deref
let _ = *true.then_some(&42).unwrap_or(&17);
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
// Parentheses are not required for a deref followed by a cast
let _ = *true.then_some(&42).unwrap_or(&17) as u8;
//~^ ERROR: this method chain can be written more clearly with `if .. else ..`
}

View file

@ -37,5 +37,53 @@ error: this method chain can be written more clearly with `if .. else ..`
LL | true.then_some(()).unwrap_or(a += 2);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `if true { () } else { a += 2 }`
error: aborting due to 6 previous errors
error: this method chain can be written more clearly with `if .. else ..`
--> tests/ui/obfuscated_if_else.rs:28:13
|
LL | let _ = true.then_some(40).unwrap_or(17) | 2;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `(if true { 40 } else { 17 })`
error: this method chain can be written more clearly with `if .. else ..`
--> tests/ui/obfuscated_if_else.rs:32:13
|
LL | let _ = true.then_some(30).unwrap_or(17) | true.then_some(2).unwrap_or(3) | true.then_some(10).unwrap_or(1);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `(if true { 30 } else { 17 })`
error: this method chain can be written more clearly with `if .. else ..`
--> tests/ui/obfuscated_if_else.rs:32:48
|
LL | let _ = true.then_some(30).unwrap_or(17) | true.then_some(2).unwrap_or(3) | true.then_some(10).unwrap_or(1);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `if true { 2 } else { 3 }`
error: this method chain can be written more clearly with `if .. else ..`
--> tests/ui/obfuscated_if_else.rs:32:81
|
LL | let _ = true.then_some(30).unwrap_or(17) | true.then_some(2).unwrap_or(3) | true.then_some(10).unwrap_or(1);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `if true { 10 } else { 1 }`
error: this method chain can be written more clearly with `if .. else ..`
--> tests/ui/obfuscated_if_else.rs:36:17
|
LL | let _ = 2 | true.then_some(40).unwrap_or(17);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `if true { 40 } else { 17 }`
error: this method chain can be written more clearly with `if .. else ..`
--> tests/ui/obfuscated_if_else.rs:40:13
|
LL | let _ = true.then_some(42).unwrap_or(17) as u8;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `if true { 42 } else { 17 }`
error: this method chain can be written more clearly with `if .. else ..`
--> tests/ui/obfuscated_if_else.rs:44:14
|
LL | let _ = *true.then_some(&42).unwrap_or(&17);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `if true { &42 } else { &17 }`
error: this method chain can be written more clearly with `if .. else ..`
--> tests/ui/obfuscated_if_else.rs:48:14
|
LL | let _ = *true.then_some(&42).unwrap_or(&17) as u8;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `if true { &42 } else { &17 }`
error: aborting due to 14 previous errors