X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=tests%2Ffmt.rs;h=383702dd439cfb46acbd9c26f516adfab5d4d61c;hb=f5bbd1b5299da31532d00abb0502feb5b60f2606;hp=4df93cf5a085506e2119cafe53a5289f15e88928;hpb=5441cf26a0bc49b9233bdbc702d962faf7d52c48;p=rust.git

diff --git a/tests/fmt.rs b/tests/fmt.rs
index 4df93cf5a08..383702dd439 100644
--- a/tests/fmt.rs
+++ b/tests/fmt.rs
@@ -1,15 +1,27 @@
+#![cfg_attr(feature = "deny-warnings", deny(warnings))]
+#![warn(rust_2018_idioms, unused_lifetimes)]
+
+use std::path::PathBuf;
+use std::process::Command;
+
 #[test]
-#[ignore]
 fn fmt() {
-    if option_env!("RUSTC_TEST_SUITE").is_some() {
+    if option_env!("RUSTC_TEST_SUITE").is_some() || option_env!("NO_FMT_TEST").is_some() {
+        return;
+    }
+
+    // Skip this test if nightly rustfmt is unavailable
+    let rustup_output = Command::new("rustup").args(&["component", "list"]).output().unwrap();
+    assert!(rustup_output.status.success());
+    let component_output = String::from_utf8_lossy(&rustup_output.stdout);
+    if !component_output.contains("rustfmt") {
         return;
     }
 
-    let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    let dev_dir = root_dir.join("clippy_dev");
-    let output = std::process::Command::new("cargo")
-        .current_dir(dev_dir)
-        .args(&["+nightly", "run", "--", "fmt", "--check"])
+    let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    let output = Command::new("cargo")
+        .current_dir(root_dir)
+        .args(&["dev", "fmt", "--check"])
         .output()
         .unwrap();
 
@@ -19,6 +31,6 @@ fn fmt() {
 
     assert!(
         output.status.success(),
-        "Formatting check failed. Run `./util/dev fmt` to update formatting."
+        "Formatting check failed. Run `cargo dev fmt` to update formatting."
     );
 }