Auto merge of #6695 - TaKO8Ki:add-bytes-nth, r=phansch

[rust.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 7594ea2c7b1d196be614499703b07652111beb1f..d13a831f5ff7d45a7d408ceabda334ff1d80804b 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-#![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)]
@@ -60,15 +59,13 @@ pub fn main() {
 }
 
 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>,
     {
@@ -101,27 +98,15 @@ fn new<I>(mut old_args: I, rustflags: Option<String>) -> Self
             args.insert(0, "+nightly".to_string());
         }
 
-        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 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());
         }
 
-        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,
         }
     }
 
@@ -155,19 +140,18 @@ fn target_dir() -> Option<(&'static str, OsString)> {
 
     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", 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
     }
 }
@@ -176,7 +160,7 @@ fn process<I>(old_args: I) -> Result<(), i32>
 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();
 
@@ -201,7 +185,7 @@ mod tests {
     #[should_panic]
     fn fix_without_unstable() {
         let args = "cargo clippy --fix".split_whitespace().map(ToString::to_string);
-        let _ = ClippyCmd::new(args, None);
+        ClippyCmd::new(args);
     }
 
     #[test]
@@ -209,10 +193,8 @@ 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")));
     }
 
@@ -221,9 +203,8 @@ 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 cmd = ClippyCmd::new(args);
+        assert!(cmd.clippy_args.iter().any(|arg| arg == "--no-deps"));
     }
 
     #[test]
@@ -231,73 +212,14 @@ 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, 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());
     }
 }