Skip to content

Commit c0c6729

Browse files
committed
missing wiring
1 parent 1818096 commit c0c6729

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/cargo/ops/fix.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ pub fn fix(ws: &Workspace<'_>, opts: &mut FixOptions<'_>) -> CargoResult<()> {
107107
eprintln!("Warning: clippy-driver not found: {:?}", e);
108108
}
109109
wrapper.env(CLIPPY_FIX_ENV, "1");
110+
opts.compile_opts.build_config.primary_unit_rustc = Some(util::config::clippy_driver());
110111
}
111112

112113
if let Some(clippy_args) = &opts.clippy_args {
@@ -609,11 +610,7 @@ impl Default for PrepareFor {
609610
impl FixArgs {
610611
fn get() -> FixArgs {
611612
let mut ret = FixArgs::default();
612-
if env::var(CLIPPY_FIX_ENV).is_ok() {
613-
ret.rustc = Some(util::config::clippy_driver());
614-
} else {
615-
ret.rustc = env::args_os().nth(1).map(PathBuf::from);
616-
}
613+
ret.rustc = env::args_os().nth(1).map(PathBuf::from);
617614

618615
if let Ok(clippy_args) = env::var(CLIPPY_FIX_ARGS) {
619616
ret.clippy_args = serde_json::from_str(&clippy_args).unwrap();

0 commit comments

Comments
 (0)