From 9771e1e18fafef7571ad46374c5e55d4acd8aa09 Mon Sep 17 00:00:00 2001
From: Victor Song <vms2@rice.edu>
Date: Mon, 9 Oct 2023 02:03:45 -0500
Subject: [PATCH] Don't pass any target directory options to custom flycheck

---
 crates/flycheck/src/lib.rs         | 6 ------
 crates/rust-analyzer/src/config.rs | 4 +---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index c2ad2661eb..0749d91eb3 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@@ -58,7 +58,6 @@ pub enum FlycheckConfig {
         extra_env: FxHashMap<String, String>,
         invocation_strategy: InvocationStrategy,
         invocation_location: InvocationLocation,
-        target_dir: Option<PathBuf>,
     },
 }
 
@@ -355,7 +354,6 @@ impl FlycheckActor {
                 extra_env,
                 invocation_strategy,
                 invocation_location,
-                target_dir,
             } => {
                 let mut cmd = Command::new(command);
                 cmd.envs(extra_env);
@@ -377,10 +375,6 @@ impl FlycheckActor {
                     }
                 }
 
-                if let Some(target_dir) = target_dir {
-                    cmd.arg("--target-dir").arg(target_dir);
-                }
-
                 (cmd, args)
             }
         };
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 23cf71cff4..39a98bcd29 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -1289,7 +1289,6 @@ impl Config {
     }
 
     pub fn flycheck(&self) -> FlycheckConfig {
-        let target_dir = self.target_dir_from_config();
         match &self.data.check_overrideCommand {
             Some(args) if !args.is_empty() => {
                 let mut args = args.clone();
@@ -1310,7 +1309,6 @@ impl Config {
                         }
                         InvocationLocation::Workspace => flycheck::InvocationLocation::Workspace,
                     },
-                    target_dir,
                 }
             }
             Some(_) | None => FlycheckConfig::CargoCommand {
@@ -1345,7 +1343,7 @@ impl Config {
                 extra_args: self.check_extra_args(),
                 extra_env: self.check_extra_env(),
                 ansi_color_output: self.color_diagnostic_output(),
-                target_dir,
+                target_dir: self.target_dir_from_config(),
             },
         }
     }