From 51f4ab1c8d446e02943196afcf48e8b2f6ec97ad Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 9 May 2024 15:27:59 -0400 Subject: [PATCH] Use defaults in `RequirementsSpecification` constructors (#3495) --- crates/uv-requirements/src/specification.rs | 56 ++------------------- 1 file changed, 5 insertions(+), 51 deletions(-) diff --git a/crates/uv-requirements/src/specification.rs b/crates/uv-requirements/src/specification.rs index 30290a049..811d2e1a7 100644 --- a/crates/uv-requirements/src/specification.rs +++ b/crates/uv-requirements/src/specification.rs @@ -67,50 +67,27 @@ impl RequirementsSpecification { let requirement = RequirementsTxtRequirement::parse(name, std::env::current_dir()?) .with_context(|| format!("Failed to parse `{name}`"))?; Self { - project: None, requirements: vec![UnresolvedRequirementSpecification::try_from( RequirementEntry { requirement, hashes: vec![], }, )?], - constraints: vec![], - overrides: vec![], - editables: vec![], - source_trees: vec![], - extras: FxHashSet::default(), - index_url: None, - extra_index_urls: vec![], - no_index: false, - find_links: vec![], - no_binary: NoBinary::default(), - no_build: NoBuild::default(), + ..Self::default() } } RequirementsSource::Editable(name) => { let requirement = EditableRequirement::parse(name, None, std::env::current_dir()?) .with_context(|| format!("Failed to parse `{name}`"))?; Self { - project: None, - requirements: vec![], - constraints: vec![], - overrides: vec![], editables: vec![requirement], - source_trees: vec![], - extras: FxHashSet::default(), - index_url: None, - extra_index_urls: vec![], - no_index: false, - find_links: vec![], - no_binary: NoBinary::default(), - no_build: NoBuild::default(), + ..Self::default() } } RequirementsSource::RequirementsTxt(path) => { let requirements_txt = RequirementsTxt::parse(path, std::env::current_dir()?, client_builder).await?; Self { - project: None, requirements: requirements_txt .requirements .into_iter() @@ -121,10 +98,7 @@ impl RequirementsSpecification { .into_iter() .map(Requirement::from_pep508) .collect::>()?, - overrides: vec![], editables: requirements_txt.editables, - source_trees: vec![], - extras: FxHashSet::default(), index_url: requirements_txt.index_url.map(IndexUrl::from), extra_index_urls: requirements_txt .extra_index_urls @@ -142,6 +116,7 @@ impl RequirementsSpecification { .collect(), no_binary: requirements_txt.no_binary, no_build: requirements_txt.only_binary, + ..Self::default() } } RequirementsSource::PyprojectToml(path) => { @@ -150,19 +125,8 @@ impl RequirementsSpecification { .with_context(|| format!("Failed to parse `{}`", path.user_display()))? } RequirementsSource::SetupPy(path) | RequirementsSource::SetupCfg(path) => Self { - project: None, - requirements: vec![], - constraints: vec![], - overrides: vec![], - editables: vec![], source_trees: vec![path.clone()], - extras: FxHashSet::default(), - index_url: None, - extra_index_urls: vec![], - no_index: false, - find_links: vec![], - no_binary: NoBinary::default(), - no_build: NoBuild::default(), + ..Self::default() }, RequirementsSource::SourceTree(path) => Self { project: None, @@ -175,17 +139,7 @@ impl RequirementsSpecification { }), hashes: vec![], }], - constraints: vec![], - overrides: vec![], - editables: vec![], - source_trees: vec![], - extras: FxHashSet::default(), - index_url: None, - extra_index_urls: vec![], - no_index: false, - find_links: vec![], - no_binary: NoBinary::default(), - no_build: NoBuild::default(), + ..Self::default() }, }) }