Auto merge of #3529 - matthiaskrgr:rustfmt_tests, r=phansch

rustfmt tests

also fails CI if tests turn out to not be formatted properly.

ci/base-tests.sh

@@ -29,3 +29,21 @@ cd clippy_dev && cargo test && cd ..
 # Perform various checks for lint registration
 ./util/dev update_lints --check
 cargo +nightly fmt --all -- --check
+
+
+#avoid loop spam
+set +ex
+# make sure tests are formatted
+
+# some lints are sensitive to formatting, exclude some files
+needs_formatting=false
+for file in `find tests -not -path "tests/ui/methods.rs" -not -path "tests/ui/format.rs" -not -path "tests/ui/formatting.rs" -not -path "tests/ui/empty_line_after_outer_attribute.rs" -not -path "tests/ui/double_parens.rs" -not -path "tests/ui/doc.rs" -not -path "tests/ui/unused_unit.rs" | grep "\.rs$"` ; do
+rustfmt ${file} --check  || echo "${file} needs reformatting!" ; needs_formatting=true
+done
+
+if [ "${needs_reformatting}" = true] ; then
+    echo "Tests need reformatting!"
+    exit 2
+fi
+
+set -ex

tests/auxiliary/test_macro.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 pub trait A {}
 
 macro_rules! __implicit_hasher_test_macro {

tests/run-pass/associated-constant-ice.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 pub trait Trait {
     const CONSTANT: u8;
 }

tests/run-pass/cc_seme.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 #[allow(dead_code)]
 enum Baz {
     One,
@@ -19,18 +18,15 @@ struct Test {
     b: Baz,
 }
 
-fn main() { }
+fn main() {}
 
 pub fn foo() {
     use Baz::*;
     let x = Test { t: Some(0), b: One };
 
     match x {
         Test { t: Some(_), b: One } => unreachable!(),
-        Test {
-            t: Some(42),
-            b: Two,
-        } => unreachable!(),
+        Test { t: Some(42), b: Two } => unreachable!(),
         Test { t: None, .. } => unreachable!(),
         Test { .. } => unreachable!(),
     }

tests/run-pass/enum-glob-import-crate.rs

@@ -7,12 +7,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![deny(clippy::all)]
 #![allow(unused_imports)]
 
 use std::*;
 
-fn main() { }
+fn main() {}

tests/run-pass/ice-1588.rs

@@ -7,17 +7,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![allow(clippy::all)]
 
 fn main() {
     match 1 {
-        1 => {}
+        1 => {},
         2 => {
             [0; 1];
-        }
-        _ => {}
+        },
+        _ => {},
     }
 }

tests/run-pass/ice-1782.rs

@@ -7,20 +7,28 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 #![allow(dead_code, unused_variables)]
 
 /// Should not trigger an ICE in `SpanlessEq` / `consts::constant`
 ///
 /// Issue: https://github.com/rust-lang/rust-clippy/issues/1782
-
 use std::{mem, ptr};
 
 fn spanless_eq_ice() {
     let txt = "something";
     match txt {
-        "something" => unsafe { ptr::write(ptr::null_mut() as *mut u32, mem::transmute::<[u8; 4], _>([0, 0, 0, 255])) },
-        _ => unsafe { ptr::write(ptr::null_mut() as *mut u32, mem::transmute::<[u8; 4], _>([13, 246, 24, 255])) },
+        "something" => unsafe {
+            ptr::write(
+                ptr::null_mut() as *mut u32,
+                mem::transmute::<[u8; 4], _>([0, 0, 0, 255]),
+            )
+        },
+        _ => unsafe {
+            ptr::write(
+                ptr::null_mut() as *mut u32,
+                mem::transmute::<[u8; 4], _>([13, 246, 24, 255]),
+            )
+        },
     }
 }
 

tests/run-pass/ice-1969.rs

@@ -7,12 +7,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![allow(clippy::all)]
 
-fn main() { }
+fn main() {}
 
 pub trait Convert {
     type Action: From<*const f64>;

tests/run-pass/ice-2499.rs

@@ -7,9 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![allow(dead_code, clippy::char_lit_as_u8, clippy::needless_bool)]
 
 /// Should not trigger an ICE in `SpanlessHash` / `consts::constant`
@@ -20,15 +17,17 @@ fn f(s: &[u8]) -> bool {
     let t = s[0] as char;
 
     match t {
-        'E' | 'W' => {}
-        'T' => if s[0..4] != ['0' as u8; 4] {
-            return false;
-        } else {
-            return true;
+        'E' | 'W' => {},
+        'T' => {
+            if s[0..4] != ['0' as u8; 4] {
+                return false;
+            } else {
+                return true;
+            }
         },
         _ => {
             return false;
-        }
+        },
     }
     true
 }

tests/run-pass/ice-2594.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 #![allow(dead_code, unused_variables)]
 
 /// Should not trigger an ICE in `SpanlessHash` / `consts::constant`
@@ -21,7 +20,7 @@ fn spanless_hash_ice() {
     match txt {
         "something" => {
             let mut headers = [empty_header; 1];
-        }
+        },
         "" => (),
         _ => (),
     }

tests/run-pass/ice-2727.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 pub fn f(new: fn()) {
     new();
 }

tests/run-pass/ice-2760.rs

@@ -7,11 +7,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
-#![allow(unused_variables, clippy::blacklisted_name,
-         clippy::needless_pass_by_value, dead_code)]
+#![allow(
+    unused_variables,
+    clippy::blacklisted_name,
+    clippy::needless_pass_by_value,
+    dead_code
+)]
 
 // This should not compile-fail with:
 //

tests/run-pass/ice-2774.rs

@@ -7,9 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 use std::collections::HashSet;
 
 // See https://github.com/rust-lang/rust-clippy/issues/2774
@@ -26,18 +23,14 @@ pub struct Foo {}
 // This should not cause a 'cannot relate bound region' ICE
 pub fn add_barfoos_to_foos<'a>(bars: &HashSet<&'a Bar>) {
     let mut foos = HashSet::new();
-    foos.extend(
-        bars.iter().map(|b| &b.foo)
-    );
+    foos.extend(bars.iter().map(|b| &b.foo));
 }
 
 #[allow(clippy::implicit_hasher)]
 // Also this should not cause a 'cannot relate bound region' ICE
 pub fn add_barfoos_to_foos2(bars: &HashSet<&Bar>) {
     let mut foos = HashSet::new();
-    foos.extend(
-        bars.iter().map(|b| &b.foo)
-    );
+    foos.extend(bars.iter().map(|b| &b.foo));
 }
 
 fn main() {}

tests/run-pass/ice-2865.rs

@@ -7,10 +7,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 #[allow(dead_code)]
 struct Ice {
-    size: String
+    size: String,
 }
 
 impl<'a> From<String> for Ice {

tests/run-pass/ice-3151.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 #[derive(Clone)]
 pub struct HashMap<V, S> {
     hash_builder: S,
@@ -17,7 +16,7 @@ pub struct HashMap<V, S> {
 #[derive(Clone)]
 pub struct RawTable<V> {
     size: usize,
-    val: V
+    val: V,
 }
 
-fn main() {}
+fn main() {}

tests/run-pass/ice-700.rs

@@ -7,9 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![deny(clippy::all)]
 
 fn core() {}

tests/run-pass/ice_exacte_size.rs

@@ -7,9 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![deny(clippy::all)]
 
 #[allow(dead_code)]

tests/run-pass/if_same_then_else.rs

@@ -7,9 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![deny(clippy::if_same_then_else)]
 
 fn main() {}

tests/run-pass/issue-2862.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 pub trait FooMap {
     fn map<B, F: Fn() -> B>(&self, f: F) -> B;
 }

tests/run-pass/issue-825.rs

@@ -7,14 +7,23 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 #![allow(warnings)]
 
 // this should compile in a reasonable amount of time
 fn rust_type_id(name: &str) {
-    if "bool" == &name[..] || "uint" == &name[..] || "u8" == &name[..] || "u16" == &name[..] || "u32" == &name[..]
-        || "f32" == &name[..] || "f64" == &name[..] || "i8" == &name[..] || "i16" == &name[..]
-        || "i32" == &name[..] || "i64" == &name[..] || "Self" == &name[..] || "str" == &name[..]
+    if "bool" == &name[..]
+        || "uint" == &name[..]
+        || "u8" == &name[..]
+        || "u16" == &name[..]
+        || "u32" == &name[..]
+        || "f32" == &name[..]
+        || "f64" == &name[..]
+        || "i8" == &name[..]
+        || "i16" == &name[..]
+        || "i32" == &name[..]
+        || "i64" == &name[..]
+        || "Self" == &name[..]
+        || "str" == &name[..]
     {
         unreachable!();
     }

tests/run-pass/issues_loop_mut_cond.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 #![allow(dead_code)]
 
 /// Issue: https://github.com/rust-lang/rust-clippy/issues/2596

tests/run-pass/match_same_arms_const.rs

@@ -7,9 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![deny(clippy::match_same_arms)]
 
 const PRICE_OF_SWEETS: u32 = 5;
@@ -21,7 +18,7 @@ pub fn price(thing: &str) -> u32 {
         "rolo" => PRICE_OF_SWEETS,
         "advice" => PRICE_OF_KINDNESS,
         "juice" => PRICE_OF_DRINKS,
-        _ => panic!()
+        _ => panic!(),
     }
 }
 

tests/run-pass/mut_mut_macro.rs

@@ -7,9 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 #![deny(clippy::mut_mut, clippy::zero_ptr, clippy::cmp_nan)]
 #![allow(dead_code)]