3 files changed, 11 insertions, 8 deletions
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index d0211c914..db42a00dc 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir_ty/Cargo.toml
@@ -17,9 +17,9 @@ ena = "0.14.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 scoped-tls = "1"
-chalk-solve = { version = "0.49", default-features = false }
+chalk-solve = { version = "0.50", default-features = false }
-chalk-ir = "0.49"
+chalk-ir = "0.50"
-chalk-recursive = "0.49"
+chalk-recursive = "0.50"
 la-arena = { version = "0.2.0", path = "../../lib/arena" }
 stdx = { path = "../stdx", version = "0.0.0" }
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs
index c0ed37fc1..a09e1a9ff 100644
--- a/crates/project_model/src/cargo_workspace.rs
+++ b/crates/project_model/src/cargo_workspace.rs
@@ -99,8 +99,10 @@ pub struct PackageData {
    pub dependencies: Vec<PackageDependency>,
    /// Rust edition for this package
    pub edition: Edition,
-    /// List of features to activate
+    /// Features provided by the crate, mapped to the features required by that feature.
-    pub features: Vec<String>,
+    pub features: FxHashMap<String, Vec<String>>,
+    /// List of features enabled on this package
+    pub active_features: Vec<String>,
    /// List of config flags defined by this package's build script
    pub cfgs: Vec<CfgFlag>,
    /// List of cargo-related environment variables with their value
@@ -281,7 +283,8 @@ impl CargoWorkspace {
                is_member,
                edition,
                dependencies: Vec::new(),
-                features: Vec::new(),
+                features: meta_pkg.features.into_iter().collect(),
+                active_features: Vec::new(),
                cfgs: cfgs.get(&id).cloned().unwrap_or_default(),
                envs: envs.get(&id).cloned().unwrap_or_default(),
                out_dir: out_dir_by_id.get(&id).cloned(),
@@ -328,7 +331,7 @@ impl CargoWorkspace {
                let dep = PackageDependency { name: dep_node.name, pkg };
                packages[source].dependencies.push(dep);
            }
-            packages[source].features.extend(node.features);
+            packages[source].active_features.extend(node.features);
        }
        let workspace_root = AbsPathBuf::assert(meta.workspace_root);
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs
index 8e0481ae9..073c48af7 100644
--- a/crates/project_model/src/workspace.rs
+++ b/crates/project_model/src/workspace.rs
@@ -481,7 +481,7 @@ fn add_target_crate_root(
    let edition = pkg.edition;
    let cfg_options = {
        let mut opts = cfg_options.clone();
-        for feature in pkg.features.iter() {
+        for feature in pkg.active_features.iter() {
            opts.insert_key_value("feature".into(), feature.into());
        }
        opts.extend(pkg.cfgs.iter().cloned());