Skip to content

Move collapsible_else_if to pedantic #16211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alexendoo wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −44
Open

Move collapsible_else_if to pedantic #16211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clippy_lints/src/collapsible_if.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ declare_clippy_lint! {
/// ```
#[clippy::version = "1.51.0"]
pub COLLAPSIBLE_ELSE_IF,
style,
pedantic,
"nested `else`-`if` expressions that can be collapsed (e.g., `else { if x { ... } }`)"
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ui-toml/collapsible_if/collapsible_else_if.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(clippy::eq_op, clippy::nonminimal_bool)]
#![warn(clippy::collapsible_if)]
#![warn(clippy::collapsible_else_if)]

#[rustfmt::skip]
fn main() {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui-toml/collapsible_if/collapsible_else_if.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(clippy::eq_op, clippy::nonminimal_bool)]
#![warn(clippy::collapsible_if)]
#![warn(clippy::collapsible_else_if)]

#[rustfmt::skip]
fn main() {
Expand Down
22 changes: 2 additions & 20 deletions tests/ui/collapsible_else_if.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(clippy::assertions_on_constants, clippy::equatable_if_let, clippy::needless_ifs)]
#![warn(clippy::collapsible_if, clippy::collapsible_else_if)]
#![warn(clippy::collapsible_else_if)]

#[rustfmt::skip]
fn main() {
Expand Down Expand Up @@ -88,30 +88,12 @@ fn issue_7318() {
}

fn issue_13365() {
// all the `expect`s that we should fulfill
// ensure we fulfill `#[expect]`
if true {
} else {
#[expect(clippy::collapsible_else_if)]
if false {}
}

if true {
} else {
#[expect(clippy::style)]
if false {}
}

if true {
} else {
#[expect(clippy::all)]
if false {}
}

if true {
} else {
#[expect(warnings)]
if false {}
}
}

fn issue14799() {
Expand Down
22 changes: 2 additions & 20 deletions tests/ui/collapsible_else_if.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(clippy::assertions_on_constants, clippy::equatable_if_let, clippy::needless_ifs)]
#![warn(clippy::collapsible_if, clippy::collapsible_else_if)]
#![warn(clippy::collapsible_else_if)]

#[rustfmt::skip]
fn main() {
Expand Down Expand Up @@ -104,30 +104,12 @@ fn issue_7318() {
}

fn issue_13365() {
// all the `expect`s that we should fulfill
// ensure we fulfill `#[expect]`
if true {
} else {
#[expect(clippy::collapsible_else_if)]
if false {}
}

if true {
} else {
#[expect(clippy::style)]
if false {}
}

if true {
} else {
#[expect(clippy::all)]
if false {}
}

if true {
} else {
#[expect(warnings)]
if false {}
}
}

fn issue14799() {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/collapsible_else_if.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ LL | | }
| |_____^ help: collapse nested if block: `if false {}`

error: this `else { if .. }` block can be collapsed
--> tests/ui/collapsible_else_if.rs:157:12
--> tests/ui/collapsible_else_if.rs:139:12
|
LL | } else {
| ____________^
Expand Down