Auto merge of #7100 - ABouttefeux:unused_io_amount, r=camsteffen

[rust.git] / tests / fmt.rs

diff --git a/tests/fmt.rs b/tests/fmt.rs
index d7544bc50b21ff204e4ca01f9c496b55de69c511..7616d8001e8853bb8e9de4e44659d01b3253bd6f 100644 (file)
--- a/tests/fmt.rs
+++ b/tests/fmt.rs
@@ -1,14 +1,27 @@
+use std::path::PathBuf;
+use std::process::Command;
+
 #[test]
 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", "--toolchain", "nightly"])
+        .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(&["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();
 
@@ -16,5 +29,8 @@ fn fmt() {
     println!("stdout: {}", String::from_utf8_lossy(&output.stdout));
     println!("stderr: {}", String::from_utf8_lossy(&output.stderr));
 
-    assert!(output.status.success());
+    assert!(
+        output.status.success(),
+        "Formatting check failed. Run `cargo dev fmt` to update formatting."
+    );
 }