From e154132c911be41b75e84d01de5c7efa4da9168e Mon Sep 17 00:00:00 2001
From: Emil Lauridsen <mine809@gmail.com>
Date: Tue, 17 Mar 2020 14:55:44 +0100
Subject: Remove outDirOverrides

---
 crates/ra_project_model/src/cargo_workspace.rs | 8 --------
 editors/code/package.json                      | 5 -----
 editors/code/src/config.ts                     | 2 --
 3 files changed, 15 deletions(-)

diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 97fa48b8b..eeeb10233 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -39,9 +39,6 @@ pub struct CargoFeatures {
 
     /// Runs cargo check on launch to figure out the correct values of OUT_DIR
     pub load_out_dirs_from_check: bool,
-
-    /// Fine grained controls for additional `OUT_DIR` env variables
-    pub out_dir_overrides: FxHashMap<PackageId, PathBuf>,
 }
 
 impl Default for CargoFeatures {
@@ -51,7 +48,6 @@ impl Default for CargoFeatures {
             all_features: true,
             features: Vec::new(),
             load_out_dirs_from_check: false,
-            out_dir_overrides: FxHashMap::default(),
         }
     }
 }
@@ -195,10 +191,6 @@ impl CargoWorkspace {
         if cargo_features.load_out_dirs_from_check {
             out_dir_by_id = load_out_dirs(cargo_toml, cargo_features);
         }
-        // We explicitly extend afterwards to allow overriding the value returned by cargo
-        out_dir_by_id.extend(
-            cargo_features.out_dir_overrides.iter().map(|(id, path)| (id.clone(), path.clone())),
-        );
 
         let mut pkg_by_id = FxHashMap::default();
         let mut packages = Arena::default();
diff --git a/editors/code/package.json b/editors/code/package.json
index b4128acf0..b9e0ffd2b 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -362,11 +362,6 @@
                     "type": "boolean",
                     "default": false,
                     "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs"
-                },
-                "rust-analyzer.cargoFeatures.outDirOverrides": {
-                    "type": "object",
-                    "default": {},
-                    "markdownDescription": "Fine grained controls for OUT_DIR `env!(\"OUT_DIR\")` variable. e.g. `{\"foo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)\":\"/path/to/foo\"}`, "
                 }
             }
         },
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index c7323f6e9..b45b14bef 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -23,7 +23,6 @@ export interface CargoFeatures {
     allFeatures: boolean;
     features: string[];
     loadOutDirsFromCheck: boolean;
-    outDirOverrides: Record<string, string>;
 }
 
 export const enum UpdatesChannel {
@@ -222,7 +221,6 @@ export class Config {
             allFeatures: this.cfg.get("cargoFeatures.allFeatures") as boolean,
             features: this.cfg.get("cargoFeatures.features") as string[],
             loadOutDirsFromCheck: this.cfg.get("cargoFeatures.loadOutDirsFromCheck") as boolean,
-            outDirOverrides: this.cfg.get("cargoFeatures.outDirOverrides") as Record<string, string>,
         };
     }
 
-- 
cgit v1.2.3