diff options
author | Jonas Schievink <[email protected]> | 2020-10-22 18:19:18 +0100 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2020-10-22 18:19:18 +0100 |
commit | 3421b645e6f7d15ddad0e8e526d8a7db09b72516 (patch) | |
tree | e1ec7d37bd63ccc7f0e18b39479c0860b7fc5d9b /crates/rust-analyzer/src/cargo_target_spec.rs | |
parent | 978cc936491d23bd38ef18aa98ddcc7472ef5f54 (diff) |
Emit better #[cfg] diagnostics
Diffstat (limited to 'crates/rust-analyzer/src/cargo_target_spec.rs')
-rw-r--r-- | crates/rust-analyzer/src/cargo_target_spec.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/cargo_target_spec.rs b/crates/rust-analyzer/src/cargo_target_spec.rs index 7da935464..1ab72bd91 100644 --- a/crates/rust-analyzer/src/cargo_target_spec.rs +++ b/crates/rust-analyzer/src/cargo_target_spec.rs | |||
@@ -24,7 +24,7 @@ impl CargoTargetSpec { | |||
24 | snap: &GlobalStateSnapshot, | 24 | snap: &GlobalStateSnapshot, |
25 | spec: Option<CargoTargetSpec>, | 25 | spec: Option<CargoTargetSpec>, |
26 | kind: &RunnableKind, | 26 | kind: &RunnableKind, |
27 | cfgs: &[CfgExpr], | 27 | cfg: &Option<CfgExpr>, |
28 | ) -> Result<(Vec<String>, Vec<String>)> { | 28 | ) -> Result<(Vec<String>, Vec<String>)> { |
29 | let mut args = Vec::new(); | 29 | let mut args = Vec::new(); |
30 | let mut extra_args = Vec::new(); | 30 | let mut extra_args = Vec::new(); |
@@ -87,7 +87,7 @@ impl CargoTargetSpec { | |||
87 | args.push("--all-features".to_string()); | 87 | args.push("--all-features".to_string()); |
88 | } else { | 88 | } else { |
89 | let mut features = Vec::new(); | 89 | let mut features = Vec::new(); |
90 | for cfg in cfgs { | 90 | if let Some(cfg) = cfg.as_ref() { |
91 | required_features(cfg, &mut features); | 91 | required_features(cfg, &mut features); |
92 | } | 92 | } |
93 | for feature in &snap.config.cargo.features { | 93 | for feature in &snap.config.cargo.features { |