mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-10-01 22:41:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename "constraints" to "dependencies" in resolver (#3552)

Browse source 
## Summary

It's confusing that we use `constraints` here because constraints mean
something else for us (e.g., `--constraint constraints.txt`). These are
really the dependencies of a given `PubGrubPackage` -- the type is even
called `PubGrubDependencies`.
This commit is contained in:
Charlie Marsh 2024-05-13 12:30:16 -04:00 • committed by GitHub
parent 790206beb1
commit eb8e733790
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/uv-resolver/src/resolver/mod.rs
View file

@ -878,7 +878,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
match package { match package {
PubGrubPackage::Root(_) => { PubGrubPackage::Root(_) => {
// Add the root requirements. // Add the root requirements.
let constraints = PubGrubDependencies::from_requirements( let dependencies = PubGrubDependencies::from_requirements(
&self.requirements, &self.requirements,
&self.constraints, &self.constraints,
&self.overrides, &self.overrides,
@ -889,8 +889,8 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
self.markers, self.markers,
); );
let mut constraints = match constraints { let mut dependencies = match dependencies {
Ok(constraints) => constraints, Ok(dependencies) => dependencies,
Err(err) => { Err(err) => {
return Ok(Dependencies::Unavailable( return Ok(Dependencies::Unavailable(
UnavailableVersion::ResolverError(uncapitalize(err.to_string())), UnavailableVersion::ResolverError(uncapitalize(err.to_string())),
@ -898,7 +898,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
} }
}; };
for (package, version) in constraints.iter() { for (package, version) in dependencies.iter() {
debug!("Adding direct dependency: {package}{version}"); debug!("Adding direct dependency: {package}{version}");
// Update the package priorities. // Update the package priorities.
@ -918,11 +918,11 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
priorities.insert(&package, &version); priorities.insert(&package, &version);
// Add the editable as a direct dependency. // Add the editable as a direct dependency.
constraints.push(package, version); dependencies.push(package, version);
// Add a dependency on each extra. // Add a dependency on each extra.
for extra in &editable.extras { for extra in &editable.extras {
constraints.push( dependencies.push(
PubGrubPackage::from_package( PubGrubPackage::from_package(
metadata.name.clone(), metadata.name.clone(),
Some(extra.clone()), Some(extra.clone()),
@ -933,7 +933,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
} }
} }
Ok(Dependencies::Available(constraints.into())) Ok(Dependencies::Available(dependencies.into()))
} }
PubGrubPackage::Python(_) => Ok(Dependencies::Available(Vec::default())), PubGrubPackage::Python(_) => Ok(Dependencies::Available(Vec::default())),
@ -971,7 +971,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
.cloned() .cloned()
.map(Requirement::from_pep508) .map(Requirement::from_pep508)
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
let constraints = PubGrubDependencies::from_requirements( let dependencies = PubGrubDependencies::from_requirements(
&requirements, &requirements,
&self.constraints, &self.constraints,
&self.overrides, &self.overrides,
@ -982,7 +982,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
self.markers, self.markers,
)?; )?;
for (dep_package, dep_version) in constraints.iter() { for (dep_package, dep_version) in dependencies.iter() {
debug!("Adding transitive dependency for {package}=={version}: {dep_package}{dep_version}"); debug!("Adding transitive dependency for {package}=={version}: {dep_package}{dep_version}");
// Update the package priorities. // Update the package priorities.
@ -992,7 +992,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
self.visit_package(dep_package, request_sink).await?; self.visit_package(dep_package, request_sink).await?;
} }
return Ok(Dependencies::Available(constraints.into())); return Ok(Dependencies::Available(dependencies.into()));
} }
// Determine the distribution to lookup. // Determine the distribution to lookup.
@ -1095,7 +1095,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
.cloned() .cloned()
.map(Requirement::from_pep508) .map(Requirement::from_pep508)
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
let constraints = PubGrubDependencies::from_requirements( let dependencies = PubGrubDependencies::from_requirements(
&requirements, &requirements,
&self.constraints, &self.constraints,
&self.overrides, &self.overrides,
@ -1106,7 +1106,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
self.markers, self.markers,
)?; )?;
for (dep_package, dep_version) in constraints.iter() { for (dep_package, dep_version) in dependencies.iter() {
debug!("Adding transitive dependency for {package}=={version}: {dep_package}{dep_version}"); debug!("Adding transitive dependency for {package}=={version}: {dep_package}{dep_version}");
// Update the package priorities. // Update the package priorities.
@ -1116,7 +1116,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
self.visit_package(dep_package, request_sink).await?; self.visit_package(dep_package, request_sink).await?;
} }
Ok(Dependencies::Available(constraints.into())) Ok(Dependencies::Available(dependencies.into()))
} }
// Add a dependency on both the extra and base package. // Add a dependency on both the extra and base package.