Fmt and address comment

src/librustc_codegen_ssa/back/linker.rs

@@ -156,8 +156,9 @@ impl<'a> GccLinker<'a> {
         // * On OSX they have their own linker, not binutils'
         // * For WebAssembly/JS the only functional linker is LLD, which doesn't
         //   support hint flags
-        !self.sess.target.target.options.is_like_osx && self.sess.target.target.arch != "wasm32" &&
-            self.sess.target.target.arch != "asmjs"
+        !self.sess.target.target.options.is_like_osx
+            && self.sess.target.target.arch != "wasm32"
+            && self.sess.target.target.arch != "asmjs"
     }
 
     // Some platforms take hints about whether a library is static or dynamic.
@@ -869,7 +870,13 @@ impl<'a> Linker for EmLinker<'a> {
             DebugInfo::Limited => "-g3",
             // FIXME: wasm2js errors with -g3 and above because it does not support source maps.
             // See https://github.com/WebAssembly/binaryen/issues/2410
-            DebugInfo::Full => if self.sess.target.target.arch == "asmjs" { "-g3" } else { "-g4" },
+            DebugInfo::Full => {
+                if self.sess.target.target.arch == "asmjs" {
+                    "-g3"
+                } else {
+                    "-g4"
+                }
+            }
         });
     }
 

src/libstd/sys/mod.rs

@@ -41,7 +41,7 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "wasi")] {
         mod wasi;
         pub use self::wasi::*;
-    } else if #[cfg(any(target_arch = "wasm32", target_arch = "asmjs"))] {
+    } else if #[cfg(target_arch = "wasm32")] {
         mod wasm;
         pub use self::wasm::*;
     } else if #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] {

src/libstd/thread/mod.rs

@@ -203,7 +203,10 @@ pub use self::local::fast::Key as __FastLocalKeyInner;
 #[doc(hidden)]
 pub use self::local::os::Key as __OsLocalKeyInner;
 #[unstable(feature = "libstd_thread_internals", issue = "none")]
-#[cfg(all(any(target_arch = "wasm32", target_arch = "asmjs"), not(target_feature = "atomics")))]
+#[cfg(all(
+    any(target_arch = "wasm32", target_arch = "asmjs"),
+    not(target_feature = "atomics")
+))]
 #[doc(hidden)]
 pub use self::local::statik::Key as __StaticLocalKeyInner;
 

src/libtest/tests.rs

@@ -188,8 +188,8 @@ fn test_should_panic_bad_message() {
 
 #[test]
 fn test_should_panic_non_string_message_type() {
-    use std::any::TypeId;
     use crate::tests::TrFailedMsg;
+    use std::any::TypeId;
     fn f() {
         panic!(1i32);
     }