Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 21:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Typo

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-21 10:50:24 +02:00
parent a20b8d751b
commit 8f3fdf3315
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/flycheck/src/lib.rs
View file

@ -22,7 +22,7 @@ pub use cargo_metadata::diagnostic::{
pub enum FlycheckConfig { pub enum FlycheckConfig {
CargoCommand { CargoCommand {
command: String, command: String,
target_tripple: Option<String>, target_triple: Option<String>,
all_targets: bool, all_targets: bool,
all_features: bool, all_features: bool,
features: Vec<String>, features: Vec<String>,
@ -179,7 +179,7 @@ impl FlycheckActor {
let mut cmd = match &self.config { let mut cmd = match &self.config {
FlycheckConfig::CargoCommand { FlycheckConfig::CargoCommand {
command, command,
target_tripple, target_triple,
all_targets, all_targets,
all_features, all_features,
extra_args, extra_args,
@ -190,7 +190,7 @@ impl FlycheckActor {
cmd.args(&["--workspace", "--message-format=json", "--manifest-path"]) cmd.args(&["--workspace", "--message-format=json", "--manifest-path"])
.arg(self.workspace_root.join("Cargo.toml")); .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()]); cmd.args(&["--target", target.as_str()]);
} }
if *all_targets { if *all_targets {

4
crates/rust-analyzer/src/config.rs
View file

@ -148,7 +148,7 @@ impl Config {
rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() }, rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
flycheck: Some(FlycheckConfig::CargoCommand { flycheck: Some(FlycheckConfig::CargoCommand {
command: "check".to_string(), command: "check".to_string(),
target_tripple: None, target_triple: None,
all_targets: true, all_targets: true,
all_features: false, all_features: false,
extra_args: Vec::new(), extra_args: Vec::new(),
@ -224,7 +224,7 @@ impl Config {
} }
Some(_) | None => FlycheckConfig::CargoCommand { Some(_) | None => FlycheckConfig::CargoCommand {
command: data.checkOnSave_command, 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_targets: data.checkOnSave_allTargets,
all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures), all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures),
features: data.checkOnSave_features.unwrap_or(data.cargo_features), features: data.checkOnSave_features.unwrap_or(data.cargo_features),