Run rustfmt on tests/run-make/.

With the exception of `tests/run-make/translation/test.rs`, which has a
syntax error.

The expected output in `rustdoc-error-lines/rmake.rs`'s required slight
tweaking.

The two `reproducible-build.rs` files need `// ignore-tidy-linelength`
because rustfmt produces lines longer than 100 chars, which tidy doesn't
like, yuk.

Author: nnethercote

rustfmt.toml

@@ -20,7 +20,7 @@ ignore = [
     "/tests/incremental/",
     "/tests/mir-opt/",
     "/tests/pretty/",
-    "/tests/run-make/",
+    "/tests/run-make/translation/test.rs", # Contains syntax errors.
     "/tests/run-make-fulldeps/",
     "/tests/run-pass-valgrind/",
     "/tests/rustdoc/",

tests/run-make/a-b-a-linker-guard/a.rs

@@ -2,7 +2,7 @@
 #![crate_type = "dylib"]
 
 #[cfg(x)]
-pub fn foo(x: u32) { }
+pub fn foo(x: u32) {}
 
 #[cfg(y)]
-pub fn foo(x: i32) { }
+pub fn foo(x: i32) {}

tests/run-make/allow-non-lint-warnings-cmdline/foo.rs

@@ -2,4 +2,4 @@
 #[derive(Copy, Clone)]
 pub struct Foo;
 
-pub fn main() { }
+pub fn main() {}

tests/run-make/allow-warnings-cmdline-stability/foo.rs

@@ -2,4 +2,6 @@
 
 extern crate bar;
 
-pub fn main() { bar::baz() }
+pub fn main() {
+    bar::baz()
+}

tests/run-make/atomic-lock-free/atomic_lock_free.rs

@@ -1,5 +1,5 @@
 #![feature(no_core, intrinsics, lang_items)]
-#![crate_type="rlib"]
+#![crate_type = "rlib"]
 #![no_core]
 
 extern "rust-intrinsic" {

tests/run-make/bare-outfile/foo.rs

@@ -1,2 +1 @@
-fn main() {
-}
+fn main() {}

tests/run-make/box-struct-no-segfault/foo.rs

@@ -1,8 +1,8 @@
-#![crate_type="lib"]
+#![crate_type = "lib"]
 pub struct Foo(());
 
 impl Foo {
-  pub fn new() -> Foo {
-    Foo(())
-  }
+    pub fn new() -> Foo {
+        Foo(())
+    }
 }

tests/run-make/box-struct-no-segfault/main.rs

@@ -1,7 +1,7 @@
-#![crate_type="lib"]
+#![crate_type = "lib"]
 extern crate foo;
 use foo::Foo;
 
 pub fn crash() -> Box<Foo> {
-  Box::new(Foo::new())
+    Box::new(Foo::new())
 }

tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs

@@ -1,16 +1,16 @@
 #![crate_type = "staticlib"]
 #![feature(c_variadic)]
 
-use std::ffi::{c_char, c_double, c_int, c_long, c_longlong};
 use std::ffi::VaList;
-use std::ffi::{CString, CStr};
+use std::ffi::{c_char, c_double, c_int, c_long, c_longlong};
+use std::ffi::{CStr, CString};
 
 macro_rules! continue_if {
     ($cond:expr) => {
         if !($cond) {
             return 0xff;
         }
-    }
+    };
 }
 
 unsafe fn compare_c_str(ptr: *const c_char, val: &str) -> bool {
@@ -59,13 +59,11 @@ pub unsafe extern "C" fn check_list_copy_0(mut ap: VaList) -> usize {
     continue_if!(ap.arg::<c_int>() == 16);
     continue_if!(ap.arg::<c_char>() == 'A' as c_char);
     continue_if!(compare_c_str(ap.arg::<*const c_char>(), "Skip Me!"));
-    ap.with_copy(|mut ap| {
-        if compare_c_str(ap.arg::<*const c_char>(), "Correct") {
-            0
-        } else {
-            0xff
-        }
-    })
+    ap.with_copy(
+        |mut ap| {
+            if compare_c_str(ap.arg::<*const c_char>(), "Correct") { 0 } else { 0xff }
+        },
+    )
 }
 
 #[no_mangle]

tests/run-make/compiler-lookup-paths-2/c.rs

@@ -1,3 +1,3 @@
 #![crate_type = "lib"]
-extern crate b;
 extern crate a;
+extern crate b;

tests/run-make/crate-data-smoke/rmake.rs

@@ -3,41 +3,20 @@ use std::process::Output;
 use run_make_support::{bin_name, rust_lib_name, rustc};
 
 fn compare_stdout<S: AsRef<str>>(output: Output, expected: S) {
-    assert_eq!(
-        String::from_utf8(output.stdout).unwrap().trim(),
-        expected.as_ref()
-    );
+    assert_eq!(String::from_utf8(output.stdout).unwrap().trim(), expected.as_ref());
 }
 
 fn main() {
     compare_stdout(rustc().print("crate-name").input("crate.rs").run(), "foo");
+    compare_stdout(rustc().print("file-names").input("crate.rs").run(), bin_name("foo"));
     compare_stdout(
-        rustc().print("file-names").input("crate.rs").run(),
-        bin_name("foo"),
-    );
-    compare_stdout(
-        rustc()
-            .print("file-names")
-            .crate_type("lib")
-            .arg("--test")
-            .input("crate.rs")
-            .run(),
+        rustc().print("file-names").crate_type("lib").arg("--test").input("crate.rs").run(),
         bin_name("foo"),
     );
     compare_stdout(
-        rustc()
-            .print("file-names")
-            .arg("--test")
-            .input("lib.rs")
-            .run(),
+        rustc().print("file-names").arg("--test").input("lib.rs").run(),
         bin_name("mylib"),
     );
-    compare_stdout(
-        rustc().print("file-names").input("lib.rs").run(),
-        rust_lib_name("mylib"),
-    );
-    compare_stdout(
-        rustc().print("file-names").input("rlib.rs").run(),
-        rust_lib_name("mylib"),
-    );
+    compare_stdout(rustc().print("file-names").input("lib.rs").run(), rust_lib_name("mylib"));
+    compare_stdout(rustc().print("file-names").input("rlib.rs").run(), rust_lib_name("mylib"));
 }

tests/run-make/cross-lang-lto-clang/rustlib.rs

@@ -1,4 +1,4 @@
-#![crate_type="staticlib"]
+#![crate_type = "staticlib"]
 
 #[no_mangle]
 pub extern "C" fn rust_always_inlined() -> u32 {

tests/run-make/cross-lang-lto-pgo-smoketest/rustlib.rs

@@ -1,4 +1,4 @@
-#![crate_type="staticlib"]
+#![crate_type = "staticlib"]
 
 #[no_mangle]
 pub extern "C" fn rust_always_inlined() -> u32 {

tests/run-make/cross-lang-lto-upstream-rlibs/staticlib.rs

@@ -1,4 +1,4 @@
-#![crate_type="staticlib"]
+#![crate_type = "staticlib"]
 
 extern crate upstream;
 

tests/run-make/debug-assertions/debug.rs

@@ -15,19 +15,33 @@ fn main() {
 fn debug_assert_eq() {
     let mut hit1 = false;
     let mut hit2 = false;
-    debug_assert_eq!({ hit1 = true; 1 }, { hit2 = true; 2 });
+    debug_assert_eq!(
+        {
+            hit1 = true;
+            1
+        },
+        {
+            hit2 = true;
+            2
+        }
+    );
     assert!(!hit1);
     assert!(!hit2);
 }
 
 fn debug_assert() {
     let mut hit = false;
-    debug_assert!({ hit = true; false });
+    debug_assert!({
+        hit = true;
+        false
+    });
     assert!(!hit);
 }
 
 fn overflow() {
-    fn add(a: u8, b: u8) -> u8 { a + b }
+    fn add(a: u8, b: u8) -> u8 {
+        a + b
+    }
 
     add(200u8, 200u8);
 }

tests/run-make/dep-info-spaces/lib.rs

@@ -1,4 +1,4 @@
-#[path="foo foo.rs"]
+#[path = "foo foo.rs"]
 pub mod foo;
 
 pub mod bar;

tests/run-make/dep-info/lib.rs

@@ -1,4 +1,4 @@
 #![crate_name = "foo"]
 
-pub mod foo;
 pub mod bar;
+pub mod foo;

tests/run-make/deref-impl-rustdoc-ice/baz.rs

@@ -1,8 +1,10 @@
-extern crate foo;
 extern crate bar;
+extern crate foo;
 
 pub struct Bar;
 impl ::std::ops::Deref for Bar {
     type Target = bar::S;
-    fn deref(&self) -> &Self::Target { unimplemented!() }
+    fn deref(&self) -> &Self::Target {
+        unimplemented!()
+    }
 }

tests/run-make/deref-impl-rustdoc-ice/foo.rs

@@ -3,7 +3,9 @@
 extern crate proc_macro;
 
 #[proc_macro_derive(A)]
-pub fn derive(ts: proc_macro::TokenStream) -> proc_macro::TokenStream { ts }
+pub fn derive(ts: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    ts
+}
 
 #[derive(Debug)]
 struct S;

tests/run-make/dylib-chain/m2.rs

@@ -1,4 +1,6 @@
 #![crate_type = "dylib"]
 extern crate m1;
 
-pub fn m2() { m1::m1() }
+pub fn m2() {
+    m1::m1()
+}

tests/run-make/dylib-chain/m3.rs

@@ -1,4 +1,6 @@
 #![crate_type = "dylib"]
 extern crate m2;
 
-pub fn m3() { m2::m2() }
+pub fn m3() {
+    m2::m2()
+}

tests/run-make/dylib-chain/m4.rs

@@ -1,3 +1,5 @@
 extern crate m3;
 
-fn main() { m3::m3() }
+fn main() {
+    m3::m3()
+}

tests/run-make/emit/test-26235.rs

@@ -6,16 +6,22 @@ fn main() {
     type Key = u32;
     const NUM_THREADS: usize = 2;
 
-    #[derive(Clone,Copy)]
+    #[derive(Clone, Copy)]
     struct Stats<S> {
         upsert: S,
         delete: S,
         insert: S,
-        update: S
+        update: S,
     };
 
-    impl<S> Stats<S> where S: Copy {
-        fn dot<B, F, T>(self, s: Stats<T>, f: F) -> Stats<B> where F: Fn(S, T) -> B {
+    impl<S> Stats<S>
+    where
+        S: Copy,
+    {
+        fn dot<B, F, T>(self, s: Stats<T>, f: F) -> Stats<B>
+        where
+            F: Fn(S, T) -> B,
+        {
             let Stats { upsert: u1, delete: d1, insert: i1, update: p1 } = self;
             let Stats { upsert: u2, delete: d2, insert: i2, update: p2 } = s;
             Stats { upsert: f(u1, u2), delete: f(d1, d2), insert: f(i1, i2), update: f(p1, p2) }
@@ -38,9 +44,12 @@ fn main() {
     make_threads();
 
     {
-        let Stats { ref upsert, ref delete, ref insert, ref update } = stats.iter().fold(
-            Stats::new(0), |res, &s| res.dot(s, |x: Key, y: Key| x.wrapping_add(y)));
-        println!("upserts: {}, deletes: {}, inserts: {}, updates: {}",
-                 upsert, delete, insert, update);
+        let Stats { ref upsert, ref delete, ref insert, ref update } = stats
+            .iter()
+            .fold(Stats::new(0), |res, &s| res.dot(s, |x: Key, y: Key| x.wrapping_add(y)));
+        println!(
+            "upserts: {}, deletes: {}, inserts: {}, updates: {}",
+            upsert, delete, insert, update
+        );
     }
 }

tests/run-make/extern-diff-internal-name/test.rs

@@ -1,5 +1,4 @@
 #[macro_use]
 extern crate foo;
 
-fn main() {
-}
+fn main() {}

tests/run-make/extern-flag-disambiguates/a.rs

@@ -3,4 +3,6 @@
 
 static FOO: usize = 3;
 
-pub fn token() -> &'static usize { &FOO }
+pub fn token() -> &'static usize {
+    &FOO
+}

tests/run-make/extern-flag-disambiguates/b.rs

@@ -5,5 +5,9 @@ extern crate a;
 
 static FOO: usize = 3;
 
-pub fn token() -> &'static usize { &FOO }
-pub fn a_token() -> &'static usize { a::token() }
+pub fn token() -> &'static usize {
+    &FOO
+}
+pub fn a_token() -> &'static usize {
+    a::token()
+}

tests/run-make/extern-flag-disambiguates/c.rs

@@ -5,5 +5,9 @@ extern crate a;
 
 static FOO: usize = 3;
 
-pub fn token() -> &'static usize { &FOO }
-pub fn a_token() -> &'static usize { a::token() }
+pub fn token() -> &'static usize {
+    &FOO
+}
+pub fn a_token() -> &'static usize {
+    a::token()
+}

tests/run-make/extern-flag-disambiguates/d.rs

@@ -1,9 +1,13 @@
-#[cfg(before)] extern crate a;
+#[cfg(before)]
+extern crate a;
+#[cfg(after)]
+extern crate a;
 extern crate b;
 extern crate c;
-#[cfg(after)] extern crate a;
 
-fn t(a: &'static usize) -> usize { a as *const _ as usize }
+fn t(a: &'static usize) -> usize {
+    a as *const _ as usize
+}
 
 fn main() {
     assert_eq!(t(a::token()), t(b::a_token()));

tests/run-make/extern-fn-explicit-align/test.rs

@@ -1,6 +1,6 @@
 // Issue #80127: Passing structs via FFI should work with explicit alignment.
 
-use std::ffi::{CStr, c_char};
+use std::ffi::{c_char, CStr};
 use std::ptr::null_mut;
 
 #[repr(C)]
@@ -18,7 +18,7 @@ pub struct TwoU64s {
 
 #[repr(C)]
 pub struct WrappedU64s {
-    pub a: TwoU64s
+    pub a: TwoU64s,
 }
 
 #[repr(C)]