remove clippy_hackery

Author: yaahc

src/bin/cargo/commands/clippy.rs

@@ -72,11 +72,8 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
 
     let mut wrapper = util::process(util::config::clippy_driver());
 
-    if let Some(old_args) = args.values_of("args") {
-        let clippy_args: String = old_args
-            .map(|arg| format!("{}__CLIPPY_HACKERY__", arg))
-            .collect();
-        wrapper.env("CLIPPY_ARGS", clippy_args);
+    if let Some(clippy_args) = args.values_of("args") {
+        wrapper.args(&clippy_args.collect::<Vec<_>>());
     }
 
     compile_opts.build_config.primary_unit_rustc = Some(wrapper);

src/cargo/core/compiler/build_config.rs

@@ -25,12 +25,21 @@ pub struct BuildConfig {
     /// Output a build plan to stdout instead of actually compiling.
     pub build_plan: bool,
     /// An optional override of the rustc path for primary units only
-    pub primary_unit_rustc: Option<ProcessBuilder>,
+    pub primary_unit_rustc: Option<PrimaryUnitRustc>,
     pub rustfix_diagnostic_server: RefCell<Option<RustfixDiagnosticServer>>,
     /// Whether or not Cargo should cache compiler output on disk.
     cache_messages: bool,
 }
 
+/// Configuration for subcommand specific rustc override
+#[derive(Debug, Clone)]
+pub struct PrimaryUnitRustc {
+    /// ProcessBuilder to use instead of the default provided by `Rustc`
+    pub proc: ProcessBuilder,
+    /// Configure whether or not to use this as a wrapper around the original rustc process
+    pub is_wrapper: bool,
+}
+
 impl BuildConfig {
     /// Parses all config files to learn about build configuration. Currently
     /// configured options are:

src/cargo/core/compiler/compilation.rs

@@ -80,8 +80,10 @@ impl<'cfg> Compilation<'cfg> {
 
         let mut primary_unit_rustc_process =
             bcx.build_config.primary_unit_rustc.clone().map(|mut r| {
-                r.arg(&bcx.rustc.path);
-                r
+                if r.is_wrapper {
+                    r.proc.arg(&bcx.rustc.path);
+                }
+                r.proc
             });
 
         if bcx.config.extra_verbose() {

src/cargo/core/compiler/mod.rs

@@ -24,7 +24,7 @@ use log::debug;
 use same_file::is_same_file;
 use serde::Serialize;
 
-pub use self::build_config::{BuildConfig, CompileMode, MessageFormat};
+pub use self::build_config::{BuildConfig, CompileMode, MessageFormat, PrimaryUnitRustc};
 pub use self::build_context::{BuildContext, FileFlavor, TargetConfig, TargetInfo};
 use self::build_plan::BuildPlan;
 pub use self::compilation::{Compilation, Doctest};

src/cargo/ops/fix.rs

@@ -51,6 +51,7 @@ use log::{debug, trace, warn};
 use rustfix::diagnostics::Diagnostic;
 use rustfix::{self, CodeFix};
 
+use crate::core::compiler::PrimaryUnitRustc;
 use crate::core::Workspace;
 use crate::ops::{self, CompileOptions};
 use crate::util::diagnostic_server::{Message, RustfixDiagnosticServer};
@@ -132,7 +133,10 @@ pub fn fix(ws: &Workspace<'_>, opts: &mut FixOptions<'_>) -> CargoResult<()> {
 
     // primary crates are compiled using a cargo subprocess to do extra work of applying fixes and
     // repeating build until there are no more changes to be applied
-    opts.compile_opts.build_config.primary_unit_rustc = Some(wrapper);
+    opts.compile_opts.build_config.primary_unit_rustc = Some(PrimaryUnitRustc {
+        proc: wrapper,
+        is_wrapper: true,
+    });
 
     ops::compile(ws, &opts.compile_opts)?;
     Ok(())