@@ -419,8 +419,8 @@ impl<P: Clone> Default for DetailedTomlDependency<P> {
419
419
#[ serde( rename_all = "kebab-case" ) ]
420
420
pub struct TomlManifest {
421
421
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 > > ,
424
424
profile : Option < TomlProfiles > ,
425
425
lib : Option < TomlLibTarget > ,
426
426
bin : Option < Vec < TomlBinTarget > > ,
@@ -1071,7 +1071,7 @@ pub struct TomlWorkspaceField {
1071
1071
/// tables.
1072
1072
#[ derive( Deserialize , Serialize , Clone , Debug ) ]
1073
1073
#[ serde( rename_all = "kebab-case" ) ]
1074
- pub struct TomlProject {
1074
+ pub struct TomlPackage {
1075
1075
edition : Option < MaybeWorkspace < String > > ,
1076
1076
rust_version : Option < MaybeWorkspace < String > > ,
1077
1077
name : InternedString ,
@@ -1229,7 +1229,7 @@ impl InheritableFields {
1229
1229
}
1230
1230
1231
1231
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 (
1233
1233
Err ( anyhow ! ( "`workspace.package.readme` was not defined" ) ) ,
1234
1234
|readme| {
1235
1235
let rel_path =
@@ -1321,7 +1321,7 @@ impl InheritableFields {
1321
1321
}
1322
1322
}
1323
1323
1324
- impl TomlProject {
1324
+ impl TomlPackage {
1325
1325
pub fn to_package_id (
1326
1326
& self ,
1327
1327
source_id : SourceId ,
@@ -1933,7 +1933,7 @@ impl TomlManifest {
1933
1933
. clone ( )
1934
1934
. map ( |mw| mw. resolve ( "documentation" , || inherit ( ) ?. documentation ( ) ) )
1935
1935
. transpose ( ) ?,
1936
- readme : readme_for_project (
1936
+ readme : readme_for_package (
1937
1937
package_root,
1938
1938
project
1939
1939
. readme
@@ -2393,8 +2393,8 @@ fn inheritable_from_path(
2393
2393
}
2394
2394
}
2395
2395
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 > {
2398
2398
match & readme {
2399
2399
None => default_readme_from_package_root ( package_root) ,
2400
2400
Some ( value) => match value {
0 commit comments