From 638fb1030283904e6e3d7704dab6af8eadc1ef5c Mon Sep 17 00:00:00 2001 From: Zanie Date: Thu, 9 Nov 2023 11:49:51 -0600 Subject: [PATCH] Remove set language from `PubGrubDependencies` in favor of generic collection --- crates/puffin-resolver/src/pubgrub/dependencies.rs | 8 ++++---- crates/puffin-resolver/src/resolver.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/puffin-resolver/src/pubgrub/dependencies.rs b/crates/puffin-resolver/src/pubgrub/dependencies.rs index 4b1ed9bb5..d4020d60c 100644 --- a/crates/puffin-resolver/src/pubgrub/dependencies.rs +++ b/crates/puffin-resolver/src/pubgrub/dependencies.rs @@ -14,7 +14,7 @@ use crate::ResolveError; pub struct PubGrubDependencies(Vec<(PubGrubPackage, Range)>); impl PubGrubDependencies { - /// Generate a set of `PubGrub` dependencies from a set of requirements. + /// Generate a collection of `PubGrub` dependencies from a collection of requirements. pub(crate) fn try_from_requirements<'a>( requirements: &[Requirement], constraints: &[Requirement], @@ -97,8 +97,8 @@ impl PubGrubDependencies { Ok(Self(dependencies)) } - // Insert a [`PubGrubPackage`] and [`PubGrubVersion`] range into the set of dependencies. - pub(crate) fn insert(&mut self, package: PubGrubPackage, version: Range) { + // Add a [`PubGrubPackage`] and [`PubGrubVersion`] range into the dependencies. + pub(crate) fn push(&mut self, package: PubGrubPackage, version: Range) { self.0.push((package, version)) } @@ -108,7 +108,7 @@ impl PubGrubDependencies { } } -/// Convert a [`PubGrubDependencies`] to a [`DependencyConstraints`]. +/// Convert a [`PubGrubDependencies`] to a [`Vec`]. impl From for Vec<(PubGrubPackage, Range)> { fn from(dependencies: PubGrubDependencies) -> Self { dependencies.0 diff --git a/crates/puffin-resolver/src/resolver.rs b/crates/puffin-resolver/src/resolver.rs index 83154d565..dc3a23dd3 100644 --- a/crates/puffin-resolver/src/resolver.rs +++ b/crates/puffin-resolver/src/resolver.rs @@ -529,7 +529,7 @@ impl<'a, Context: BuildContext + Sync> Resolver<'a, Context> { { return Ok(Dependencies::Unknown); } - constraints.insert( + constraints.push( PubGrubPackage::Package(package_name.clone(), None), Range::singleton(version.clone()), );