mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-24 13:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

uv-resolver: add to diverging_packages when forking based on conflicts

Browse source 
This addresses Konsti's comment about it being empty:
https://github.com/astral-sh/uv/pull/8976#discussion_r1837951568
This commit is contained in:
Andrew Gallant 2024-11-13 11:51:43 -05:00 • committed by Andrew Gallant
parent c2c9bd9557
commit cda8b3276a
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2876,13 +2876,14 @@ impl Forks {
// For example, if we have conflicting groups {x1, x2} and {x3,
// x4}, we need to make sure the forks generated from one set
// also account for the other set.
for groups in conflicts.iter() {
for set in conflicts.iter() {
let mut new = vec![];
for fork in std::mem::take(&mut forks) {
let mut has_conflicting_dependency = false;
for group in groups.iter() {
if fork.contains_conflicting_item(group.as_ref()) {
for item in set.iter() {
if fork.contains_conflicting_item(item.as_ref()) {
has_conflicting_dependency = true;
diverging_packages.insert(item.package().clone());
break;
}
}
@ -2893,7 +2894,7 @@ impl Forks {
// Create a fork that excludes ALL extras.
let mut fork_none = fork.clone();
for group in groups.iter() {
for group in set.iter() {
fork_none = fork_none.exclude([group.clone()]);
}
new.push(fork_none);
@ -2905,10 +2906,9 @@ impl Forks {
// then this creates three forks: one that excludes
// {foo, bar}, one that excludes {foo, baz} and one
// that excludes {bar, baz}.
for (i, _) in groups.iter().enumerate() {
for (i, _) in set.iter().enumerate() {
let fork_allows_group = fork.clone().exclude(
groups
.iter()
set.iter()
.enumerate()
.filter(|&(j, _)| i != j)
.map(|(_, group)| group.clone()),