refactor(toml): Make room for resolving features

epage · Jul 8, 2024 · 6be8b34 · 6be8b34
1 parent 42eb883
commit 6be8b34
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
@@ -291,7 +291,7 @@ fn resolve_toml(
         dev_dependencies2: None,
         build_dependencies: None,
         build_dependencies2: None,
-        features: original_toml.features.clone(),
+        features: None,
         target: None,
         replace: original_toml.replace.clone(),
         patch: original_toml.patch.clone(),
@@ -322,6 +322,8 @@ fn resolve_toml(
             });
         resolved_toml.package = Some(resolved_package);
 
+        resolved_toml.features = resolve_features(original_toml.features.as_ref())?;
+
         resolved_toml.lib = targets::resolve_lib(
             original_toml.lib.as_ref(),
             package_root,
@@ -686,6 +688,17 @@ fn default_readme_from_package_root(package_root: &Path) -> Option<String> {
     None
 }
 
+#[tracing::instrument(skip_all)]
+fn resolve_features(
+    original_features: Option<&BTreeMap<manifest::FeatureName, Vec<String>>>,
+) -> CargoResult<Option<BTreeMap<manifest::FeatureName, Vec<String>>>> {
+    let Some(resolved_features) = original_features.cloned() else {
+        return Ok(None);
+    };
+
+    Ok(Some(resolved_features))
+}
+
 #[tracing::instrument(skip_all)]
 fn resolve_dependencies<'a>(
     gctx: &GlobalContext,