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

refactor(toml): Be consistent in readme resolve name

This commit is contained in:
Ed Page 2024-04-03 13:07:52 -05:00
parent 71e362fb17
commit cc9710e957
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -476,7 +476,7 @@ fn resolve_package_toml<'a>(
.map(|value| field_inherit_with(value, "documentation", || inherit()?.documentation()))
.transpose()?
.map(manifest::InheritableField::Value),
readme: readme_for_package(
readme: resolve_package_readme(
package_root,
original_package
.readme
@ -530,7 +530,7 @@ fn resolve_package_toml<'a>(
}
/// Returns the name of the README file for a [`manifest::TomlPackage`].
fn readme_for_package(
fn resolve_package_readme(
package_root: &Path,
readme: Option<&manifest::StringOrBool>,
) -> Option<String> {
@ -764,7 +764,7 @@ impl InheritableFields {
/// Gets the field `workspace.package.readme`.
fn readme(&self, package_root: &Path) -> CargoResult<manifest::StringOrBool> {
let Some(readme) = readme_for_package(
let Some(readme) = resolve_package_readme(
self._ws_root.as_path(),
self.package.as_ref().and_then(|p| p.readme.as_ref()),
) else {