diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs index 6e06adaa53..ad376ad185 100644 --- a/crates/flycheck/src/lib.rs +++ b/crates/flycheck/src/lib.rs @@ -22,7 +22,7 @@ pub use cargo_metadata::diagnostic::{ pub enum FlycheckConfig { CargoCommand { command: String, - target_tripple: Option, + target_triple: Option, all_targets: bool, all_features: bool, features: Vec, @@ -179,7 +179,7 @@ impl FlycheckActor { let mut cmd = match &self.config { FlycheckConfig::CargoCommand { command, - target_tripple, + target_triple, all_targets, all_features, extra_args, @@ -190,7 +190,7 @@ impl FlycheckActor { cmd.args(&["--workspace", "--message-format=json", "--manifest-path"]) .arg(self.workspace_root.join("Cargo.toml")); - if let Some(target) = target_tripple { + if let Some(target) = target_triple { cmd.args(&["--target", target.as_str()]); } if *all_targets { diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 11086360b6..fec4feee52 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -148,7 +148,7 @@ impl Config { rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() }, flycheck: Some(FlycheckConfig::CargoCommand { command: "check".to_string(), - target_tripple: None, + target_triple: None, all_targets: true, all_features: false, extra_args: Vec::new(), @@ -224,7 +224,7 @@ impl Config { } Some(_) | None => FlycheckConfig::CargoCommand { command: data.checkOnSave_command, - target_tripple: data.checkOnSave_target.or(data.cargo_target), + target_triple: data.checkOnSave_target.or(data.cargo_target), all_targets: data.checkOnSave_allTargets, all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures), features: data.checkOnSave_features.unwrap_or(data.cargo_features),