mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-24 13:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove clones from satisfies variants (#10876)

Browse source
This commit is contained in:
Charlie Marsh 2025-01-22 16:22:07 -05:00 • committed by GitHub
parent a539d33021
commit 088c194159
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/uv-resolver/src/lock/mod.rs
View file

@ -1319,17 +1319,14 @@ impl Lock {
// case, we'd expect the version to be omitted).
if package.id.source.is_source_tree() {
if metadata.dynamic {
return Ok(SatisfiesResult::MismatchedDynamic(
package.id.name.clone(),
false,
));
return Ok(SatisfiesResult::MismatchedDynamic(&package.id.name, false));
}
}
// Validate the `version` metadata.
if metadata.version != *version {
return Ok(SatisfiesResult::MismatchedVersion(
package.id.name.clone(),
&package.id.name,
version.clone(),
Some(metadata.version.clone()),
));
@ -1434,10 +1431,7 @@ impl Lock {
// Validate that the package is still dynamic.
if !metadata.dynamic {
return Ok(SatisfiesResult::MismatchedDynamic(
package.id.name.clone(),
true,
));
return Ok(SatisfiesResult::MismatchedDynamic(&package.id.name, true));
}
// Validate that the requirements are unchanged.
@ -1447,7 +1441,7 @@ impl Lock {
}
}
} else {
return Ok(SatisfiesResult::MissingVersion(package.id.name.clone()));
return Ok(SatisfiesResult::MissingVersion(&package.id.name));
}
// Recurse.
@ -1511,9 +1505,9 @@ pub enum SatisfiesResult<'lock> {
/// A workspace member switched from virtual to non-virtual or vice versa.
MismatchedVirtual(PackageName, bool),
/// A source tree switched from dynamic to non-dynamic or vice versa.
MismatchedDynamic(PackageName, bool),
MismatchedDynamic(&'lock PackageName, bool),
/// The lockfile uses a different set of version for its workspace members.
MismatchedVersion(PackageName, Version, Option<Version>),
MismatchedVersion(&'lock PackageName, Version, Option<Version>),
/// The lockfile uses a different set of requirements.
MismatchedRequirements(BTreeSet<Requirement>, BTreeSet<Requirement>),
/// The lockfile uses a different set of constraints.
@ -1548,7 +1542,7 @@ pub enum SatisfiesResult<'lock> {
BTreeMap<GroupName, BTreeSet<Requirement>>,
),
/// The lockfile is missing a version.
MissingVersion(PackageName),
MissingVersion(&'lock PackageName),
}
/// We discard the lockfile if these options match.