nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate lint emission from [else_if_without_else]

Browse Source
This commit is contained in:
Christopher B. Speir 2024-03-08 19:45:40 -06:00
parent 0b4b684b46
commit 8d78cd17e1
3 changed files with 104 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clippy_lints/src/else_if_without_else.rs
View File

@ -49,24 +49,22 @@ declare_clippy_lint! {
declare_lint_pass!(ElseIfWithoutElse => [ELSE_IF_WITHOUT_ELSE]);
impl EarlyLintPass for ElseIfWithoutElse {
fn check_expr(&mut self, cx: &EarlyContext<'_>, mut item: &Expr) {
fn check_expr(&mut self, cx: &EarlyContext<'_>, item: &Expr) {
if in_external_macro(cx.sess(), item.span) {
return;
}
while let ExprKind::If(_, _, Some(ref els)) = item.kind {
if let ExprKind::If(_, _, None) = els.kind {
span_lint_and_help(
cx,
ELSE_IF_WITHOUT_ELSE,
els.span,
"`if` expression with an `else if`, but without a final `else`",
None,
"add an `else` block here",
);
}
item = els;
if let ExprKind::If(_, _, Some(ref els)) = item.kind
&& let ExprKind::If(_, _, None) = els.kind
{
span_lint_and_help(
cx,
ELSE_IF_WITHOUT_ELSE,
els.span,
"`if` expression with an `else if`, but without a final `else`",
None,
"add an `else` block here",
);
}
}
}

68
tests/ui/else_if_without_else.rs
View File

@ -1,7 +1,5 @@
//@compile-flags: -Zdeduplicate-diagnostics=yes
#![warn(clippy::all)]
#![warn(clippy::else_if_without_else)]
#![allow(clippy::collapsible_else_if)]
fn bla1() -> bool {
unimplemented!()
@ -12,6 +10,12 @@ fn bla2() -> bool {
fn bla3() -> bool {
unimplemented!()
}
fn bla4() -> bool {
unimplemented!()
}
fn bla5() -> bool {
unimplemented!()
}
fn main() {
if bla1() {
@ -57,4 +61,62 @@ fn main() {
//~^ ERROR: `if` expression with an `else if`, but without a final `else`
println!("else if 2");
}
if bla1() {
println!("if");
} else if bla2() {
println!("else if 1");
} else if bla3() {
println!("else if 2");
} else if bla4() {
println!("else if 3");
} else if bla5() {
println!("else if 4");
} else {
println!("else");
}
if bla1() {
println!("if");
} else if bla2() {
println!("else if 1");
} else if bla3() {
println!("else if 2");
} else if bla4() {
println!("else if 3");
} else if bla5() {
//~^ ERROR: `if` expression with an `else if`, but without a final `else`
println!("else if 4");
}
if bla1() {
println!("if");
} else if bla2() {
println!("else if 1");
} else {
if bla3() {
println!("else if 2");
} else if bla4() {
println!("else if 3");
} else if bla5() {
println!("else if 4");
} else {
println!("else");
}
}
if bla1() {
println!("if");
} else if bla2() {
println!("else if 1");
} else {
if bla3() {
println!("else if 2");
} else if bla4() {
println!("else if 3");
} else if bla5() {
//~^ ERROR: `if` expression with an `else if`, but without a final `else`
println!("else if 4");
}
}
}

30
tests/ui/else_if_without_else.stderr
View File

@ -1,5 +1,5 @@
error: `if` expression with an `else if`, but without a final `else`
--> tests/ui/else_if_without_else.rs:47:12
--> tests/ui/else_if_without_else.rs:51:12
|
LL | } else if bla2() {
| ____________^
@ -13,7 +13,7 @@ LL | | }
= help: to override `-D warnings` add `#[allow(clippy::else_if_without_else)]`
error: `if` expression with an `else if`, but without a final `else`
--> tests/ui/else_if_without_else.rs:56:12
--> tests/ui/else_if_without_else.rs:60:12
|
LL | } else if bla3() {
| ____________^
@ -24,5 +24,29 @@ LL | | }
|
= help: add an `else` block here
error: aborting due to 2 previous errors
error: `if` expression with an `else if`, but without a final `else`
--> tests/ui/else_if_without_else.rs:87:12
|
LL | } else if bla5() {
| ____________^
LL | |
LL | | println!("else if 4");
LL | | }
| |_____^
|
= help: add an `else` block here
error: `if` expression with an `else if`, but without a final `else`
--> tests/ui/else_if_without_else.rs:117:16
|
LL | } else if bla5() {
| ________________^
LL | |
LL | | println!("else if 4");
LL | | }
| |_________^
|
= help: add an `else` block here
error: aborting due to 4 previous errors