aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/ra_project_model/src/cargo_workspace.rs8
-rw-r--r--crates/rust-analyzer/src/config.rs2
-rw-r--r--editors/code/package.json2
3 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 810833b64..1dfee6b47 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -62,8 +62,8 @@ pub struct CargoConfig {
62 /// Runs cargo check on launch to figure out the correct values of OUT_DIR 62 /// Runs cargo check on launch to figure out the correct values of OUT_DIR
63 pub load_out_dirs_from_check: bool, 63 pub load_out_dirs_from_check: bool,
64 64
65 /// rustc config 65 /// rustc target
66 pub rustc: RustcConfig, 66 pub default_target: Option<String>,
67} 67}
68 68
69impl Default for CargoConfig { 69impl Default for CargoConfig {
@@ -73,7 +73,7 @@ impl Default for CargoConfig {
73 all_features: true, 73 all_features: true,
74 features: Vec::new(), 74 features: Vec::new(),
75 load_out_dirs_from_check: false, 75 load_out_dirs_from_check: false,
76 rustc: RustcConfig { default_target: None }, 76 default_target: None,
77 } 77 }
78 } 78 }
79} 79}
@@ -169,7 +169,7 @@ impl CargoWorkspace {
169 if let Some(parent) = cargo_toml.parent() { 169 if let Some(parent) = cargo_toml.parent() {
170 meta.current_dir(parent); 170 meta.current_dir(parent);
171 } 171 }
172 if let Some(target) = cargo_features.rustc.default_target.as_ref() { 172 if let Some(target) = cargo_features.default_target.as_ref() {
173 meta.other_options(&[String::from("--filter-platform"), target.clone()]); 173 meta.other_options(&[String::from("--filter-platform"), target.clone()]);
174 } 174 }
175 let meta = meta.exec().with_context(|| { 175 let meta = meta.exec().with_context(|| {
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 908208ece..25404ef90 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -134,7 +134,7 @@ impl Config {
134 set(value, "/cargo/allFeatures", &mut self.cargo.all_features); 134 set(value, "/cargo/allFeatures", &mut self.cargo.all_features);
135 set(value, "/cargo/features", &mut self.cargo.features); 135 set(value, "/cargo/features", &mut self.cargo.features);
136 set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check); 136 set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
137 set(value, "/cargo/rustc/defaultTarget", &mut self.cargo.rustc.default_target); 137 set(value, "/cargo/defaultTarget", &mut self.cargo.default_target);
138 138
139 match get(value, "/procMacro/enable") { 139 match get(value, "/procMacro/enable") {
140 Some(true) => { 140 Some(true) => {
diff --git a/editors/code/package.json b/editors/code/package.json
index fe330fb43..775bdaf17 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -237,7 +237,7 @@
237 "default": false, 237 "default": false,
238 "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs" 238 "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs"
239 }, 239 },
240 "rust-analyzer.cargo.rustc.defaultTarget": { 240 "rust-analyzer.cargo.defaultTarget": {
241 "type": [ 241 "type": [
242 "null", 242 "null",
243 "string" 243 "string"