itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(toml): Decouple Dep and TomlDep creation

Browse Source
This commit is contained in:
Ed Page 2024-03-20 17:04:10 -05:00
parent 1855a4ad24
commit e4f1eb01c9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cargo/util/toml/mod.rs
View File

@ -1151,10 +1151,8 @@ fn resolve_and_validate_dependencies(
let mut deps: BTreeMap<manifest::PackageName, manifest::InheritableDependency> = let mut deps: BTreeMap<manifest::PackageName, manifest::InheritableDependency> =
BTreeMap::new(); BTreeMap::new();
for (n, v) in dependencies.iter() { for (name_in_toml, v) in dependencies.iter() {
let resolved = dependency_inherit_with(v.clone(), n, inheritable, manifest_ctx)?; let resolved = dependency_inherit_with(v.clone(), name_in_toml, inheritable, manifest_ctx)?;
let dep = dep_to_dependency(&resolved, n, manifest_ctx, kind)?;
let name_in_toml = dep.name_in_toml().as_str();
let kind_name = match kind { let kind_name = match kind {
Some(k) => k.kind_table(), Some(k) => k.kind_table(),
None => "dependencies", None => "dependencies",
@ -1173,7 +1171,7 @@ fn resolve_and_validate_dependencies(
let mut resolved = resolved; let mut resolved = resolved;
if let manifest::TomlDependency::Detailed(ref mut d) = resolved { if let manifest::TomlDependency::Detailed(ref mut d) = resolved {
if d.public.is_some() { if d.public.is_some() {
if matches!(dep.kind(), DepKind::Normal) { if matches!(kind, None) {
if !manifest_ctx if !manifest_ctx
.features .features
.require(Feature::public_dependency()) .require(Feature::public_dependency())
@ -1182,7 +1180,7 @@ fn resolve_and_validate_dependencies(
{ {
d.public = None; d.public = None;
manifest_ctx.warnings.push(format!( manifest_ctx.warnings.push(format!(
"ignoring `public` on dependency {name}, pass `-Zpublic-dependency` to enable support for it", name = &dep.name_in_toml() "ignoring `public` on dependency {name_in_toml}, pass `-Zpublic-dependency` to enable support for it"
)) ))
} }
} else { } else {
@ -1191,9 +1189,10 @@ fn resolve_and_validate_dependencies(
} }
} }
let dep = dep_to_dependency(&resolved, name_in_toml, manifest_ctx, kind)?;
manifest_ctx.deps.push(dep); manifest_ctx.deps.push(dep);
deps.insert( deps.insert(
n.clone(), name_in_toml.clone(),
manifest::InheritableDependency::Value(resolved.clone()), manifest::InheritableDependency::Value(resolved.clone()),
); );
} }