Revert changes from accidentally running rustfmt

diff --git a/clippy_lints/src/derive.rs b/clippy_lints/src/derive.rs
index 1e4959a9cccc55e044f41e9a3b51a9a8bff8ed4e..b2a8d26000d14f2abe87f887a1bfb1de8072bc5a 100644 (file)
--- a/clippy_lints/src/derive.rs
+++ b/clippy_lints/src/derive.rs
@@ -173,8 +173,6 @@ fn check_copy_clone<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, item: &Item, trait_ref
                            EXPL_IMPL_CLONE_ON_COPY,
                            item.span,
                            "you are implementing `Clone` explicitly on a `Copy` type",
-                           |db| {
-            db.span_note(item.span, "consider deriving `Clone` or removing `Copy`");
-        });
+                           |db| { db.span_note(item.span, "consider deriving `Clone` or removing `Copy`"); });
     }
 }

diff --git a/clippy_lints/src/map_clone.rs b/clippy_lints/src/map_clone.rs
index 2cf5cd981ccf04eed4368f7c1df071826a8c11a0..087ae8c31b926efc53ef3308d87866b1e9ec64a6 100644 (file)
--- a/clippy_lints/src/map_clone.rs
+++ b/clippy_lints/src/map_clone.rs
@@ -1,8 +1,8 @@
 use rustc::lint::*;
 use rustc::hir::*;
 use syntax::ast;
-use utils::{is_adjusted, match_path, match_trait_method, match_type, remove_blocks, paths, snippet,
-            span_help_and_lint, walk_ptrs_ty, walk_ptrs_ty_depth, iter_input_pats};
+use utils::{is_adjusted, match_path, match_trait_method, match_type, remove_blocks, paths, snippet, span_help_and_lint,
+            walk_ptrs_ty, walk_ptrs_ty_depth, iter_input_pats};
 
 /// **What it does:** Checks for mapping `clone()` over an iterator.
 ///

diff --git a/clippy_lints/src/methods.rs b/clippy_lints/src/methods.rs
index f0732c1cd903b9c4fdf29d1b95ba0fe435d0e8e8..30ffcc9f6e3a66960ef6ba83b9ec12b4975f5439 100644 (file)
--- a/clippy_lints/src/methods.rs
+++ b/clippy_lints/src/methods.rs
@@ -1213,9 +1213,7 @@ fn lint_single_char_pattern(cx: &LateContext, expr: &hir::Expr, arg: &hir::Expr)
                                SINGLE_CHAR_PATTERN,
                                arg.span,
                                "single-character string constant used as pattern",
-                               |db| {
-                db.span_suggestion(expr.span, "try using a char instead:", hint);
-            });
+                               |db| { db.span_suggestion(expr.span, "try using a char instead:", hint); });
         }
     }
 }

diff --git a/clippy_lints/src/needless_bool.rs b/clippy_lints/src/needless_bool.rs
index 5eae3034aff31e9e1f9368cc8c73b861f0340043..c9ade60c339ae7e4bc70f1992d9f783a23c97ff5 100644 (file)
--- a/clippy_lints/src/needless_bool.rs
+++ b/clippy_lints/src/needless_bool.rs
@@ -74,9 +74,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, e: &'tcx Expr) {
                                    NEEDLESS_BOOL,
                                    e.span,
                                    "this if-then-else expression returns a bool literal",
-                                   |db| {
-                    db.span_suggestion(e.span, "you can reduce it to", hint);
-                });
+                                   |db| { db.span_suggestion(e.span, "you can reduce it to", hint); });
             };
             match (fetch_bool_block(then_block), fetch_bool_expr(else_expr)) {
                 (RetBool(true), RetBool(true)) |
@@ -123,9 +121,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, e: &'tcx Expr) {
                                        BOOL_COMPARISON,
                                        e.span,
                                        "equality checks against true are unnecessary",
-                                       |db| {
-                        db.span_suggestion(e.span, "try simplifying it as shown:", hint);
-                    });
+                                       |db| { db.span_suggestion(e.span, "try simplifying it as shown:", hint); });
                 },
                 (Other, Bool(true)) => {
                     let hint = snippet(cx, left_side.span, "..").into_owned();
@@ -133,9 +129,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, e: &'tcx Expr) {
                                        BOOL_COMPARISON,
                                        e.span,
                                        "equality checks against true are unnecessary",
-                                       |db| {
-                        db.span_suggestion(e.span, "try simplifying it as shown:", hint);
-                    });
+                                       |db| { db.span_suggestion(e.span, "try simplifying it as shown:", hint); });
                 },
                 (Bool(false), Other) => {
                     let hint = Sugg::hir(cx, right_side, "..");

diff --git a/clippy_lints/src/no_effect.rs b/clippy_lints/src/no_effect.rs
index c0ca07b34661a25dc8edaed70a828871948493ec..f53fcb60706eb38dbdc9f2e21d07537acbb0d6c9 100644 (file)
--- a/clippy_lints/src/no_effect.rs
+++ b/clippy_lints/src/no_effect.rs
@@ -120,9 +120,11 @@ fn check_stmt(&mut self, cx: &LateContext<'a, 'tcx>, stmt: &'tcx Stmt) {
                         return;
                     }
                 }
-                span_lint_and_then(cx, UNNECESSARY_OPERATION, stmt.span, "statement can be reduced", |db| {
-                    db.span_suggestion(stmt.span, "replace it with", snippet);
-                });
+                span_lint_and_then(cx,
+                                   UNNECESSARY_OPERATION,
+                                   stmt.span,
+                                   "statement can be reduced",
+                                   |db| { db.span_suggestion(stmt.span, "replace it with", snippet); });
             }
         }
     }

diff --git a/clippy_lints/src/precedence.rs b/clippy_lints/src/precedence.rs
index 949a2c7e7672a26447f3c900bf740f125e6b169c..0dff1495dfb22830dcf171c308abcebfe1f62e29 100644 (file)
--- a/clippy_lints/src/precedence.rs
+++ b/clippy_lints/src/precedence.rs
@@ -36,11 +36,12 @@ fn get_lints(&self) -> LintArray {
 impl EarlyLintPass for Precedence {
     fn check_expr(&mut self, cx: &EarlyContext, expr: &Expr) {
         if let ExprKind::Binary(Spanned { node: op, .. }, ref left, ref right) = expr.node {
-            let span_sugg = |expr: &Expr, sugg| {
-                span_lint_and_then(cx, PRECEDENCE, expr.span, "operator precedence can trip the unwary", |db| {
-                    db.span_suggestion(expr.span, "consider parenthesizing your expression", sugg);
-                });
-            };
+            let span_sugg =
+                |expr: &Expr, sugg| {
+                    span_lint_and_then(cx, PRECEDENCE, expr.span, "operator precedence can trip the unwary", |db| {
+                        db.span_suggestion(expr.span, "consider parenthesizing your expression", sugg);
+                    });
+                };
 
             if !is_bit_op(op) {
                 return;

diff --git a/clippy_lints/src/shadow.rs b/clippy_lints/src/shadow.rs
index 689e45ef87a6ea6db308a2a715172244d395825d..62ef155c3211cbaa2aa9cb9ac014861f77147c14 100644 (file)
--- a/clippy_lints/src/shadow.rs
+++ b/clippy_lints/src/shadow.rs
@@ -250,9 +250,7 @@ fn lint_shadow<'a, 'tcx: 'a>(
                                &format!("`{}` is shadowed by itself in `{}`",
                                         snippet(cx, pattern_span, "_"),
                                         snippet(cx, expr.span, "..")),
-                               |db| {
-                db.span_note(prev_span, "previous binding is here");
-            });
+                               |db| { db.span_note(prev_span, "previous binding is here"); });
         } else if contains_self(cx, name, expr) {
             span_lint_and_then(cx,
                                SHADOW_REUSE,
@@ -282,9 +280,7 @@ fn lint_shadow<'a, 'tcx: 'a>(
                            SHADOW_UNRELATED,
                            span,
                            &format!("`{}` shadows a previous declaration", snippet(cx, pattern_span, "_")),
-                           |db| {
-            db.span_note(prev_span, "previous binding is here");
-        });
+                           |db| { db.span_note(prev_span, "previous binding is here"); });
     }
 }
 

diff --git a/clippy_lints/src/utils/sugg.rs b/clippy_lints/src/utils/sugg.rs
index 378af61f58d3a7eb35c3c277d51c4e969ea7abc7..2c10db158cb32ba489f926bb0e6206db4511acc1 100644 (file)
--- a/clippy_lints/src/utils/sugg.rs
+++ b/clippy_lints/src/utils/sugg.rs
@@ -258,8 +258,9 @@ fn is_arith(op: &AssocOp) -> bool {
     fn needs_paren(op: &AssocOp, other: &AssocOp, dir: Associativity) -> bool {
         other.precedence() < op.precedence() ||
         (other.precedence() == op.precedence() &&
-         ((op != other && associativity(op) != dir) || (op == other && associativity(op) != Associativity::Both))) ||
-        is_shift(op) && is_arith(other) || is_shift(other) && is_arith(op)
+         ((op != other && associativity(op) != dir) ||
+          (op == other && associativity(op) != Associativity::Both))) || is_shift(op) && is_arith(other) ||
+        is_shift(other) && is_arith(op)
     }
 
     let lhs_paren = if let Sugg::BinOp(ref lop, _) = *lhs {

diff --git a/clippy_lints/src/vec.rs b/clippy_lints/src/vec.rs
index fafe39170bb3f199c0a85b5e658bdfbe97265dc7..a8d2701ccfa829f44ad69737ff2d96840da44e2b 100644 (file)
--- a/clippy_lints/src/vec.rs
+++ b/clippy_lints/src/vec.rs
@@ -81,9 +81,11 @@ fn check_vec_macro(cx: &LateContext, vec_args: &higher::VecArgs, span: Span) {
         },
     };
 
-    span_lint_and_then(cx, USELESS_VEC, span, "useless use of `vec!`", |db| {
-        db.span_suggestion(span, "you can use a slice directly", snippet);
-    });
+    span_lint_and_then(cx,
+                       USELESS_VEC,
+                       span,
+                       "useless use of `vec!`",
+                       |db| { db.span_suggestion(span, "you can use a slice directly", snippet); });
 }
 
 /// Return the item type of the vector (ie. the `T` in `Vec<T>`).