diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/flycheck/src/lib.rs | 6 | ||||
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs index 6e06adaa5..ad376ad18 100644 --- a/crates/flycheck/src/lib.rs +++ b/crates/flycheck/src/lib.rs | |||
@@ -22,7 +22,7 @@ pub use cargo_metadata::diagnostic::{ | |||
22 | pub enum FlycheckConfig { | 22 | pub enum FlycheckConfig { |
23 | CargoCommand { | 23 | CargoCommand { |
24 | command: String, | 24 | command: String, |
25 | target_tripple: Option<String>, | 25 | target_triple: Option<String>, |
26 | all_targets: bool, | 26 | all_targets: bool, |
27 | all_features: bool, | 27 | all_features: bool, |
28 | features: Vec<String>, | 28 | features: Vec<String>, |
@@ -179,7 +179,7 @@ impl FlycheckActor { | |||
179 | let mut cmd = match &self.config { | 179 | let mut cmd = match &self.config { |
180 | FlycheckConfig::CargoCommand { | 180 | FlycheckConfig::CargoCommand { |
181 | command, | 181 | command, |
182 | target_tripple, | 182 | target_triple, |
183 | all_targets, | 183 | all_targets, |
184 | all_features, | 184 | all_features, |
185 | extra_args, | 185 | extra_args, |
@@ -190,7 +190,7 @@ impl FlycheckActor { | |||
190 | cmd.args(&["--workspace", "--message-format=json", "--manifest-path"]) | 190 | cmd.args(&["--workspace", "--message-format=json", "--manifest-path"]) |
191 | .arg(self.workspace_root.join("Cargo.toml")); | 191 | .arg(self.workspace_root.join("Cargo.toml")); |
192 | 192 | ||
193 | if let Some(target) = target_tripple { | 193 | if let Some(target) = target_triple { |
194 | cmd.args(&["--target", target.as_str()]); | 194 | cmd.args(&["--target", target.as_str()]); |
195 | } | 195 | } |
196 | if *all_targets { | 196 | if *all_targets { |
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 11086360b..fec4feee5 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -148,7 +148,7 @@ impl Config { | |||
148 | rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() }, | 148 | rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() }, |
149 | flycheck: Some(FlycheckConfig::CargoCommand { | 149 | flycheck: Some(FlycheckConfig::CargoCommand { |
150 | command: "check".to_string(), | 150 | command: "check".to_string(), |
151 | target_tripple: None, | 151 | target_triple: None, |
152 | all_targets: true, | 152 | all_targets: true, |
153 | all_features: false, | 153 | all_features: false, |
154 | extra_args: Vec::new(), | 154 | extra_args: Vec::new(), |
@@ -224,7 +224,7 @@ impl Config { | |||
224 | } | 224 | } |
225 | Some(_) | None => FlycheckConfig::CargoCommand { | 225 | Some(_) | None => FlycheckConfig::CargoCommand { |
226 | command: data.checkOnSave_command, | 226 | command: data.checkOnSave_command, |
227 | target_tripple: data.checkOnSave_target.or(data.cargo_target), | 227 | target_triple: data.checkOnSave_target.or(data.cargo_target), |
228 | all_targets: data.checkOnSave_allTargets, | 228 | all_targets: data.checkOnSave_allTargets, |
229 | all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures), | 229 | all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures), |
230 | features: data.checkOnSave_features.unwrap_or(data.cargo_features), | 230 | features: data.checkOnSave_features.unwrap_or(data.cargo_features), |