From 8d9f8ac2739e7d02bcbc69e933682c2ef305f987 Mon Sep 17 00:00:00 2001
From: Clemens Wasser <clemens.wasser@gmail.com>
Date: Thu, 30 Jul 2020 16:04:01 +0200
Subject: flycheck: Added checkOnSave.noDefaultFeatures

This commit adds the option
`rust-analyzer.checkOnSave.noDefaultFeatures`
and fixes #5550.
---
 crates/flycheck/src/lib.rs         | 13 ++++++++++---
 crates/rust-analyzer/src/config.rs |  5 +++++
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'crates')

diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index ad376ad18..7c38f5ef9 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@@ -24,6 +24,7 @@ pub enum FlycheckConfig {
         command: String,
         target_triple: Option<String>,
         all_targets: bool,
+        no_default_features: bool,
         all_features: bool,
         features: Vec<String>,
         extra_args: Vec<String>,
@@ -180,6 +181,7 @@ impl FlycheckActor {
             FlycheckConfig::CargoCommand {
                 command,
                 target_triple,
+                no_default_features,
                 all_targets,
                 all_features,
                 extra_args,
@@ -198,9 +200,14 @@ impl FlycheckActor {
                 }
                 if *all_features {
                     cmd.arg("--all-features");
-                } else if !features.is_empty() {
-                    cmd.arg("--features");
-                    cmd.arg(features.join(" "));
+                } else {
+                    if *no_default_features {
+                        cmd.arg("--no-default-features");
+                    }
+                    if !features.is_empty() {
+                        cmd.arg("--features");
+                        cmd.arg(features.join(" "));
+                    }
                 }
                 cmd.args(extra_args);
                 cmd
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index e11c8b909..70b4512d0 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -151,6 +151,7 @@ impl Config {
             flycheck: Some(FlycheckConfig::CargoCommand {
                 command: "check".to_string(),
                 target_triple: None,
+                no_default_features: false,
                 all_targets: true,
                 all_features: false,
                 extra_args: Vec::new(),
@@ -234,6 +235,9 @@ impl Config {
                     command: data.checkOnSave_command,
                     target_triple: data.checkOnSave_target.or(data.cargo_target),
                     all_targets: data.checkOnSave_allTargets,
+                    no_default_features: data
+                        .checkOnSave_noDefaultFeatures
+                        .unwrap_or(data.cargo_noDefaultFeatures),
                     all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures),
                     features: data.checkOnSave_features.unwrap_or(data.cargo_features),
                     extra_args: data.checkOnSave_extraArgs,
@@ -398,6 +402,7 @@ config_data! {
         checkOnSave_allFeatures: Option<bool>            = None,
         checkOnSave_allTargets: bool                     = true,
         checkOnSave_command: String                      = "check".into(),
+        checkOnSave_noDefaultFeatures: Option<bool>      = None,
         checkOnSave_target: Option<String>               = None,
         checkOnSave_extraArgs: Vec<String>               = Vec::new(),
         checkOnSave_features: Option<Vec<String>>        = None,
-- 
cgit v1.2.3