mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 10:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean up some function signatures (#633)

Browse source
This commit is contained in:
Charlie Marsh 2023-12-13 01:21:47 -05:00 • committed by GitHub
parent 920e10fc8f
commit cbfd39093e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 30 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/puffin-resolver/src/pubgrub/dependencies.rs
View file

@ -16,12 +16,12 @@ pub struct PubGrubDependencies(DependencyConstraints<PubGrubPackage, Range<PubGr
impl PubGrubDependencies {
/// Generate a set of `PubGrub` dependencies from a set of requirements.
pub(crate) fn try_from_requirements<'a>(
pub(crate) fn from_requirements(
requirements: &[Requirement],
constraints: &[Requirement],
extra: Option<&'a ExtraName>,
source: Option<&'a PackageName>,
env: &'a MarkerEnvironment,
extra: Option<&ExtraName>,
source: Option<&PackageName>,
env: &MarkerEnvironment,
) -> Result<Self, ResolveError> {
let mut dependencies =
DependencyConstraints::<PubGrubPackage, Range<PubGrubVersion>>::default();

4
crates/puffin-resolver/src/resolver.rs
View file

@ -583,7 +583,7 @@ impl<'a, Provider: ResolverProvider> Resolver<'a, Provider> {
match package {
PubGrubPackage::Root(_) => {
// Add the root requirements.
let constraints = PubGrubDependencies::try_from_requirements(
let constraints = PubGrubDependencies::from_requirements(
&self.requirements,
&self.constraints,
None,
@ -618,7 +618,7 @@ impl<'a, Provider: ResolverProvider> Resolver<'a, Provider> {
let entry = self.index.distributions.wait(&dist.package_id()).await;
let metadata = entry.value();
let mut constraints = PubGrubDependencies::try_from_requirements(
let mut constraints = PubGrubDependencies::from_requirements(
&metadata.requires_dist,
&self.constraints,
extra.as_ref(),