development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-27 19:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(toml): Rely on resolved badges

Browse source
This commit is contained in:
Ed Page 2024-03-25 20:16:00 -05:00
parent 611b6889a6
commit 3d1da63222
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/cargo/util/toml/mod.rs
View file

@ -1032,6 +1032,11 @@ pub fn to_real_manifest(
}
}
let resolved_badges = original_toml
.badges
.clone()
.map(|mw| field_inherit_with(mw, "badges", || inherit()?.badges()))
.transpose()?;
let metadata = ManifestMetadata {
description: resolved_package
.resolved_description()
@ -1076,12 +1081,7 @@ pub fn to_real_manifest(
.expect("previously resolved")
.cloned()
.unwrap_or_default(),
badges: original_toml
.badges
.clone()
.map(|mw| field_inherit_with(mw, "badges", || inherit()?.badges()))
.transpose()?
.unwrap_or_default(),
badges: resolved_badges.clone().unwrap_or_default(),
links: resolved_package.links.clone(),
rust_version: rust_version.clone(),
};
@ -1200,10 +1200,7 @@ pub fn to_real_manifest(
replace: original_toml.replace.clone(),
patch: original_toml.patch.clone(),
workspace: original_toml.workspace.clone(),
badges: original_toml
.badges
.as_ref()
.map(|_| manifest::InheritableField::Value(metadata.badges.clone())),
badges: resolved_badges.map(manifest::InheritableField::Value),
lints: resolved_lints.map(|lints| manifest::InheritableLints {
workspace: false,
lints,