Skip to content

Commit bfe62a6

Browse files
committed
refactor(toml): Always create a detailed dep
This minimizes risk as we add more dependency features
1 parent 7820a0b commit bfe62a6

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

src/cargo/util/toml/mod.rs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -988,20 +988,13 @@ fn inner_dependency_inherit_with<'a>(
988988
if let Some(false) = pkg_dep.default_features() {
989989
default_features_msg(name, None, warnings);
990990
}
991-
if pkg_dep.optional.is_some()
992-
|| pkg_dep.features.is_some()
993-
|| pkg_dep.public.is_some()
994-
{
995-
manifest::TomlDependency::Detailed(manifest::TomlDetailedDependency {
996-
version: Some(ws_version),
997-
optional: pkg_dep.optional,
998-
features: pkg_dep.features.clone(),
999-
public: pkg_dep.public,
1000-
..Default::default()
1001-
})
1002-
} else {
1003-
manifest::TomlDependency::Simple(ws_version)
1004-
}
991+
manifest::TomlDependency::Detailed(manifest::TomlDetailedDependency {
992+
version: Some(ws_version),
993+
optional: pkg_dep.optional,
994+
features: pkg_dep.features.clone(),
995+
public: pkg_dep.public,
996+
..Default::default()
997+
})
1005998
}
1006999
manifest::TomlDependency::Detailed(ws_dep) => {
10071000
let mut merged_dep = ws_dep.clone();

0 commit comments

Comments
 (0)