Skip to content

Commit

Permalink
modify check that any macros will be ingored in this lint, and add test
Browse files Browse the repository at this point in the history
  • Loading branch information
cocodery committed Jan 6, 2024
1 parent 090c228 commit bd6e920
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
3 changes: 1 addition & 2 deletions clippy_lints/src/booleans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,10 @@ struct NotSimplificationVisitor<'a, 'tcx> {
impl<'a, 'tcx> Visitor<'tcx> for NotSimplificationVisitor<'a, 'tcx> {
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
if let ExprKind::Unary(UnOp::Not, inner) = &expr.kind
&& !expr.span.from_expansion()
&& !inner.span.from_expansion()
&& let Some(suggestion) = simplify_not(self.cx, inner)
&& self.cx.tcx.lint_level_at_node(NONMINIMAL_BOOL, expr.hir_id).0 != Level::Allow
&& let Some(snippet) = snippet_opt(self.cx, expr.span)
&& !snippet.contains("assert")
{
span_lint_and_sugg(
self.cx,
Expand Down
11 changes: 11 additions & 0 deletions tests/ui/nonminimal_bool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,14 @@ fn issue10836() {
// Should not lint
let _: bool = !!Foo(true);
}

fn issue11932() {
let x: i32 = unimplemented!();

#[allow(clippy::nonminimal_bool)]
let _ = x % 2 == 0 || {
// Should not lint
assert!(x > 0);
x % 3 == 0
};
}

0 comments on commit bd6e920

Please sign in to comment.