Reformat code

Author: dp304

clippy_lints/src/utils/mod.rs

@@ -523,7 +523,6 @@ pub fn contains_name(name: Symbol, expr: &Expr<'_>) -> bool {
     cn.result
 }
 
-
 struct FindMacroCalls<'a> {
     names: Vec<&'a str>,
     result: Vec<Span>,
@@ -533,10 +532,7 @@ impl<'a, 'tcx> Visitor<'tcx> for FindMacroCalls<'a> {
     type Map = Map<'tcx>;
 
     fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
-        if self.names
-            .iter()
-            .any(|fun| is_expn_of(expr.span, fun).is_some())
-        {
+        if self.names.iter().any(|fun| is_expn_of(expr.span, fun).is_some()) {
             self.result.push(expr.span);
         }
         // and check sub-expressions
@@ -549,9 +545,11 @@ impl<'a, 'tcx> Visitor<'tcx> for FindMacroCalls<'a> {
 }
 
 /// Finds calls of the specified macros in a function body.
-pub fn find_macro_calls(names: Vec<&str>, body: &'tcx Body<'tcx>) -> Vec<Span>
-{
-    let mut fmc = FindMacroCalls { names, result: Vec::new() };
+pub fn find_macro_calls(names: Vec<&str>, body: &'tcx Body<'tcx>) -> Vec<Span> {
+    let mut fmc = FindMacroCalls {
+        names,
+        result: Vec::new(),
+    };
     fmc.visit_expr(&body.value);
     fmc.result
 }

tests/ui/assert_in_result_fn.rs

@@ -5,13 +5,13 @@ struct A;
 impl A {
     fn result_with_assert(x: i32) -> Result<bool, String> // should emit lint
     {
-        assert!(x==5);
+        assert!(x == 5);
         Ok(true)
     }
 
     fn result_with_assert_with_message(x: i32) -> Result<bool, String> // should emit lint
     {
-        assert!(x==5, "wrong argument");
+        assert!(x == 5, "wrong argument");
         Ok(true)
     }
 
@@ -43,7 +43,7 @@ impl A {
     {
         if x < 0 {
             assert!(x % 10 != 0);
-        } else if x<=10 {
+        } else if x <= 10 {
             assert_eq!(x, 5);
         } else {
             assert_ne!(x, 1000);
@@ -53,12 +53,12 @@ impl A {
 
     fn other_with_assert(x: i32) // should not emit lint
     {
-        assert!(x==5);
+        assert!(x == 5);
     }
 
     fn other_with_assert_with_message(x: i32) // should not emit lint
     {
-        assert!(x==5, "wrong argument");
+        assert!(x == 5, "wrong argument");
     }
 
     fn other_with_assert_eq(x: i32) // should not emit lint
@@ -85,7 +85,7 @@ impl A {
     {
         if x < 0 {
             assert!(x % 10 != 0);
-        } else if x<=10 {
+        } else if x <= 10 {
             assert_eq!(x, 5);
         } else {
             assert_ne!(x, 1000);
@@ -105,7 +105,7 @@ fn assert() {}
 
 fn function_result_with_assert(x: i32) -> Result<bool, String> // should emit lint
 {
-    assert!(x==5);
+    assert!(x == 5);
     Ok(true)
 }
 

tests/ui/assert_in_result_fn.stderr

@@ -3,7 +3,7 @@ error: used `assert!()`, `assert_eq!()` or `assert_ne!()` in a function that ret
    |
 LL | /     fn result_with_assert(x: i32) -> Result<bool, String> // should emit lint
 LL | |     {
-LL | |         assert!(x==5);
+LL | |         assert!(x == 5);
 LL | |         Ok(true)
 LL | |     }
    | |_____^
@@ -13,16 +13,16 @@ LL | |     }
 note: return Err() if the condition is false instead of asserting
   --> $DIR/assert_in_result_fn.rs:8:9
    |
-LL |         assert!(x==5);
-   |         ^^^^^^^^^^^^^^
+LL |         assert!(x == 5);
+   |         ^^^^^^^^^^^^^^^^
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: used `assert!()`, `assert_eq!()` or `assert_ne!()` in a function that returns `Result`
   --> $DIR/assert_in_result_fn.rs:12:5
    |
 LL | /     fn result_with_assert_with_message(x: i32) -> Result<bool, String> // should emit lint
 LL | |     {
-LL | |         assert!(x==5, "wrong argument");
+LL | |         assert!(x == 5, "wrong argument");
 LL | |         Ok(true)
 LL | |     }
    | |_____^
@@ -31,8 +31,8 @@ LL | |     }
 note: return Err() if the condition is false instead of asserting
   --> $DIR/assert_in_result_fn.rs:14:9
    |
-LL |         assert!(x==5, "wrong argument");
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         assert!(x == 5, "wrong argument");
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: used `assert!()`, `assert_eq!()` or `assert_ne!()` in a function that returns `Result`
@@ -125,7 +125,7 @@ note: return Err() if the condition is false instead of asserting
    |
 LL |             assert!(x % 10 != 0);
    |             ^^^^^^^^^^^^^^^^^^^^^
-LL |         } else if x<=10 {
+LL |         } else if x <= 10 {
 LL |             assert_eq!(x, 5);
    |             ^^^^^^^^^^^^^^^^^
 LL |         } else {
@@ -138,7 +138,7 @@ error: used `assert!()`, `assert_eq!()` or `assert_ne!()` in a function that ret
    |
 LL | / fn function_result_with_assert(x: i32) -> Result<bool, String> // should emit lint
 LL | | {
-LL | |     assert!(x==5);
+LL | |     assert!(x == 5);
 LL | |     Ok(true)
 LL | | }
    | |_^
@@ -147,8 +147,8 @@ LL | | }
 note: return Err() if the condition is false instead of asserting
   --> $DIR/assert_in_result_fn.rs:108:5
    |
-LL |     assert!(x==5);
-   |     ^^^^^^^^^^^^^^
+LL |     assert!(x == 5);
+   |     ^^^^^^^^^^^^^^^^
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: used `assert!()`, `assert_eq!()` or `assert_ne!()` in a function that returns `Result`