From f2dd233ddc60b647fe9c32ea2d712224005ae99e Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Tue, 5 May 2020 14:53:52 +0200
Subject: Assume cargo_metadata uses String for cfgs soon

---
 crates/ra_project_model/src/cargo_workspace.rs | 11 ++++++++---
 crates/ra_project_model/src/lib.rs             |  8 +-------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index afbd30164..bf83adc42 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -83,7 +83,7 @@ pub struct PackageData {
     pub dependencies: Vec<PackageDependency>,
     pub edition: Edition,
     pub features: Vec<String>,
-    pub cfgs: Vec<PathBuf>,
+    pub cfgs: Vec<String>,
     pub out_dir: Option<PathBuf>,
     pub proc_macro_dylib_path: Option<PathBuf>,
 }
@@ -279,7 +279,7 @@ impl CargoWorkspace {
 pub struct ExternResources {
     out_dirs: FxHashMap<PackageId, PathBuf>,
     proc_dylib_paths: FxHashMap<PackageId, PathBuf>,
-    cfgs: FxHashMap<PackageId, Vec<PathBuf>>,
+    cfgs: FxHashMap<PackageId, Vec<String>>,
 }
 
 pub fn load_extern_resources(
@@ -307,7 +307,12 @@ pub fn load_extern_resources(
             match message {
                 Message::BuildScriptExecuted(BuildScript { package_id, out_dir, cfgs, .. }) => {
                     res.out_dirs.insert(package_id.clone(), out_dir);
-                    res.cfgs.insert(package_id, cfgs);
+                    res.cfgs.insert(
+                        package_id,
+                        // FIXME: Current `cargo_metadata` uses `PathBuf` instead of `String`,
+                        // change when https://github.com/oli-obk/cargo_metadata/pulls/112 reaches crates.io
+                        cfgs.iter().filter_map(|c| c.to_str().map(|s| s.to_owned())).collect(),
+                    );
                 }
 
                 Message::CompilerArtifact(message) => {
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 2d5d61b61..7231da221 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -399,13 +399,7 @@ impl ProjectWorkspace {
                             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()
-                                        .filter_map(|c| c.to_str())
-                                        .map(Into::into),
-                                );
+                                opts.insert_cfgs(cargo[pkg].cfgs.iter().map(Into::into));
                                 opts
                             };
                             let mut env = Env::default();
-- 
cgit v1.2.3