Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2025-02-25 11:57:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove except in suspicious_else_formatting

Browse source 
This was causing two different ICEs in #3741.
The first was fixed in #3925.

The second one is fixed with this commit: We just don't `expect`
anymore. If the snippet doesn't contain an `else`, we stop emitting the
lint because it's not a suspiciously formatted else anyway.
This commit is contained in:
Philipp Hansch 2019-04-14 11:04:41 +02:00
parent d516925ec8
commit 96c34e85c4
No known key found for this signature in database
GPG key ID: 82AA61CAA11397E6
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clippy_lints/src/formatting.rs
View file

@ -165,8 +165,7 @@ fn check_else(cx: &EarlyContext<'_>, expr: &ast::Expr) {
// the snippet should look like " else \n " with maybe comments anywhere // the snippet should look like " else \n " with maybe comments anywhere
// it’s bad when there is a ‘\n’ after the “else” // it’s bad when there is a ‘\n’ after the “else”
if let Some(else_snippet) = snippet_opt(cx, else_span) { if let Some(else_snippet) = snippet_opt(cx, else_span) {
let else_pos = else_snippet.find("else").expect("there must be a `else` here"); if let Some(else_pos) = else_snippet.find("else") {
if else_snippet[else_pos..].contains('\n') { if else_snippet[else_pos..].contains('\n') {
let else_desc = if unsugar_if(else_).is_some() { "if" } else { "{..}" }; let else_desc = if unsugar_if(else_).is_some() { "if" } else { "{..}" };
@ -187,6 +186,7 @@ fn check_else(cx: &EarlyContext<'_>, expr: &ast::Expr) {
} }
} }
} }
}
fn has_unary_equivalent(bin_op: ast::BinOpKind) -> bool { fn has_unary_equivalent(bin_op: ast::BinOpKind) -> bool {
// &, *, - // &, *, -