X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=tests%2Ffmt.rs;h=be42f1fbb2023b4bb5bd8d4e2937be64cafa6f80;hb=1c8085d705849e528bf754e9db3b0e0521883d6d;hp=e2675fa09683996dd37790064905621460b78f8d;hpb=1717a6f7d5784275337600bc534e35243471c1c5;p=rust.git

diff --git a/tests/fmt.rs b/tests/fmt.rs
index e2675fa0968..be42f1fbb20 100644
--- a/tests/fmt.rs
+++ b/tests/fmt.rs
@@ -1,13 +1,16 @@
+#![cfg_attr(feature = "deny-warnings", deny(warnings))]
+#![warn(rust_2018_idioms, unused_lifetimes)]
+
 use std::path::PathBuf;
 use std::process::Command;
 
 #[test]
 fn fmt() {
-    if option_env!("RUSTC_TEST_SUITE").is_some() || option_env!("GHA_CI").is_some() {
+    if option_env!("RUSTC_TEST_SUITE").is_some() || option_env!("NO_FMT_TEST").is_some() {
         return;
     }
 
-    // Skip this test if rustup nightly is unavailable
+    // Skip this test if nightly rustfmt is unavailable
     let rustup_output = Command::new("rustup")
         .args(&["component", "list", "--toolchain", "nightly"])
         .output()
@@ -19,12 +22,9 @@ fn fmt() {
     }
 
     let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    let dev_dir = root_dir.join("clippy_dev");
-    let target_dir = root_dir.join("target");
-    let target_dir = target_dir.to_str().unwrap();
     let output = Command::new("cargo")
-        .current_dir(dev_dir)
-        .args(&["+nightly", "run", "--target-dir", target_dir, "--", "fmt", "--check"])
+        .current_dir(root_dir)
+        .args(&["dev", "fmt", "--check"])
         .output()
         .unwrap();