#![cfg_attr(feature = "deny-warnings", deny(warnings))]
+// warn on lints, that are included in `rust-lang/rust`s bootstrap
+#![warn(rust_2018_idioms, unused_lifetimes)]
use rustc_tools_util::VersionInfo;
use std::env;
}
struct ClippyCmd {
- unstable_options: bool,
cargo_subcommand: &'static str,
args: Vec<String>,
- clippy_args: String,
+ clippy_args: Vec<String>,
}
impl ClippyCmd {
"--fix" => {
cargo_subcommand = "fix";
continue;
- }
+ },
"--" => break,
// Cover -Zunstable-options and -Z unstable-options
s if s.ends_with("unstable-options") => unstable_options = true,
- _ => {}
+ _ => {},
}
args.push(arg);
args.insert(0, "+nightly".to_string());
}
- let clippy_args: String = old_args.map(|arg| format!("{}__CLIPPY_HACKERY__", arg)).collect();
+ 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(&self) -> PathBuf {
+ fn path() -> PathBuf {
let mut path = env::current_exe()
.expect("current executable path invalid")
.with_file_name("clippy-driver");
.map(|p| ("CARGO_TARGET_DIR", p))
}
- fn to_std_cmd(self) -> Command {
+ fn into_std_cmd(self) -> Command {
let mut cmd = Command::new("cargo");
+ let clippy_args: String = self
+ .clippy_args
+ .iter()
+ .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", self.clippy_args)
+ .env("CLIPPY_ARGS", clippy_args)
.arg(self.cargo_subcommand)
.args(&self.args);
{
let cmd = ClippyCmd::new(old_args);
- let mut cmd = cmd.to_std_cmd();
+ let mut cmd = cmd.into_std_cmd();
let exit_status = cmd
.spawn()
#[cfg(test)]
mod tests {
- use super::*;
+ use super::ClippyCmd;
#[test]
#[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().find(|arg| arg.ends_with("unstable-options")).is_some());
+ assert!(cmd.args.iter().any(|arg| arg.ends_with("unstable-options")));
}
#[test]
- fn check() {
- let args = "cargo clippy".split_whitespace().map(ToString::to_string);
+ fn fix_implies_no_deps() {
+ let args = "cargo clippy --fix -Zunstable-options"
+ .split_whitespace()
+ .map(ToString::to_string);
let cmd = ClippyCmd::new(args);
- assert_eq!("check", cmd.cargo_subcommand);
- assert_eq!("RUSTC_WRAPPER", cmd.path_env());
+ assert!(cmd.clippy_args.iter().any(|arg| arg == "--no-deps"));
}
#[test]
- fn check_unstable() {
- let args = "cargo clippy -Zunstable-options"
+ fn no_deps_not_duplicated_with_fix() {
+ let args = "cargo clippy --fix -Zunstable-options -- --no-deps"
.split_whitespace()
.map(ToString::to_string);
let cmd = ClippyCmd::new(args);
+ assert_eq!(cmd.clippy_args.iter().filter(|arg| *arg == "--no-deps").count(), 1);
+ }
+
+ #[test]
+ fn check() {
+ let args = "cargo clippy".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());
}
}