From 33b905883819038ad67476fe14b7b48212a73f93 Mon Sep 17 00:00:00 2001 From: Clemens Wasser Date: Wed, 10 Jun 2020 09:27:25 +0200 Subject: Most of the checkOnSafe options now default to the cargo equivalent. --- crates/rust-analyzer/src/config.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crates') diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 320414ecf..617612dc3 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -241,7 +241,11 @@ impl Config { set(value, "/checkOnSave/extraArgs", extra_args); set(value, "/checkOnSave/command", command); set(value, "/checkOnSave/allTargets", all_targets); - set(value, "/checkOnSave/allFeatures", all_features); + if let Some(new_all_features) = get(value, "/checkOnSave/allFeatures") { + *all_features = new_all_features; + } else { + *all_features = self.cargo.all_features; + } set(value, "/checkOnSave/features", features); if features.is_empty() && !self.cargo.features.is_empty() { *features = self.cargo.features.clone(); -- cgit v1.2.3