Rollup merge of #145273 - estebank:not-not, r=samueltardieu

Account for new `assert!` desugaring in `!condition` suggestion

`rustc` in https://github.com/rust-lang/rust/pull/122661 is going to change the desugaring of `assert!` to be

```rust
match condition {
    true => {}
    _ => panic!(),
}
```
which will make the edge-case of `condition` being `impl Not<Output = bool>` while not being `bool` itself no longer a straightforward suggestion, but `!!condition` will coerce the expression to be `bool`, so it can be machine applicable.

Transposing https://github.com/rust-lang/rust-clippy/pull/15453/ to the rustc repo.

r? `````@samueltardieu`````
This commit is contained in:
Stuart Cook 2025-08-12 20:37:57 +10:00 committed by GitHub
commit 2102eebd56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 144 additions and 56 deletions

View file

@ -130,18 +130,22 @@ impl<'tcx> LateLintPass<'tcx> for BoolAssertComparison {
let mut suggestions = vec![(name_span, non_eq_mac.to_string()), (lit_span, String::new())];
if bool_value ^ eq_macro {
let Some(sugg) = Sugg::hir_opt(cx, non_lit_expr) else {
return;
if let Some(sugg) = Sugg::hir_opt(cx, non_lit_expr) {
let sugg = if bool_value ^ eq_macro {
!sugg.maybe_paren()
} else if ty::Bool == *non_lit_ty.kind() {
sugg
} else {
!!sugg.maybe_paren()
};
suggestions.push((non_lit_expr.span, (!sugg).to_string()));
}
suggestions.push((non_lit_expr.span, sugg.to_string()));
diag.multipart_suggestion(
format!("replace it with `{non_eq_mac}!(..)`"),
suggestions,
Applicability::MachineApplicable,
);
diag.multipart_suggestion(
format!("replace it with `{non_eq_mac}!(..)`"),
suggestions,
Applicability::MachineApplicable,
);
}
},
);
}

View file

@ -1,7 +1,7 @@
#![allow(unused, clippy::assertions_on_constants, clippy::const_is_empty)]
#![warn(clippy::bool_assert_comparison)]
use std::ops::Not;
use std::ops::{Add, Not};
macro_rules! a {
() => {
@ -62,6 +62,14 @@ impl Not for ImplNotTraitWithBool {
}
}
impl Add for ImplNotTraitWithBool {
type Output = Self;
fn add(self, other: Self) -> Self::Output {
self
}
}
#[derive(Debug)]
struct NonCopy;
@ -94,7 +102,7 @@ fn main() {
assert_eq!(a!(), "".is_empty());
assert_eq!("".is_empty(), b!());
assert_eq!(a, true);
assert!(b);
assert!(!!b);
//~^ bool_assert_comparison
assert_ne!("a".len(), 1);
@ -122,7 +130,7 @@ fn main() {
debug_assert_eq!(a!(), "".is_empty());
debug_assert_eq!("".is_empty(), b!());
debug_assert_eq!(a, true);
debug_assert!(b);
debug_assert!(!!b);
//~^ bool_assert_comparison
debug_assert_ne!("a".len(), 1);
@ -167,7 +175,7 @@ fn main() {
use debug_assert_eq as renamed;
renamed!(a, true);
debug_assert!(b);
debug_assert!(!!b);
//~^ bool_assert_comparison
let non_copy = NonCopy;
@ -199,4 +207,12 @@ fn main() {
//~^ bool_assert_comparison
debug_assert!(!"requires negation".is_empty());
//~^ bool_assert_comparison
assert!(!b);
//~^ bool_assert_comparison
assert!(!(!b));
//~^ bool_assert_comparison
assert!(!!(b + b));
//~^ bool_assert_comparison
assert!(!(b + b));
//~^ bool_assert_comparison
}

View file

@ -1,7 +1,7 @@
#![allow(unused, clippy::assertions_on_constants, clippy::const_is_empty)]
#![warn(clippy::bool_assert_comparison)]
use std::ops::Not;
use std::ops::{Add, Not};
macro_rules! a {
() => {
@ -62,6 +62,14 @@ impl Not for ImplNotTraitWithBool {
}
}
impl Add for ImplNotTraitWithBool {
type Output = Self;
fn add(self, other: Self) -> Self::Output {
self
}
}
#[derive(Debug)]
struct NonCopy;
@ -199,4 +207,12 @@ fn main() {
//~^ bool_assert_comparison
debug_assert_eq!("requires negation".is_empty(), false);
//~^ bool_assert_comparison
assert_eq!(!b, true);
//~^ bool_assert_comparison
assert_eq!(!b, false);
//~^ bool_assert_comparison
assert_eq!(b + b, true);
//~^ bool_assert_comparison
assert_eq!(b + b, false);
//~^ bool_assert_comparison
}

View file

@ -1,5 +1,5 @@
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:87:5
--> tests/ui/bool_assert_comparison.rs:95:5
|
LL | assert_eq!("a".is_empty(), false);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -13,7 +13,7 @@ LL + assert!(!"a".is_empty());
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:89:5
--> tests/ui/bool_assert_comparison.rs:97:5
|
LL | assert_eq!("".is_empty(), true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -25,7 +25,7 @@ LL + assert!("".is_empty());
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:91:5
--> tests/ui/bool_assert_comparison.rs:99:5
|
LL | assert_eq!(true, "".is_empty());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -37,7 +37,7 @@ LL + assert!("".is_empty());
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:97:5
--> tests/ui/bool_assert_comparison.rs:105:5
|
LL | assert_eq!(b, true);
| ^^^^^^^^^^^^^^^^^^^
@ -45,11 +45,11 @@ LL | assert_eq!(b, true);
help: replace it with `assert!(..)`
|
LL - assert_eq!(b, true);
LL + assert!(b);
LL + assert!(!!b);
|
error: used `assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:101:5
--> tests/ui/bool_assert_comparison.rs:109:5
|
LL | assert_ne!("a".is_empty(), false);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -61,7 +61,7 @@ LL + assert!("a".is_empty());
|
error: used `assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:103:5
--> tests/ui/bool_assert_comparison.rs:111:5
|
LL | assert_ne!("".is_empty(), true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -73,7 +73,7 @@ LL + assert!(!"".is_empty());
|
error: used `assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:105:5
--> tests/ui/bool_assert_comparison.rs:113:5
|
LL | assert_ne!(true, "".is_empty());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -85,7 +85,7 @@ LL + assert!(!"".is_empty());
|
error: used `assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:111:5
--> tests/ui/bool_assert_comparison.rs:119:5
|
LL | assert_ne!(b, true);
| ^^^^^^^^^^^^^^^^^^^
@ -97,7 +97,7 @@ LL + assert!(!b);
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:115:5
--> tests/ui/bool_assert_comparison.rs:123:5
|
LL | debug_assert_eq!("a".is_empty(), false);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -109,7 +109,7 @@ LL + debug_assert!(!"a".is_empty());
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:117:5
--> tests/ui/bool_assert_comparison.rs:125:5
|
LL | debug_assert_eq!("".is_empty(), true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -121,7 +121,7 @@ LL + debug_assert!("".is_empty());
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:119:5
--> tests/ui/bool_assert_comparison.rs:127:5
|
LL | debug_assert_eq!(true, "".is_empty());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -133,7 +133,7 @@ LL + debug_assert!("".is_empty());
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:125:5
--> tests/ui/bool_assert_comparison.rs:133:5
|
LL | debug_assert_eq!(b, true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -141,11 +141,11 @@ LL | debug_assert_eq!(b, true);
help: replace it with `debug_assert!(..)`
|
LL - debug_assert_eq!(b, true);
LL + debug_assert!(b);
LL + debug_assert!(!!b);
|
error: used `debug_assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:129:5
--> tests/ui/bool_assert_comparison.rs:137:5
|
LL | debug_assert_ne!("a".is_empty(), false);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -157,7 +157,7 @@ LL + debug_assert!("a".is_empty());
|
error: used `debug_assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:131:5
--> tests/ui/bool_assert_comparison.rs:139:5
|
LL | debug_assert_ne!("".is_empty(), true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -169,7 +169,7 @@ LL + debug_assert!(!"".is_empty());
|
error: used `debug_assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:133:5
--> tests/ui/bool_assert_comparison.rs:141:5
|
LL | debug_assert_ne!(true, "".is_empty());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -181,7 +181,7 @@ LL + debug_assert!(!"".is_empty());
|
error: used `debug_assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:139:5
--> tests/ui/bool_assert_comparison.rs:147:5
|
LL | debug_assert_ne!(b, true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -193,7 +193,7 @@ LL + debug_assert!(!b);
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:145:5
--> tests/ui/bool_assert_comparison.rs:153:5
|
LL | assert_eq!("a".is_empty(), false, "tadam {}", 1);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -205,7 +205,7 @@ LL + assert!(!"a".is_empty(), "tadam {}", 1);
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:147:5
--> tests/ui/bool_assert_comparison.rs:155:5
|
LL | assert_eq!("a".is_empty(), false, "tadam {}", true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -217,7 +217,7 @@ LL + assert!(!"a".is_empty(), "tadam {}", true);
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:149:5
--> tests/ui/bool_assert_comparison.rs:157:5
|
LL | assert_eq!(false, "a".is_empty(), "tadam {}", true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -229,7 +229,7 @@ LL + assert!(!"a".is_empty(), "tadam {}", true);
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:155:5
--> tests/ui/bool_assert_comparison.rs:163:5
|
LL | debug_assert_eq!("a".is_empty(), false, "tadam {}", 1);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -241,7 +241,7 @@ LL + debug_assert!(!"a".is_empty(), "tadam {}", 1);
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:157:5
--> tests/ui/bool_assert_comparison.rs:165:5
|
LL | debug_assert_eq!("a".is_empty(), false, "tadam {}", true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -253,7 +253,7 @@ LL + debug_assert!(!"a".is_empty(), "tadam {}", true);
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:159:5
--> tests/ui/bool_assert_comparison.rs:167:5
|
LL | debug_assert_eq!(false, "a".is_empty(), "tadam {}", true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -265,31 +265,35 @@ LL + debug_assert!(!"a".is_empty(), "tadam {}", true);
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:163:5
--> tests/ui/bool_assert_comparison.rs:171:5
|
LL | assert_eq!(a!(), true);
| ^^^^^^^^^^^^^^^^^^^^^^
|
help: replace it with `assert!(..)`
|
LL - assert_eq!(a!(), true);
LL + assert!(a!());
LL | true
...
LL |
LL ~ assert!(a!());
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:165:5
--> tests/ui/bool_assert_comparison.rs:173:5
|
LL | assert_eq!(true, b!());
| ^^^^^^^^^^^^^^^^^^^^^^
|
help: replace it with `assert!(..)`
|
LL - assert_eq!(true, b!());
LL + assert!(b!());
LL | true
...
LL |
LL ~ assert!(b!());
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:170:5
--> tests/ui/bool_assert_comparison.rs:178:5
|
LL | renamed!(b, true);
| ^^^^^^^^^^^^^^^^^
@ -297,11 +301,11 @@ LL | renamed!(b, true);
help: replace it with `debug_assert!(..)`
|
LL - renamed!(b, true);
LL + debug_assert!(b);
LL + debug_assert!(!!b);
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:185:5
--> tests/ui/bool_assert_comparison.rs:193:5
|
LL | assert_eq!("".is_empty(), true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -313,7 +317,7 @@ LL + assert!("".is_empty());
|
error: used `assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:187:5
--> tests/ui/bool_assert_comparison.rs:195:5
|
LL | assert_ne!("".is_empty(), false);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -325,7 +329,7 @@ LL + assert!("".is_empty());
|
error: used `assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:189:5
--> tests/ui/bool_assert_comparison.rs:197:5
|
LL | assert_ne!("requires negation".is_empty(), true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -337,7 +341,7 @@ LL + assert!(!"requires negation".is_empty());
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:191:5
--> tests/ui/bool_assert_comparison.rs:199:5
|
LL | assert_eq!("requires negation".is_empty(), false);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -349,7 +353,7 @@ LL + assert!(!"requires negation".is_empty());
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:194:5
--> tests/ui/bool_assert_comparison.rs:202:5
|
LL | debug_assert_eq!("".is_empty(), true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -361,7 +365,7 @@ LL + debug_assert!("".is_empty());
|
error: used `debug_assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:196:5
--> tests/ui/bool_assert_comparison.rs:204:5
|
LL | debug_assert_ne!("".is_empty(), false);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -373,7 +377,7 @@ LL + debug_assert!("".is_empty());
|
error: used `debug_assert_ne!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:198:5
--> tests/ui/bool_assert_comparison.rs:206:5
|
LL | debug_assert_ne!("requires negation".is_empty(), true);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -385,7 +389,7 @@ LL + debug_assert!(!"requires negation".is_empty());
|
error: used `debug_assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:200:5
--> tests/ui/bool_assert_comparison.rs:208:5
|
LL | debug_assert_eq!("requires negation".is_empty(), false);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -396,5 +400,53 @@ LL - debug_assert_eq!("requires negation".is_empty(), false);
LL + debug_assert!(!"requires negation".is_empty());
|
error: aborting due to 33 previous errors
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:210:5
|
LL | assert_eq!(!b, true);
| ^^^^^^^^^^^^^^^^^^^^
|
help: replace it with `assert!(..)`
|
LL - assert_eq!(!b, true);
LL + assert!(!b);
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:212:5
|
LL | assert_eq!(!b, false);
| ^^^^^^^^^^^^^^^^^^^^^
|
help: replace it with `assert!(..)`
|
LL - assert_eq!(!b, false);
LL + assert!(!(!b));
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:214:5
|
LL | assert_eq!(b + b, true);
| ^^^^^^^^^^^^^^^^^^^^^^^
|
help: replace it with `assert!(..)`
|
LL - assert_eq!(b + b, true);
LL + assert!(!!(b + b));
|
error: used `assert_eq!` with a literal bool
--> tests/ui/bool_assert_comparison.rs:216:5
|
LL | assert_eq!(b + b, false);
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
help: replace it with `assert!(..)`
|
LL - assert_eq!(b + b, false);
LL + assert!(!(b + b));
|
error: aborting due to 37 previous errors