Skip to content

Commit

Permalink
Fix collapsible_if false positive with attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
camsteffen committed Feb 8, 2021
1 parent 1021327 commit 39ba449
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 0 deletions.
2 changes: 2 additions & 0 deletions clippy_lints/src/collapsible_if.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ fn check_collapsible_maybe_if_let(cx: &EarlyContext<'_>, else_: &ast::Expr) {
if let ast::ExprKind::Block(ref block, _) = else_.kind;
if !block_starts_with_comment(cx, block);
if let Some(else_) = expr_block(block);
if else_.attrs.is_empty();
if !else_.span.from_expansion();
if let ast::ExprKind::If(..) = else_.kind;
then {
Expand All @@ -143,6 +144,7 @@ fn check_collapsible_no_if_let(cx: &EarlyContext<'_>, expr: &ast::Expr, check: &
if_chain! {
if !block_starts_with_comment(cx, then);
if let Some(inner) = expr_block(then);
if inner.attrs.is_empty();
if let ast::ExprKind::If(ref check_inner, ref content, None) = inner.kind;
// Prevent triggering on `if c { if let a = b { .. } }`.
if !matches!(check_inner.kind, ast::ExprKind::Let(..));
Expand Down
9 changes: 9 additions & 0 deletions tests/ui/collapsible_else_if.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,13 @@ fn main() {
else {
println!("!")
}

if x == "hello" {
print!("Hello ");
} else {
#[cfg(not(roflol))]
if y == "world" {
println!("world!")
}
}
}
9 changes: 9 additions & 0 deletions tests/ui/collapsible_else_if.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,13 @@ fn main() {
println!("!")
}
}

if x == "hello" {
print!("Hello ");
} else {
#[cfg(not(roflol))]
if y == "world" {
println!("world!")
}
}
}
7 changes: 7 additions & 0 deletions tests/ui/collapsible_if.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,11 @@ fn main() {

// Fix #5962
if matches!(true, true) && matches!(true, true) {}

if true {
#[cfg(not(teehee))]
if true {
println!("Hello world!");
}
}
}
7 changes: 7 additions & 0 deletions tests/ui/collapsible_if.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,11 @@ fn main() {
if matches!(true, true) {
if matches!(true, true) {}
}

if true {
#[cfg(not(teehee))]
if true {
println!("Hello world!");
}
}
}

0 comments on commit 39ba449

Please sign in to comment.