rust
/
cargo
mirror of https://github.com/rust-lang/cargo
0
0
Fork 0
Code Issues Releases Wiki Activity

refactor(toml): Always create a detailed dep 

This minimizes risk as we add more dependency features
This commit is contained in:
Ed Page 2024-05-01 10:51:36 -05:00
parent 7820a0b446
commit bfe62a670d
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -988,20 +988,13 @@ fn inner_dependency_inherit_with<'a>(
if let Some(false) = pkg_dep.default_features() {
default_features_msg(name, None, warnings);
}
if pkg_dep.optional.is_some()
|| pkg_dep.features.is_some()
|| pkg_dep.public.is_some()
{
manifest::TomlDependency::Detailed(manifest::TomlDetailedDependency {
version: Some(ws_version),
optional: pkg_dep.optional,
features: pkg_dep.features.clone(),
public: pkg_dep.public,
..Default::default()
})
} else {
manifest::TomlDependency::Simple(ws_version)
}
manifest::TomlDependency::Detailed(manifest::TomlDetailedDependency {
version: Some(ws_version),
optional: pkg_dep.optional,
features: pkg_dep.features.clone(),
public: pkg_dep.public,
..Default::default()
})
}
manifest::TomlDependency::Detailed(ws_dep) => {
let mut merged_dep = ws_dep.clone();