Fix format and tidy for code moved from rayon

4 files changed, 11 insertions, 31 deletions

diff --git a/compiler/rustc_thread_pool/tests/double_init_fail.rs b/compiler/rustc_thread_pool/tests/double_init_fail.rs
index 15915304ddc..71ed425bb32 100644
--- a/compiler/rustc_thread_pool/tests/double_init_fail.rs
+++ b/compiler/rustc_thread_pool/tests/double_init_fail.rs
@@ -1,6 +1,7 @@
-use rayon_core::ThreadPoolBuilder;
 use std::error::Error;
 
+use rayon_core::ThreadPoolBuilder;
+
 #[test]
 #[cfg_attr(any(target_os = "emscripten", target_family = "wasm"), ignore)]
 fn double_init_fail() {
@@ -8,8 +9,5 @@ fn double_init_fail() {
     assert!(result1.is_ok());
     let err = ThreadPoolBuilder::new().build_global().unwrap_err();
     assert!(err.source().is_none());
-    assert_eq!(
-        err.to_string(),
-        "The global thread pool has already been initialized.",
-    );
+    assert_eq!(err.to_string(), "The global thread pool has already been initialized.",);
 }
diff --git a/compiler/rustc_thread_pool/tests/init_zero_threads.rs b/compiler/rustc_thread_pool/tests/init_zero_threads.rs
index 3c1ad251c7e..c1770e57f3c 100644
--- a/compiler/rustc_thread_pool/tests/init_zero_threads.rs
+++ b/compiler/rustc_thread_pool/tests/init_zero_threads.rs
@@ -3,8 +3,5 @@ use rayon_core::ThreadPoolBuilder;
 #[test]
 #[cfg_attr(any(target_os = "emscripten", target_family = "wasm"), ignore)]
 fn init_zero_threads() {
-    ThreadPoolBuilder::new()
-        .num_threads(0)
-        .build_global()
-        .unwrap();
+    ThreadPoolBuilder::new().num_threads(0).build_global().unwrap();
 }
diff --git a/compiler/rustc_thread_pool/tests/scoped_threadpool.rs b/compiler/rustc_thread_pool/tests/scoped_threadpool.rs
index 932147179f5..8cc2c859c0c 100644
--- a/compiler/rustc_thread_pool/tests/scoped_threadpool.rs
+++ b/compiler/rustc_thread_pool/tests/scoped_threadpool.rs
@@ -10,9 +10,7 @@ scoped_tls::scoped_thread_local!(static LOCAL: Local);
 #[cfg_attr(any(target_os = "emscripten", target_family = "wasm"), ignore)]
 fn missing_scoped_tls() {
     LOCAL.set(&Local(42), || {
-        let pool = ThreadPoolBuilder::new()
-            .build()
-            .expect("thread pool created");
+        let pool = ThreadPoolBuilder::new().build().expect("thread pool created");
 
         // `LOCAL` is not set in the pool.
         pool.install(|| {
diff --git a/compiler/rustc_thread_pool/tests/stack_overflow_crash.rs b/compiler/rustc_thread_pool/tests/stack_overflow_crash.rs
index a6494069212..c7a880de8bb 100644
--- a/compiler/rustc_thread_pool/tests/stack_overflow_crash.rs
+++ b/compiler/rustc_thread_pool/tests/stack_overflow_crash.rs
@@ -1,10 +1,9 @@
-use rayon_core::ThreadPoolBuilder;
-
 use std::env;
-use std::process::{Command, ExitStatus, Stdio};
-
 #[cfg(target_os = "linux")]
 use std::os::unix::process::ExitStatusExt;
+use std::process::{Command, ExitStatus, Stdio};
+
+use rayon_core::ThreadPoolBuilder;
 
 fn force_stack_overflow(depth: u32) {
     let mut buffer = [0u8; 1024 * 1024];
@@ -18,13 +17,7 @@ fn force_stack_overflow(depth: u32) {
 #[cfg(unix)]
 fn disable_core() {
     unsafe {
-        libc::setrlimit(
-            libc::RLIMIT_CORE,
-            &libc::rlimit {
-                rlim_cur: 0,
-                rlim_max: 0,
-            },
-        );
+        libc::setrlimit(libc::RLIMIT_CORE, &libc::rlimit { rlim_cur: 0, rlim_max: 0 });
     }
 }
 
@@ -50,10 +43,7 @@ fn stack_overflow_crash() {
     #[cfg(any(unix, windows))]
     assert_eq!(status.code(), overflow_code());
     #[cfg(target_os = "linux")]
-    assert!(matches!(
-        status.signal(),
-        Some(libc::SIGABRT | libc::SIGSEGV)
-    ));
+    assert!(matches!(status.signal(), Some(libc::SIGABRT | libc::SIGSEGV)));
 
     // Now run with a larger stack and verify correct operation.
     let status = run_ignored("run_with_large_stack");
@@ -86,10 +76,7 @@ fn run_with_large_stack() {
 }
 
 fn run_with_stack(stack_size_in_mb: usize) {
-    let pool = ThreadPoolBuilder::new()
-        .stack_size(stack_size_in_mb * 1024 * 1024)
-        .build()
-        .unwrap();
+    let pool = ThreadPoolBuilder::new().stack_size(stack_size_in_mb * 1024 * 1024).build().unwrap();
     pool.install(|| {
         #[cfg(unix)]
         disable_core();