implement conditions in from_provider_async function

prefix-dev · Jan 24, 2025 · eaeaf42 · eaeaf42
1 parent 2155d6b
commit eaeaf42
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/snapshot.rs b/src/snapshot.rs
@@ -221,7 +221,13 @@ impl DependencySnapshot {
                             }
 
                             for &req in deps.requirements.iter() {
-                                let (_, requirement) = req.into_condition_and_requirement(); // TODO: condition
+                                let (condition, requirement) = req.into_condition_and_requirement();
+
+                                if let Some(condition) = condition {
+                                    if seen.insert(Element::VersionSet(condition)) {
+                                        queue.push_back(Element::VersionSet(condition));
+                                    }
+                                }
 
                                 match requirement {
                                     Requirement::Single(version_set) => {

diff --git a/src/solver/mod.rs b/src/solver/mod.rs
@@ -1926,12 +1926,12 @@ async fn add_clauses_for_solvables<D: DependencyProvider>(
                     );
                 }
 
-
                 if let Some((condition, condition_candidates)) = condition {
                     tracing::trace!(
                         "Adding conditional clauses for {} with condition {}",
                         requirement.display(cache.provider()),
-                        std::convert::Into::<Requirement>::into(condition).display(cache.provider()),
+                        std::convert::Into::<Requirement>::into(condition)
+                            .display(cache.provider()),
                     );
 
                     let condition_version_set_variables = requirement_to_sorted_candidates.insert(

diff --git a/tests/solver.rs b/tests/solver.rs
@@ -514,12 +514,10 @@ impl DependencyProvider for BundleBoxProvider {
                     .into()
             };
 
-            result
-                .requirements
-                .push(ConditionalRequirement {
-                    requirement,
-                    condition: None,
-                });
+            result.requirements.push(ConditionalRequirement {
+                requirement,
+                condition: None,
+            });
         }
 
         for req in &deps.constrains {