Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove set language from `PubGrubDependencies` in favor of generic collection

This commit is contained in:
Zanie 2023-11-09 11:49:51 -06:00
parent a510a2f882
commit 638fb10302
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ use crate::ResolveError;
pub struct PubGrubDependencies(Vec<(PubGrubPackage, Range<PubGrubVersion>)>); pub struct PubGrubDependencies(Vec<(PubGrubPackage, Range<PubGrubVersion>)>);
impl PubGrubDependencies { 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>( pub(crate) fn try_from_requirements<'a>(
requirements: &[Requirement], requirements: &[Requirement],
constraints: &[Requirement], constraints: &[Requirement],
@ -97,8 +97,8 @@ impl PubGrubDependencies {
Ok(Self(dependencies)) Ok(Self(dependencies))
} }
// Insert a [`PubGrubPackage`] and [`PubGrubVersion`] range into the set of dependencies. // Add a [`PubGrubPackage`] and [`PubGrubVersion`] range into the dependencies.
pub(crate) fn insert(&mut self, package: PubGrubPackage, version: Range<PubGrubVersion>) { pub(crate) fn push(&mut self, package: PubGrubPackage, version: Range<PubGrubVersion>) {
self.0.push((package, version)) 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<PubGrubDependencies> for Vec<(PubGrubPackage, Range<PubGrubVersion>)> { impl From<PubGrubDependencies> for Vec<(PubGrubPackage, Range<PubGrubVersion>)> {
fn from(dependencies: PubGrubDependencies) -> Self { fn from(dependencies: PubGrubDependencies) -> Self {
dependencies.0 dependencies.0

2
crates/puffin-resolver/src/resolver.rs
View File

@ -529,7 +529,7 @@ impl<'a, Context: BuildContext + Sync> Resolver<'a, Context> {
{ {
return Ok(Dependencies::Unknown); return Ok(Dependencies::Unknown);
} }
constraints.insert( constraints.push(
PubGrubPackage::Package(package_name.clone(), None), PubGrubPackage::Package(package_name.clone(), None),
Range::singleton(version.clone()), Range::singleton(version.clone()),
); );