From d3110859ba4e97cf17d2c997befa92fb63bfb138 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 8 May 2020 02:56:53 +0200
Subject: Move feature desugaring to the right abstraction layer
---
crates/ra_project_model/src/lib.rs | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
(limited to 'crates/ra_project_model')
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 8703429d4..c226ffa57 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -398,8 +398,18 @@ impl ProjectWorkspace {
let edition = cargo[pkg].edition;
let cfg_options = {
let mut opts = default_cfg_options.clone();
- opts.insert_features(cargo[pkg].features.iter().map(Into::into));
- opts.insert_cfgs(cargo[pkg].cfgs.iter().map(Into::into));
+ for feature in cargo[pkg].features.iter() {
+ opts.insert_key_value("feature".into(), feature.into());
+ }
+ for cfg in cargo[pkg].cfgs.iter() {
+ match cfg.find('=') {
+ Some(split) => opts.insert_key_value(
+ cfg[..split].into(),
+ cfg[split + 1..].trim_matches('"').into(),
+ ),
+ None => opts.insert_atom(cfg.into()),
+ };
+ }
opts
};
let mut env = Env::default();
--
cgit v1.2.3