Skip to content

Commit 088c194

Browse files
Remove clones from satisfies variants (#10876)
1 parent a539d33 commit 088c194

File tree

1 file changed

+7
-13
lines changed
  • crates/uv-resolver/src/lock

1 file changed

+7
-13
lines changed

crates/uv-resolver/src/lock/mod.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,17 +1319,14 @@ impl Lock {
13191319
// case, we'd expect the version to be omitted).
13201320
if package.id.source.is_source_tree() {
13211321
if metadata.dynamic {
1322-
return Ok(SatisfiesResult::MismatchedDynamic(
1323-
package.id.name.clone(),
1324-
false,
1325-
));
1322+
return Ok(SatisfiesResult::MismatchedDynamic(&package.id.name, false));
13261323
}
13271324
}
13281325

13291326
// Validate the `version` metadata.
13301327
if metadata.version != *version {
13311328
return Ok(SatisfiesResult::MismatchedVersion(
1332-
package.id.name.clone(),
1329+
&package.id.name,
13331330
version.clone(),
13341331
Some(metadata.version.clone()),
13351332
));
@@ -1434,10 +1431,7 @@ impl Lock {
14341431

14351432
// Validate that the package is still dynamic.
14361433
if !metadata.dynamic {
1437-
return Ok(SatisfiesResult::MismatchedDynamic(
1438-
package.id.name.clone(),
1439-
true,
1440-
));
1434+
return Ok(SatisfiesResult::MismatchedDynamic(&package.id.name, true));
14411435
}
14421436

14431437
// Validate that the requirements are unchanged.
@@ -1447,7 +1441,7 @@ impl Lock {
14471441
}
14481442
}
14491443
} else {
1450-
return Ok(SatisfiesResult::MissingVersion(package.id.name.clone()));
1444+
return Ok(SatisfiesResult::MissingVersion(&package.id.name));
14511445
}
14521446

14531447
// Recurse.
@@ -1511,9 +1505,9 @@ pub enum SatisfiesResult<'lock> {
15111505
/// A workspace member switched from virtual to non-virtual or vice versa.
15121506
MismatchedVirtual(PackageName, bool),
15131507
/// A source tree switched from dynamic to non-dynamic or vice versa.
1514-
MismatchedDynamic(PackageName, bool),
1508+
MismatchedDynamic(&'lock PackageName, bool),
15151509
/// The lockfile uses a different set of version for its workspace members.
1516-
MismatchedVersion(PackageName, Version, Option<Version>),
1510+
MismatchedVersion(&'lock PackageName, Version, Option<Version>),
15171511
/// The lockfile uses a different set of requirements.
15181512
MismatchedRequirements(BTreeSet<Requirement>, BTreeSet<Requirement>),
15191513
/// The lockfile uses a different set of constraints.
@@ -1548,7 +1542,7 @@ pub enum SatisfiesResult<'lock> {
15481542
BTreeMap<GroupName, BTreeSet<Requirement>>,
15491543
),
15501544
/// The lockfile is missing a version.
1551-
MissingVersion(PackageName),
1545+
MissingVersion(&'lock PackageName),
15521546
}
15531547

15541548
/// We discard the lockfile if these options match.

0 commit comments

Comments
 (0)