development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-07-17 11:08:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(toml): Rely on resolved publish

Browse source
This commit is contained in:
Ed Page 2024-03-19 15:04:12 -05:00
parent 20302b34b7
commit 2ea1ac6fac
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/cargo-util-schemas/src/manifest/mod.rs
View file

@ -219,6 +219,10 @@ impl TomlPackage {
self.include.as_ref().map(|v| v.resolved()).transpose()
}
pub fn resolved_publish(&self) -> Result<Option<&VecStringOrBool>, UnresolvedError> {
self.publish.as_ref().map(|v| v.resolved()).transpose()
}
pub fn resolved_description(&self) -> Result<Option<&String>, UnresolvedError> {
self.description.as_ref().map(|v| v.resolved()).transpose()
}

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

@ -580,6 +580,12 @@ pub fn to_real_manifest(
.map(|value| field_inherit_with(value, "include", || inherit()?.include()))
.transpose()?
.map(manifest::InheritableField::Value);
package.publish = package
.publish
.clone()
.map(|value| field_inherit_with(value, "publish", || inherit()?.publish()))
.transpose()?
.map(manifest::InheritableField::Value);
package.description = package
.description
.clone()
@ -986,17 +992,8 @@ pub fn to_real_manifest(
validate_profiles(profiles, cli_unstable, &features, warnings)?;
}
let publish = package
.publish
.clone()
.map(|publish| field_inherit_with(publish, "publish", || inherit()?.publish()).unwrap());
package.publish = publish
.clone()
.map(|p| manifest::InheritableField::Value(p));
let version = package.resolved_version().expect("previously resolved");
let publish = match publish {
let publish = match package.resolved_publish().expect("previously resolved") {
Some(manifest::VecStringOrBool::VecString(ref vecstring)) => Some(vecstring.clone()),
Some(manifest::VecStringOrBool::Bool(false)) => Some(vec![]),
Some(manifest::VecStringOrBool::Bool(true)) => None,