aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_project_model')
-rw-r--r--crates/ra_project_model/src/cargo_workspace.rs8
1 files changed, 4 insertions, 4 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(|| {