Skip to content

Commit bd6e920

Browse files
committedJan 6, 2024
modify check that any macros will be ingored in this lint, and add test
1 parent 090c228 commit bd6e920

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed
 

Diff for: ‎clippy_lints/src/booleans.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -499,11 +499,10 @@ struct NotSimplificationVisitor<'a, 'tcx> {
499499
impl<'a, 'tcx> Visitor<'tcx> for NotSimplificationVisitor<'a, 'tcx> {
500500
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
501501
if let ExprKind::Unary(UnOp::Not, inner) = &expr.kind
502+
&& !expr.span.from_expansion()
502503
&& !inner.span.from_expansion()
503504
&& let Some(suggestion) = simplify_not(self.cx, inner)
504505
&& self.cx.tcx.lint_level_at_node(NONMINIMAL_BOOL, expr.hir_id).0 != Level::Allow
505-
&& let Some(snippet) = snippet_opt(self.cx, expr.span)
506-
&& !snippet.contains("assert")
507506
{
508507
span_lint_and_sugg(
509508
self.cx,

Diff for: ‎tests/ui/nonminimal_bool.rs

+11
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,14 @@ fn issue10836() {
145145
// Should not lint
146146
let _: bool = !!Foo(true);
147147
}
148+
149+
fn issue11932() {
150+
let x: i32 = unimplemented!();
151+
152+
#[allow(clippy::nonminimal_bool)]
153+
let _ = x % 2 == 0 || {
154+
// Should not lint
155+
assert!(x > 0);
156+
x % 3 == 0
157+
};
158+
}

0 commit comments

Comments
 (0)