From 0585c347401dce1e50cd742465b5cce9532d7e76 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Sat, 6 Feb 2021 10:38:27 -0800
Subject: [PATCH] Stabilize workspace wrapper.
---
src/main.rs | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index ea06743394d..12bb909e15a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -59,7 +59,6 @@ pub fn main() {
}
struct ClippyCmd {
- unstable_options: bool,
cargo_subcommand: &'static str,
args: Vec<String>,
clippy_args: Vec<String>,
@@ -105,21 +104,12 @@ impl ClippyCmd {
}
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")
@@ -156,7 +146,7 @@ impl ClippyCmd {
.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)
@@ -205,7 +195,6 @@ mod tests {
.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")));
}
@@ -232,16 +221,5 @@ mod tests {
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());
}
}