Skip to content

Commit 6db2864

Browse files
committed
refactor(toml): Make room for resolving features
1 parent 4e19f31 commit 6db2864

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

src/cargo/util/toml/mod.rs

+14-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ fn resolve_toml(
291291
dev_dependencies2: None,
292292
build_dependencies: None,
293293
build_dependencies2: None,
294-
features: original_toml.features.clone(),
294+
features: None,
295295
target: None,
296296
replace: original_toml.replace.clone(),
297297
patch: original_toml.patch.clone(),
@@ -322,6 +322,8 @@ fn resolve_toml(
322322
});
323323
resolved_toml.package = Some(resolved_package);
324324

325+
resolved_toml.features = resolve_features(original_toml.features.as_ref())?;
326+
325327
resolved_toml.lib = targets::resolve_lib(
326328
original_toml.lib.as_ref(),
327329
package_root,
@@ -686,6 +688,17 @@ fn default_readme_from_package_root(package_root: &Path) -> Option<String> {
686688
None
687689
}
688690

691+
#[tracing::instrument(skip_all)]
692+
fn resolve_features(
693+
original_features: Option<&BTreeMap<manifest::FeatureName, Vec<String>>>,
694+
) -> CargoResult<Option<BTreeMap<manifest::FeatureName, Vec<String>>>> {
695+
let Some(resolved_features) = original_features.cloned() else {
696+
return Ok(None);
697+
};
698+
699+
Ok(Some(resolved_features))
700+
}
701+
689702
#[tracing::instrument(skip_all)]
690703
fn resolve_dependencies<'a>(
691704
gctx: &GlobalContext,

0 commit comments

Comments
 (0)