From b7edffe244581b428a4b4da4ff6a08ab461b018f Mon Sep 17 00:00:00 2001
From: Christophe MASSOLIN <christophe.massolin@gmail.com>
Date: Mon, 27 Apr 2020 00:11:04 +0200
Subject: Started rust-analyzer.cargo.defaultTarget implementation

---
 crates/ra_project_model/src/cargo_workspace.rs | 12 ++++++++++++
 crates/rust-analyzer/src/config.rs             |  1 +
 editors/code/package.json                      |  8 ++++++++
 3 files changed, 21 insertions(+)

diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 362ee30fe..810833b64 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -42,6 +42,11 @@ impl ops::Index<Target> for CargoWorkspace {
     }
 }
 
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct RustcConfig {
+    pub default_target: Option<String>,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CargoConfig {
     /// Do not activate the `default` feature.
@@ -56,6 +61,9 @@ pub struct CargoConfig {
 
     /// Runs cargo check on launch to figure out the correct values of OUT_DIR
     pub load_out_dirs_from_check: bool,
+
+    /// rustc config
+    pub rustc: RustcConfig,
 }
 
 impl Default for CargoConfig {
@@ -65,6 +73,7 @@ impl Default for CargoConfig {
             all_features: true,
             features: Vec::new(),
             load_out_dirs_from_check: false,
+            rustc: RustcConfig { default_target: None },
         }
     }
 }
@@ -160,6 +169,9 @@ impl CargoWorkspace {
         if let Some(parent) = cargo_toml.parent() {
             meta.current_dir(parent);
         }
+        if let Some(target) = cargo_features.rustc.default_target.as_ref() {
+            meta.other_options(&[String::from("--filter-platform"), target.clone()]);
+        }
         let meta = meta.exec().with_context(|| {
             format!("Failed to run `cargo metadata --manifest-path {}`", cargo_toml.display())
         })?;
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 715eddadb..908208ece 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -134,6 +134,7 @@ impl Config {
         set(value, "/cargo/allFeatures", &mut self.cargo.all_features);
         set(value, "/cargo/features", &mut self.cargo.features);
         set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
+        set(value, "/cargo/rustc/defaultTarget", &mut self.cargo.rustc.default_target);
 
         match get(value, "/procMacro/enable") {
             Some(true) => {
diff --git a/editors/code/package.json b/editors/code/package.json
index b8aaa07d8..fe330fb43 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -237,6 +237,14 @@
                     "default": false,
                     "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs"
                 },
+                "rust-analyzer.cargo.rustc.defaultTarget": {
+                    "type": [
+                        "null",
+                        "string"
+                    ],
+                    "default": null,
+                    "description": "Specify the default target"
+                },
                 "rust-analyzer.rustfmt.extraArgs": {
                     "type": "array",
                     "items": {
-- 
cgit v1.2.3