+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 rustup nightly is unavailable
+ // Skip this test if nightly rustfmt is unavailable
let rustup_output = Command::new("rustup")
.args(&["component", "list", "--toolchain", "nightly"])
.output()
return;
}
- let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
- let dev_dir = root_dir.join("clippy_dev");
+ let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
let output = Command::new("cargo")
- .current_dir(dev_dir)
- .args(&["+nightly", "run", "--", "fmt", "--check"])
+ .current_dir(root_dir)
+ .args(&["dev", "fmt", "--check"])
.output()
.unwrap();
assert!(
output.status.success(),
- "Formatting check failed. Run `./util/dev fmt` to update formatting."
+ "Formatting check failed. Run `cargo dev fmt` to update formatting."
);
}