aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model
diff options
context:
space:
mode:
authorChristophe MASSOLIN <[email protected]>2020-05-05 17:01:54 +0100
committerChristophe MASSOLIN <[email protected]>2020-05-05 17:01:54 +0100
commit0ab4340cdb31ac4d50f039f0a56ebaff86710eb7 (patch)
tree2622bb99e5930468fdd0989df1dc25423846e03a /crates/ra_project_model
parente7523511ce201763e093d5f5563c20d0e0fc5d54 (diff)
Rename `defaultTarget` to target
Diffstat (limited to 'crates/ra_project_model')
-rw-r--r--crates/ra_project_model/src/cargo_workspace.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 31499b468..59f46a2a0 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -58,7 +58,7 @@ pub struct CargoConfig {
58 pub load_out_dirs_from_check: bool, 58 pub load_out_dirs_from_check: bool,
59 59
60 /// rustc target 60 /// rustc target
61 pub default_target: Option<String>, 61 pub target: Option<String>,
62} 62}
63 63
64impl Default for CargoConfig { 64impl Default for CargoConfig {
@@ -68,7 +68,7 @@ impl Default for CargoConfig {
68 all_features: true, 68 all_features: true,
69 features: Vec::new(), 69 features: Vec::new(),
70 load_out_dirs_from_check: false, 70 load_out_dirs_from_check: false,
71 default_target: None, 71 target: None,
72 } 72 }
73 } 73 }
74} 74}
@@ -164,7 +164,7 @@ impl CargoWorkspace {
164 if let Some(parent) = cargo_toml.parent() { 164 if let Some(parent) = cargo_toml.parent() {
165 meta.current_dir(parent); 165 meta.current_dir(parent);
166 } 166 }
167 if let Some(target) = cargo_features.default_target.as_ref() { 167 if let Some(target) = cargo_features.target.as_ref() {
168 meta.other_options(&[String::from("--filter-platform"), target.clone()]); 168 meta.other_options(&[String::from("--filter-platform"), target.clone()]);
169 } 169 }
170 let meta = meta.exec().with_context(|| { 170 let meta = meta.exec().with_context(|| {