fix: issue where a union clause has no candidates (#93)

prefix-dev · Jan 2, 2025 · f6537fc · f6537fc
1 parent f89c0b2
commit f6537fc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/solver/mod.rs b/src/solver/mod.rs
@@ -1089,9 +1089,12 @@ impl<D: DependencyProvider, RT: AsyncRuntime> Solver<D, RT> {
 
                     // Find the first candidate that is not yet assigned a value or find the first
                     // value that makes this clause true.
-                    candidate = candidates
-                        .iter()
-                        .try_fold(None, |first_candidate, &candidate| {
+                    candidate = candidates.iter().try_fold(
+                        match candidate {
+                            ControlFlow::Continue(x) => x,
+                            _ => None,
+                        },
+                        |first_candidate, &candidate| {
                             let assigned_value =
                                 self.decision_tracker.assigned_value(candidate.into());
                             ControlFlow::Continue(match assigned_value {
@@ -1137,7 +1140,8 @@ impl<D: DependencyProvider, RT: AsyncRuntime> Solver<D, RT> {
                                     }
                                 },
                             })
-                        });
+                        },
+                    );
 
                     // Stop searching if we found a candidate that makes the clause true.
                     if candidate.is_break() {

diff --git a/tests/solver.rs b/tests/solver.rs
@@ -1365,6 +1365,17 @@ fn test_snapshot_union_requirements() {
     ));
 }
 
+#[test]
+fn test_union_empty_requirements() {
+    let provider = BundleBoxProvider::from_packages(&[("a", 1, vec!["b 1 | c"]), ("b", 1, vec![])]);
+
+    let result = solve_snapshot(provider, &["a"]);
+    assert_snapshot!(result, @r"
+    a=1
+    b=1
+    ");
+}
+
 #[test]
 fn test_root_constraints() {
     let provider =