-#![feature(bool_to_option)]
#![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;
-use std::ffi::OsString;
use std::path::PathBuf;
use std::process::{self, Command};
cargo clippy [options] [--] [<opts>...]
Common options:
+ --no-deps Run Clippy only on the given crate, without linting the dependencies
+ --fix Automatically apply lint suggestions. This flag implies `--no-deps`
-h, --help Print this message
-V, --version Print version info and exit
}
struct ClippyCmd {
- unstable_options: bool,
cargo_subcommand: &'static str,
args: Vec<String>,
- rustflags: Option<String>,
- clippy_args: Option<String>,
+ clippy_args: Vec<String>,
}
impl ClippyCmd {
- fn new<I>(mut old_args: I, rustflags: Option<String>) -> Self
+ fn new<I>(mut old_args: I) -> Self
where
I: Iterator<Item = String>,
{
let mut cargo_subcommand = "check";
- let mut unstable_options = false;
let mut args = vec![];
+ let mut clippy_args: Vec<String> = vec![];
for arg in old_args.by_ref() {
match arg.as_str() {
cargo_subcommand = "fix";
continue;
},
+ "--no-deps" => {
+ clippy_args.push("--no-deps".into());
+ continue;
+ },
"--" => break,
- // Cover -Zunstable-options and -Z unstable-options
- s if s.ends_with("unstable-options") => unstable_options = true,
_ => {},
}
args.push(arg);
}
- if cargo_subcommand == "fix" && !unstable_options {
- 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());
+ clippy_args.append(&mut (old_args.collect()));
+ if cargo_subcommand == "fix" && !clippy_args.iter().any(|arg| arg == "--no-deps") {
+ clippy_args.push("--no-deps".into());
}
- let mut clippy_args = old_args.collect::<Vec<String>>().join(" ");
- if cargo_subcommand == "fix" && !clippy_args.contains("--no-deps") {
- clippy_args = format!("{} --no-deps", clippy_args);
- }
-
- let has_args = !clippy_args.is_empty();
ClippyCmd {
- unstable_options,
cargo_subcommand,
args,
- rustflags: has_args
- .then(|| rustflags.map_or_else(|| clippy_args.clone(), |flags| format!("{} {}", clippy_args, flags))),
- clippy_args: has_args.then_some(clippy_args),
- }
- }
-
- fn path_env(&self) -> &'static str {
- if self.unstable_options {
- "RUSTC_WORKSPACE_WRAPPER"
- } else {
- "RUSTC_WRAPPER"
+ clippy_args,
}
}
path
}
- fn target_dir() -> Option<(&'static str, OsString)> {
- env::var_os("CLIPPY_DOGFOOD")
- .map(|_| {
- env::var_os("CARGO_MANIFEST_DIR").map_or_else(
- || std::ffi::OsString::from("clippy_dogfood"),
- |d| {
- std::path::PathBuf::from(d)
- .join("target")
- .join("dogfood")
- .into_os_string()
- },
- )
- })
- .map(|p| ("CARGO_TARGET_DIR", p))
- }
-
fn into_std_cmd(self) -> Command {
let mut cmd = Command::new("cargo");
-
- cmd.env(self.path_env(), Self::path())
- .envs(ClippyCmd::target_dir())
+ let clippy_args: String = self
+ .clippy_args
+ .iter()
+ .map(|arg| format!("{}__CLIPPY_HACKERY__", arg))
+ .collect();
+
+ cmd.env("RUSTC_WORKSPACE_WRAPPER", Self::path())
+ .env("CLIPPY_ARGS", clippy_args)
.arg(self.cargo_subcommand)
.args(&self.args);
- // HACK: pass Clippy args to the driver *also* through RUSTFLAGS.
- // This guarantees that new builds will be triggered when Clippy flags change.
- if let (Some(clippy_args), Some(rustflags)) = (self.clippy_args, self.rustflags) {
- cmd.env("CLIPPY_ARGS", clippy_args);
- cmd.env("RUSTFLAGS", rustflags);
- }
-
cmd
}
}
where
I: Iterator<Item = String>,
{
- let cmd = ClippyCmd::new(old_args, env::var("RUSTFLAGS").ok());
+ let cmd = ClippyCmd::new(old_args);
let mut cmd = cmd.into_std_cmd();
use super::ClippyCmd;
#[test]
- #[should_panic]
- fn fix_without_unstable() {
+ fn fix() {
let args = "cargo clippy --fix".split_whitespace().map(ToString::to_string);
- let _ = ClippyCmd::new(args, None);
- }
-
- #[test]
- fn fix_unstable() {
- let args = "cargo clippy --fix -Zunstable-options"
- .split_whitespace()
- .map(ToString::to_string);
- let cmd = ClippyCmd::new(args, None);
-
+ 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")));
+ assert!(!cmd.args.iter().any(|arg| arg.ends_with("unstable-options")));
}
#[test]
fn fix_implies_no_deps() {
- let args = "cargo clippy --fix -Zunstable-options"
- .split_whitespace()
- .map(ToString::to_string);
- let cmd = ClippyCmd::new(args, None);
-
- assert!(cmd.clippy_args.unwrap().contains("--no-deps"));
+ let args = "cargo clippy --fix".split_whitespace().map(ToString::to_string);
+ let cmd = ClippyCmd::new(args);
+ assert!(cmd.clippy_args.iter().any(|arg| arg == "--no-deps"));
}
#[test]
fn no_deps_not_duplicated_with_fix() {
- let args = "cargo clippy --fix -Zunstable-options -- --no-deps"
+ let args = "cargo clippy --fix -- --no-deps"
.split_whitespace()
.map(ToString::to_string);
- let cmd = ClippyCmd::new(args, None);
-
- assert_eq!(1, cmd.clippy_args.unwrap().matches("--no-deps").count());
+ 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, None);
-
+ 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, None);
-
- assert_eq!("check", cmd.cargo_subcommand);
- assert_eq!("RUSTC_WORKSPACE_WRAPPER", cmd.path_env());
- }
-
- #[test]
- fn clippy_args_into_rustflags() {
- let args = "cargo clippy -- -W clippy::as_conversions"
- .split_whitespace()
- .map(ToString::to_string);
- let rustflags = None;
- let cmd = ClippyCmd::new(args, rustflags);
-
- assert_eq!("-W clippy::as_conversions", cmd.rustflags.unwrap());
- }
-
- #[test]
- fn clippy_args_respect_existing_rustflags() {
- let args = "cargo clippy -- -D clippy::await_holding_lock"
- .split_whitespace()
- .map(ToString::to_string);
- let rustflags = Some(r#"--cfg feature="some_feat""#.into());
- let cmd = ClippyCmd::new(args, rustflags);
-
- assert_eq!(
- r#"-D clippy::await_holding_lock --cfg feature="some_feat""#,
- cmd.rustflags.unwrap()
- );
- }
-
- #[test]
- fn no_env_change_if_no_clippy_args() {
- let args = "cargo clippy".split_whitespace().map(ToString::to_string);
- let rustflags = Some(r#"--cfg feature="some_feat""#.into());
- let cmd = ClippyCmd::new(args, rustflags);
-
- assert!(cmd.clippy_args.is_none());
- assert!(cmd.rustflags.is_none());
- }
-
- #[test]
- fn no_env_change_if_no_clippy_args_nor_rustflags() {
- let args = "cargo clippy".split_whitespace().map(ToString::to_string);
- let rustflags = None;
- let cmd = ClippyCmd::new(args, rustflags);
-
- assert!(cmd.clippy_args.is_none());
- assert!(cmd.rustflags.is_none());
}
}
projects / rust.git / blobdiff