From ee5fdf7b861961013d9c996159a67778f58499fb Mon Sep 17 00:00:00 2001
From: Matthieu Pizenberg <matthieu.pizenberg@gmail.com>
Date: Fri, 13 Nov 2020 22:56:33 +0100
Subject: [PATCH] refactor: rename packages to potential_packages

---
 src/solver.rs     | 10 +++++-----
 tests/proptest.rs |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/solver.rs b/src/solver.rs
index ba63fe4c..7c9647eb 100644
--- a/src/solver.rs
+++ b/src/solver.rs
@@ -226,7 +226,7 @@ pub trait DependencyProvider<P: Package, V: Version> {
     /// Note: the type `T` ensures that this returns an item from the `packages` argument.
     fn make_decision<T: Borrow<P>, U: Borrow<Range<V>>>(
         &self,
-        packages: impl Iterator<Item = (T, U)>,
+        potential_packages: impl Iterator<Item = (T, U)>,
     ) -> Result<(T, Option<V>), Box<dyn Error>>;
 
     /// Retrieves the package dependencies.
@@ -255,7 +255,7 @@ pub trait DependencyProvider<P: Package, V: Version> {
 /// first version contained in the constraints.
 pub fn make_fewest_versions_decision_helper<P: Package, V: Version, T, U, I, F>(
     list_available_versions: F,
-    packages: impl Iterator<Item = (T, U)>,
+    potential_packages: impl Iterator<Item = (T, U)>,
 ) -> (T, Option<V>)
 where
     T: Borrow<P>,
@@ -265,7 +265,7 @@ where
 {
     let mut package: Option<(T, _)> = None;
     let mut min_key = usize::MAX;
-    for (p, term) in packages {
+    for (p, term) in potential_packages {
         let key = list_available_versions(p.borrow())
             .filter(|v| term.borrow().contains(v.borrow()))
             .count();
@@ -348,7 +348,7 @@ impl<P: Package, V: Version> OfflineDependencyProvider<P, V> {
 impl<P: Package, V: Version> DependencyProvider<P, V> for OfflineDependencyProvider<P, V> {
     fn make_decision<T: Borrow<P>, U: Borrow<Range<V>>>(
         &self,
-        packages: impl Iterator<Item = (T, U)>,
+        potential_packages: impl Iterator<Item = (T, U)>,
     ) -> Result<(T, Option<V>), Box<dyn Error>> {
         Ok(make_fewest_versions_decision_helper(
             |p| {
@@ -359,7 +359,7 @@ impl<P: Package, V: Version> DependencyProvider<P, V> for OfflineDependencyProvi
                     .rev()
                     .cloned()
             },
-            packages,
+            potential_packages,
         ))
     }
 
diff --git a/tests/proptest.rs b/tests/proptest.rs
index 05467417..82bbe3cd 100644
--- a/tests/proptest.rs
+++ b/tests/proptest.rs
@@ -29,11 +29,11 @@ struct OldestVersionsDependencyProvider<P: Package, V: Version>(OfflineDependenc
 impl<P: Package, V: Version> DependencyProvider<P, V> for OldestVersionsDependencyProvider<P, V> {
     fn make_decision<T: std::borrow::Borrow<P>, U: std::borrow::Borrow<Range<V>>>(
         &self,
-        packages: impl Iterator<Item = (T, U)>,
+        potential_packages: impl Iterator<Item = (T, U)>,
     ) -> Result<(T, Option<V>), Box<dyn Error>> {
         Ok(make_fewest_versions_decision_helper(
             |p| self.0.versions(p).into_iter().flatten().cloned(),
-            packages,
+            potential_packages,
         ))
     }
 
@@ -67,9 +67,9 @@ impl<P: Package, V: Version, DP: DependencyProvider<P, V>> DependencyProvider<P,
 {
     fn make_decision<T: std::borrow::Borrow<P>, U: std::borrow::Borrow<Range<V>>>(
         &self,
-        packages: impl Iterator<Item = (T, U)>,
+        potential_packages: impl Iterator<Item = (T, U)>,
     ) -> Result<(T, Option<V>), Box<dyn Error>> {
-        self.dp.make_decision(packages)
+        self.dp.make_decision(potential_packages)
     }
 
     fn get_dependencies(&self, p: &P, v: &V) -> Result<Dependencies<P, V>, Box<dyn Error>> {