From 94c97d2ec9c2d6a88d3e9fabf3d9a9d640f8bd47 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Sun, 15 Jan 2017 01:03:46 +0100
Subject: [PATCH] formatting

---
 clippy_lints/src/methods.rs |  6 +++---
 src/main.rs                 | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/clippy_lints/src/methods.rs b/clippy_lints/src/methods.rs
index 4d48ff45c92..578fda8e791 100644
--- a/clippy_lints/src/methods.rs
+++ b/clippy_lints/src/methods.rs
@@ -786,11 +786,11 @@ fn lint_or_fun_call(cx: &LateContext, expr: &hir::Expr, name: &str, args: &[hir:
                 if !check_unwrap_or_default(cx, name, fun, &args[0], &args[1], or_has_args, expr.span) {
                     check_general_case(cx, name, fun.span, &args[0], &args[1], or_has_args, expr.span);
                 }
-            }
+            },
             hir::ExprMethodCall(fun, _, ref or_args) => {
                 check_general_case(cx, name, fun.span, &args[0], &args[1], !or_args.is_empty(), expr.span)
-            }
-            _ => {}
+            },
+            _ => {},
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 38610701808..036adae8366 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -234,13 +234,15 @@ pub fn main() {
         } else {
             option_env!("SYSROOT")
                 .map(|s| s.to_owned())
-                .or_else(|| Command::new("rustc")
-                    .arg("--print")
-                    .arg("sysroot")
-                    .output()
-                    .ok()
-                    .and_then(|out| String::from_utf8(out.stdout).ok())
-                    .map(|s| s.trim().to_owned()))
+                .or_else(|| {
+                    Command::new("rustc")
+                        .arg("--print")
+                        .arg("sysroot")
+                        .output()
+                        .ok()
+                        .and_then(|out| String::from_utf8(out.stdout).ok())
+                        .map(|s| s.trim().to_owned())
+                })
                 .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust")
         };