rename Dependencies::conditional_requirement to Dependencies::requi…

…rement`

cpp/src/lib.rs

@@ -251,7 +251,7 @@ pub struct Dependencies {
     /// A pointer to the first element of a list of requirements. Requirements
     /// defines which packages should be installed alongside the depending
     /// package and the constraints applied to the package.
-    pub conditional_requirements: Vector<ConditionalRequirement>,
+    pub requirements: Vector<ConditionalRequirement>,
 
     /// Defines additional constraints on packages that may or may not be part
     /// of the solution. Different from `requirements`, packages in this set
@@ -548,8 +548,8 @@ impl<'d> resolvo::DependencyProvider for &'d DependencyProvider {
         };
 
         resolvo::Dependencies::Known(KnownDependencies {
-            conditional_requirements: dependencies
-                .conditional_requirements
+            requirements: dependencies
+                .requirements
                 .into_iter()
                 .map(Into::into)
                 .collect(),

src/lib.rs

@@ -206,7 +206,7 @@ pub struct KnownDependencies {
         feature = "serde",
         serde(default, skip_serializing_if = "Vec::is_empty")
     )]
-    pub conditional_requirements: Vec<ConditionalRequirement>,
+    pub requirements: Vec<ConditionalRequirement>,
 
     /// Defines additional constraints on packages that may or may not be part
     /// of the solution. Different from `requirements`, packages in this set

src/snapshot.rs

@@ -220,7 +220,7 @@ impl DependencySnapshot {
                                 }
                             }
 
-                            for &req in deps.conditional_requirements.iter() {
+                            for &req in deps.requirements.iter() {
                                 let (_, requirement) = req.into_condition_and_requirement(); // TODO: condition
 
                                 match requirement {

src/solver/mod.rs

@@ -1643,7 +1643,7 @@ async fn add_clauses_for_solvables<D: DependencyProvider>(
                 ready(Ok(TaskResult::Dependencies {
                     solvable_id: solvable_or_root,
                     dependencies: Dependencies::Known(KnownDependencies {
-                        conditional_requirements: root_requirements.to_vec(),
+                        requirements: root_requirements.to_vec(),
                         constrains: root_constraints.to_vec(),
                     }),
                 }))
@@ -1676,7 +1676,7 @@ async fn add_clauses_for_solvables<D: DependencyProvider>(
                 };
 
                 let (conditional_requirements, constrains) = match dependencies {
-                    Dependencies::Known(deps) => (deps.conditional_requirements, deps.constrains),
+                    Dependencies::Known(deps) => (deps.requirements, deps.constrains),
                     Dependencies::Unknown(reason) => {
                         // There is no information about the solvable's dependencies, so we add
                         // an exclusion clause for it
@@ -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(

tests/solver.rs

@@ -484,7 +484,7 @@ impl DependencyProvider for BundleBoxProvider {
         };
 
         let mut result = KnownDependencies {
-            conditional_requirements: Vec::with_capacity(deps.dependencies.len()),
+            requirements: Vec::with_capacity(deps.dependencies.len()),
             constrains: Vec::with_capacity(deps.constrains.len()),
         };
         for req in &deps.dependencies {
@@ -515,7 +515,7 @@ impl DependencyProvider for BundleBoxProvider {
             };
 
             result
-                .conditional_requirements
+                .requirements
                 .push(ConditionalRequirement {
                     requirement,
                     condition: None,