diff options
| author | Philipp Hansch <dev@phansch.net> | 2019-04-08 07:56:54 +0200 |
|---|---|---|
| committer | Philipp Hansch <dev@phansch.net> | 2019-04-08 07:56:54 +0200 |
| commit | 547c5c06678181ddba71f576cd79f2bce7529ca7 (patch) | |
| tree | 9a9a5b2911b67eacf3a04f378e6cdc1e0f27c8c3 | |
| parent | 60c1bb05466a817cc8bd4781e8cd4d87f40b9ad4 (diff) | |
| download | rust-547c5c06678181ddba71f576cd79f2bce7529ca7.tar.gz rust-547c5c06678181ddba71f576cd79f2bce7529ca7.zip | |
cargo fmt
| -rw-r--r-- | clippy_lints/src/formatting.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clippy_lints/src/formatting.rs b/clippy_lints/src/formatting.rs index 7c5c1169c43..08376bc49d2 100644 --- a/clippy_lints/src/formatting.rs +++ b/clippy_lints/src/formatting.rs @@ -1,5 +1,5 @@ use crate::utils::{differing_macro_contexts, in_macro, snippet_opt, span_note_and_lint}; -use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass, in_external_macro}; +use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc::{declare_tool_lint, lint_array}; use syntax::ast; use syntax::ptr::P; @@ -149,7 +149,8 @@ fn check_else(cx: &EarlyContext<'_>, expr: &ast::Expr) { if let Some((then, &Some(ref else_))) = unsugar_if(expr) { if (is_block(else_) || unsugar_if(else_).is_some()) && !differing_macro_contexts(then.span, else_.span) - && !in_macro(then.span) && !in_external_macro(cx.sess, expr.span) + && !in_macro(then.span) + && !in_external_macro(cx.sess, expr.span) { // workaround for rust-lang/rust#43081 if expr.span.lo().0 == 0 && expr.span.hi().0 == 0 { |
