cargo fmt

diff --git a/clippy_lints/src/formatting.rs b/clippy_lints/src/formatting.rs
index 7c5c1169c4374a508d472e7b993046b2d8b7eabb..08376bc49d22488283c62e08db6358cdea6ae47a 100644 (file)
--- 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 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;
 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)
     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 {
         {
             // workaround for rust-lang/rust#43081
             if expr.span.lo().0 == 0 && expr.span.hi().0 == 0 {