Skip to content

Commit 1850549

Browse files
MuscraftMuscraft
committed
refactor: Reduce use of project in util/mod.rs 
1 parent b7ca85d commit 1850549

File tree

1 file changed

+54
-54
lines changed

1 file changed

+54
-54
lines changed

‎src/cargo/util/toml/mod.rs

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,10 +1578,10 @@ impl TomlManifest {
15781578
let cargo_features = me.cargo_features.as_ref().unwrap_or(&empty);
15791579
let features = Features::new(cargo_features, config, &mut warnings, source_id.is_path())?;
15801580

1581-
let project = me.project.clone().or_else(|| me.package.clone());
1582-
let project = &mut project.ok_or_else(|| anyhow!("no `package` section found"))?;
1581+
let package = me.project.clone().or_else(|| me.package.clone());
1582+
let package = &mut package.ok_or_else(|| anyhow!("no `package` section found"))?;
15831583

1584-
let workspace_config = match (me.workspace.as_ref(), project.workspace.as_ref()) {
1584+
let workspace_config = match (me.workspace.as_ref(), package.workspace.as_ref()) {
15851585
(Some(toml_config), None) => {
15861586
let mut inheritable = toml_config.package.clone().unwrap_or_default();
15871587
inheritable.update_ws_path(package_root.to_path_buf());
@@ -1609,7 +1609,7 @@ impl TomlManifest {
16091609
),
16101610
};
16111611

1612-
let package_name = project.name.trim();
1612+
let package_name = package.name.trim();
16131613
if package_name.is_empty() {
16141614
bail!("package name cannot be an empty string")
16151615
}
@@ -1622,21 +1622,21 @@ impl TomlManifest {
16221622
let inherit =
16231623
|| inherit_cell.try_borrow_with(|| get_ws(config, &resolved_path, &workspace_config));
16241624

1625-
let version = project
1625+
let version = package
16261626
.version
16271627
.clone()
16281628
.resolve("version", || inherit()?.version())?;
16291629

1630-
project.version = MaybeWorkspace::Defined(version.clone());
1630+
package.version = MaybeWorkspace::Defined(version.clone());
16311631

1632-
let pkgid = project.to_package_id(source_id, version)?;
1632+
let pkgid = package.to_package_id(source_id, version)?;
16331633

1634-
let edition = if let Some(edition) = project.edition.clone() {
1634+
let edition = if let Some(edition) = package.edition.clone() {
16351635
let edition: Edition = edition
16361636
.resolve("edition", || inherit()?.edition())?
16371637
.parse()
16381638
.with_context(|| "failed to parse the `edition` key")?;
1639-
project.edition = Some(MaybeWorkspace::Defined(edition.to_string()));
1639+
package.edition = Some(MaybeWorkspace::Defined(edition.to_string()));
16401640
edition
16411641
} else {
16421642
Edition::Edition2015
@@ -1655,7 +1655,7 @@ impl TomlManifest {
16551655
)));
16561656
}
16571657

1658-
let rust_version = if let Some(rust_version) = &project.rust_version {
1658+
let rust_version = if let Some(rust_version) = &package.rust_version {
16591659
let rust_version = rust_version
16601660
.clone()
16611661
.resolve("rust_version", || inherit()?.rust_version())?;
@@ -1682,12 +1682,12 @@ impl TomlManifest {
16821682
None
16831683
};
16841684

1685-
if project.metabuild.is_some() {
1685+
if package.metabuild.is_some() {
16861686
features.require(Feature::metabuild())?;
16871687
}
16881688

16891689
let resolve_behavior = match (
1690-
project.resolver.as_ref(),
1690+
package.resolver.as_ref(),
16911691
me.workspace.as_ref().and_then(|ws| ws.resolver.as_ref()),
16921692
) {
16931693
(None, None) => None,
@@ -1706,8 +1706,8 @@ impl TomlManifest {
17061706
package_name,
17071707
package_root,
17081708
edition,
1709-
&project.build,
1710-
&project.metabuild,
1709+
&package.build,
1710+
&package.metabuild,
17111711
&mut warnings,
17121712
&mut errors,
17131713
)?;
@@ -1724,7 +1724,7 @@ impl TomlManifest {
17241724
));
17251725
}
17261726

1727-
if let Some(links) = &project.links {
1727+
if let Some(links) = &package.links {
17281728
if !targets.iter().any(|t| t.is_custom_build()) {
17291729
bail!(
17301730
"package `{}` specifies that it links to `{}` but does not \
@@ -1895,13 +1895,13 @@ impl TomlManifest {
18951895
}
18961896
}
18971897

1898-
let exclude = project
1898+
let exclude = package
18991899
.exclude
19001900
.clone()
19011901
.map(|mw| mw.resolve("exclude", || inherit()?.exclude()))
19021902
.transpose()?
19031903
.unwrap_or_default();
1904-
let include = project
1904+
let include = package
19051905
.include
19061906
.clone()
19071907
.map(|mw| mw.resolve("include", || inherit()?.include()))
@@ -1914,61 +1914,61 @@ impl TomlManifest {
19141914
pkgid,
19151915
deps,
19161916
me.features.as_ref().unwrap_or(&empty_features),
1917-
project.links.as_deref(),
1917+
package.links.as_deref(),
19181918
)?;
19191919

19201920
let metadata = ManifestMetadata {
1921-
description: project
1921+
description: package
19221922
.description
19231923
.clone()
19241924
.map(|mw| mw.resolve("description", || inherit()?.description()))
19251925
.transpose()?,
1926-
homepage: project
1926+
homepage: package
19271927
.homepage
19281928
.clone()
19291929
.map(|mw| mw.resolve("homepage", || inherit()?.homepage()))
19301930
.transpose()?,
1931-
documentation: project
1931+
documentation: package
19321932
.documentation
19331933
.clone()
19341934
.map(|mw| mw.resolve("documentation", || inherit()?.documentation()))
19351935
.transpose()?,
19361936
readme: readme_for_package(
19371937
package_root,
1938-
project
1938+
package
19391939
.readme
19401940
.clone()
19411941
.map(|mw| mw.resolve("readme", || inherit()?.readme(package_root)))
19421942
.transpose()?,
19431943
),
1944-
authors: project
1944+
authors: package
19451945
.authors
19461946
.clone()
19471947
.map(|mw| mw.resolve("authors", || inherit()?.authors()))
19481948
.transpose()?
19491949
.unwrap_or_default(),
1950-
license: project
1950+
license: package
19511951
.license
19521952
.clone()
19531953
.map(|mw| mw.resolve("license", || inherit()?.license()))
19541954
.transpose()?,
1955-
license_file: project
1955+
license_file: package
19561956
.license_file
19571957
.clone()
19581958
.map(|mw| mw.resolve("license", || inherit()?.license_file(package_root)))
19591959
.transpose()?,
1960-
repository: project
1960+
repository: package
19611961
.repository
19621962
.clone()
19631963
.map(|mw| mw.resolve("repository", || inherit()?.repository()))
19641964
.transpose()?,
1965-
keywords: project
1965+
keywords: package
19661966
.keywords
19671967
.clone()
19681968
.map(|mw| mw.resolve("keywords", || inherit()?.keywords()))
19691969
.transpose()?
19701970
.unwrap_or_default(),
1971-
categories: project
1971+
categories: package
19721972
.categories
19731973
.clone()
19741974
.map(|mw| mw.resolve("categories", || inherit()?.categories()))
@@ -1980,54 +1980,54 @@ impl TomlManifest {
19801980
.map(|mw| mw.resolve("badges", || inherit()?.badges()))
19811981
.transpose()?
19821982
.unwrap_or_default(),
1983-
links: project.links.clone(),
1983+
links: package.links.clone(),
19841984
};
1985-
project.description = metadata
1985+
package.description = metadata
19861986
.description
19871987
.clone()
19881988
.map(|description| MaybeWorkspace::Defined(description));
1989-
project.homepage = metadata
1989+
package.homepage = metadata
19901990
.homepage
19911991
.clone()
19921992
.map(|homepage| MaybeWorkspace::Defined(homepage));
1993-
project.documentation = metadata
1993+
package.documentation = metadata
19941994
.documentation
19951995
.clone()
19961996
.map(|documentation| MaybeWorkspace::Defined(documentation));
1997-
project.readme = metadata
1997+
package.readme = metadata
19981998
.readme
19991999
.clone()
20002000
.map(|readme| MaybeWorkspace::Defined(StringOrBool::String(readme)));
2001-
project.authors = project
2001+
package.authors = package
20022002
.authors
20032003
.as_ref()
20042004
.map(|_| MaybeWorkspace::Defined(metadata.authors.clone()));
2005-
project.license = metadata
2005+
package.license = metadata
20062006
.license
20072007
.clone()
20082008
.map(|license| MaybeWorkspace::Defined(license));
2009-
project.license_file = metadata
2009+
package.license_file = metadata
20102010
.license_file
20112011
.clone()
20122012
.map(|license_file| MaybeWorkspace::Defined(license_file));
2013-
project.repository = metadata
2013+
package.repository = metadata
20142014
.repository
20152015
.clone()
20162016
.map(|repository| MaybeWorkspace::Defined(repository));
2017-
project.keywords = project
2017+
package.keywords = package
20182018
.keywords
20192019
.as_ref()
20202020
.map(|_| MaybeWorkspace::Defined(metadata.keywords.clone()));
2021-
project.categories = project
2021+
package.categories = package
20222022
.categories
20232023
.as_ref()
20242024
.map(|_| MaybeWorkspace::Defined(metadata.categories.clone()));
2025-
project.rust_version = rust_version.clone().map(|rv| MaybeWorkspace::Defined(rv));
2026-
project.exclude = project
2025+
package.rust_version = rust_version.clone().map(|rv| MaybeWorkspace::Defined(rv));
2026+
package.exclude = package
20272027
.exclude
20282028
.as_ref()
20292029
.map(|_| MaybeWorkspace::Defined(exclude.clone()));
2030-
project.include = project
2030+
package.include = package
20312031
.include
20322032
.as_ref()
20332033
.map(|_| MaybeWorkspace::Defined(include.clone()));
@@ -2037,12 +2037,12 @@ impl TomlManifest {
20372037
profiles.validate(&features, &mut warnings)?;
20382038
}
20392039

2040-
let publish = project
2040+
let publish = package
20412041
.publish
20422042
.clone()
20432043
.map(|publish| publish.resolve("publish", || inherit()?.publish()).unwrap());
20442044

2045-
project.publish = publish.clone().map(|p| MaybeWorkspace::Defined(p));
2045+
package.publish = publish.clone().map(|p| MaybeWorkspace::Defined(p));
20462046

20472047
let publish = match publish {
20482048
Some(VecStringOrBool::VecString(ref vecstring)) => Some(vecstring.clone()),
@@ -2058,7 +2058,7 @@ impl TomlManifest {
20582058
)
20592059
}
20602060

2061-
if let Some(run) = &project.default_run {
2061+
if let Some(run) = &package.default_run {
20622062
if !targets
20632063
.iter()
20642064
.filter(|t| t.is_bin())
@@ -2070,22 +2070,22 @@ impl TomlManifest {
20702070
}
20712071
}
20722072

2073-
let default_kind = project
2073+
let default_kind = package
20742074
.default_target
20752075
.as_ref()
20762076
.map(|t| CompileTarget::new(&*t))
20772077
.transpose()?
20782078
.map(CompileKind::Target);
2079-
let forced_kind = project
2079+
let forced_kind = package
20802080
.forced_target
20812081
.as_ref()
20822082
.map(|t| CompileTarget::new(&*t))
20832083
.transpose()?
20842084
.map(CompileKind::Target);
2085-
let custom_metadata = project.metadata.clone();
2085+
let custom_metadata = package.metadata.clone();
20862086
let resolved_toml = TomlManifest {
20872087
cargo_features: me.cargo_features.clone(),
2088-
package: Some(project.clone()),
2088+
package: Some(package.clone()),
20892089
project: None,
20902090
profile: me.profile.clone(),
20912091
lib: me.lib.clone(),
@@ -2115,7 +2115,7 @@ impl TomlManifest {
21152115
targets,
21162116
exclude,
21172117
include,
2118-
project.links.clone(),
2118+
package.links.clone(),
21192119
metadata,
21202120
custom_metadata,
21212121
profiles,
@@ -2126,13 +2126,13 @@ impl TomlManifest {
21262126
features,
21272127
edition,
21282128
rust_version,
2129-
project.im_a_teapot,
2130-
project.default_run.clone(),
2129+
package.im_a_teapot,
2130+
package.default_run.clone(),
21312131
Rc::new(resolved_toml),
2132-
project.metabuild.clone().map(|sov| sov.0),
2132+
package.metabuild.clone().map(|sov| sov.0),
21332133
resolve_behavior,
21342134
);
2135-
if project.license_file.is_some() && project.license.is_some() {
2135+
if package.license_file.is_some() && package.license.is_some() {
21362136
manifest.warnings_mut().add_warning(
21372137
"only one of `license` or `license-file` is necessary\n\
21382138
`license` should be used if the package license can be expressed \

0 commit comments

Comments
 (0)