Skip to content

Commit b7ca85d

Browse files
committed
refactor: Rename TomlProject to TomlPackage
1 parent ab18bd4 commit b7ca85d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/cargo/util/toml/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,8 @@ impl<P: Clone> Default for DetailedTomlDependency<P> {
419419
#[serde(rename_all = "kebab-case")]
420420
pub struct TomlManifest {
421421
cargo_features: Option<Vec<String>>,
422-
package: Option<Box<TomlProject>>,
423-
project: Option<Box<TomlProject>>,
422+
package: Option<Box<TomlPackage>>,
423+
project: Option<Box<TomlPackage>>,
424424
profile: Option<TomlProfiles>,
425425
lib: Option<TomlLibTarget>,
426426
bin: Option<Vec<TomlBinTarget>>,
@@ -1071,7 +1071,7 @@ pub struct TomlWorkspaceField {
10711071
/// tables.
10721072
#[derive(Deserialize, Serialize, Clone, Debug)]
10731073
#[serde(rename_all = "kebab-case")]
1074-
pub struct TomlProject {
1074+
pub struct TomlPackage {
10751075
edition: Option<MaybeWorkspace<String>>,
10761076
rust_version: Option<MaybeWorkspace<String>>,
10771077
name: InternedString,
@@ -1229,7 +1229,7 @@ impl InheritableFields {
12291229
}
12301230

12311231
pub fn readme(&self, package_root: &Path) -> CargoResult<StringOrBool> {
1232-
readme_for_project(self.ws_root.as_path(), self.readme.clone()).map_or(
1232+
readme_for_package(self.ws_root.as_path(), self.readme.clone()).map_or(
12331233
Err(anyhow!("`workspace.package.readme` was not defined")),
12341234
|readme| {
12351235
let rel_path =
@@ -1321,7 +1321,7 @@ impl InheritableFields {
13211321
}
13221322
}
13231323

1324-
impl TomlProject {
1324+
impl TomlPackage {
13251325
pub fn to_package_id(
13261326
&self,
13271327
source_id: SourceId,
@@ -1933,7 +1933,7 @@ impl TomlManifest {
19331933
.clone()
19341934
.map(|mw| mw.resolve("documentation", || inherit()?.documentation()))
19351935
.transpose()?,
1936-
readme: readme_for_project(
1936+
readme: readme_for_package(
19371937
package_root,
19381938
project
19391939
.readme
@@ -2393,8 +2393,8 @@ fn inheritable_from_path(
23932393
}
23942394
}
23952395

2396-
/// Returns the name of the README file for a `TomlProject`.
2397-
pub fn readme_for_project(package_root: &Path, readme: Option<StringOrBool>) -> Option<String> {
2396+
/// Returns the name of the README file for a [`TomlPackage`].
2397+
pub fn readme_for_package(package_root: &Path, readme: Option<StringOrBool>) -> Option<String> {
23982398
match &readme {
23992399
None => default_readme_from_package_root(package_root),
24002400
Some(value) => match value {

0 commit comments

Comments
 (0)