mirror of
https://github.com/rust-lang/cargo.git
synced 2025-10-01 11:30:39 +00:00
refactor(toml): Rely on resolved homepage
This commit is contained in:
parent
f96638ea3b
commit
5b5f64460b
@ -210,6 +210,10 @@ impl TomlPackage {
|
|||||||
pub fn resolved_description(&self) -> Result<Option<&String>, UnresolvedError> {
|
pub fn resolved_description(&self) -> Result<Option<&String>, UnresolvedError> {
|
||||||
self.description.as_ref().map(|v| v.resolved()).transpose()
|
self.description.as_ref().map(|v| v.resolved()).transpose()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn resolved_homepage(&self) -> Result<Option<&String>, UnresolvedError> {
|
||||||
|
self.homepage.as_ref().map(|v| v.resolved()).transpose()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// An enum that allows for inheriting keys from a workspace in a Cargo.toml.
|
/// An enum that allows for inheriting keys from a workspace in a Cargo.toml.
|
||||||
|
@ -568,6 +568,12 @@ pub fn to_real_manifest(
|
|||||||
.map(|value| field_inherit_with(value, "description", || inherit()?.description()))
|
.map(|value| field_inherit_with(value, "description", || inherit()?.description()))
|
||||||
.transpose()?
|
.transpose()?
|
||||||
.map(manifest::InheritableField::Value);
|
.map(manifest::InheritableField::Value);
|
||||||
|
package.homepage = package
|
||||||
|
.homepage
|
||||||
|
.clone()
|
||||||
|
.map(|value| field_inherit_with(value, "homepage", || inherit()?.homepage()))
|
||||||
|
.transpose()?
|
||||||
|
.map(manifest::InheritableField::Value);
|
||||||
|
|
||||||
let rust_version = package
|
let rust_version = package
|
||||||
.resolved_rust_version()
|
.resolved_rust_version()
|
||||||
@ -872,10 +878,9 @@ pub fn to_real_manifest(
|
|||||||
.expect("previously resolved")
|
.expect("previously resolved")
|
||||||
.cloned(),
|
.cloned(),
|
||||||
homepage: package
|
homepage: package
|
||||||
.homepage
|
.resolved_homepage()
|
||||||
.clone()
|
.expect("previously resolved")
|
||||||
.map(|mw| field_inherit_with(mw, "homepage", || inherit()?.homepage()))
|
.cloned(),
|
||||||
.transpose()?,
|
|
||||||
documentation: package
|
documentation: package
|
||||||
.documentation
|
.documentation
|
||||||
.clone()
|
.clone()
|
||||||
@ -932,10 +937,6 @@ pub fn to_real_manifest(
|
|||||||
links: package.links.clone(),
|
links: package.links.clone(),
|
||||||
rust_version: rust_version.clone(),
|
rust_version: rust_version.clone(),
|
||||||
};
|
};
|
||||||
package.homepage = metadata
|
|
||||||
.homepage
|
|
||||||
.clone()
|
|
||||||
.map(|homepage| manifest::InheritableField::Value(homepage));
|
|
||||||
package.documentation = metadata
|
package.documentation = metadata
|
||||||
.documentation
|
.documentation
|
||||||
.clone()
|
.clone()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user