}
struct ClippyCmd {
- unstable_options: bool,
cargo_subcommand: &'static str,
args: Vec<String>,
clippy_args: Vec<String>,
panic!("Usage of `--fix` requires `-Z unstable-options`");
}
- // Run the dogfood tests directly on nightly cargo. This is required due
- // to a bug in rustup.rs when running cargo on custom toolchains. See issue #3118.
- if env::var_os("CLIPPY_DOGFOOD").is_some() && cfg!(windows) {
- args.insert(0, "+nightly".to_string());
- }
-
let mut clippy_args: Vec<String> = old_args.collect();
if cargo_subcommand == "fix" && !clippy_args.iter().any(|arg| arg == "--no-deps") {
clippy_args.push("--no-deps".into());
}
ClippyCmd {
- unstable_options,
cargo_subcommand,
args,
clippy_args,
}
}
- fn path_env(&self) -> &'static str {
- if self.unstable_options {
- "RUSTC_WORKSPACE_WRAPPER"
- } else {
- "RUSTC_WRAPPER"
- }
- }
-
fn path() -> PathBuf {
let mut path = env::current_exe()
.expect("current executable path invalid")
.map(|arg| format!("{}__CLIPPY_HACKERY__", arg))
.collect();
- cmd.env(self.path_env(), Self::path())
+ cmd.env("RUSTC_WORKSPACE_WRAPPER", Self::path())
.envs(ClippyCmd::target_dir())
.env("CLIPPY_ARGS", clippy_args)
.arg(self.cargo_subcommand)
#[should_panic]
fn fix_without_unstable() {
let args = "cargo clippy --fix".split_whitespace().map(ToString::to_string);
- let _ = ClippyCmd::new(args);
+ ClippyCmd::new(args);
}
#[test]
.map(ToString::to_string);
let cmd = ClippyCmd::new(args);
assert_eq!("fix", cmd.cargo_subcommand);
- assert_eq!("RUSTC_WORKSPACE_WRAPPER", cmd.path_env());
assert!(cmd.args.iter().any(|arg| arg.ends_with("unstable-options")));
}
let args = "cargo clippy".split_whitespace().map(ToString::to_string);
let cmd = ClippyCmd::new(args);
assert_eq!("check", cmd.cargo_subcommand);
- assert_eq!("RUSTC_WRAPPER", cmd.path_env());
- }
-
- #[test]
- fn check_unstable() {
- let args = "cargo clippy -Zunstable-options"
- .split_whitespace()
- .map(ToString::to_string);
- let cmd = ClippyCmd::new(args);
- assert_eq!("check", cmd.cargo_subcommand);
- assert_eq!("RUSTC_WORKSPACE_WRAPPER", cmd.path_env());
}
}