fix: tests and clippy

Author: baszalmstra

src/solver/mod.rs

@@ -217,14 +217,15 @@ impl<VS: VersionSet, N: PackageName + Display, D: DependencyProvider<VS, N>> Sol
 
         // Mark the initial seen solvables as seen
         let mut pending_solvables = vec![];
-        let mut clauses_added_for_solvable = self.clauses_added_for_solvable.borrow_mut();
-        for solvable_id in solvable_ids {
-            if clauses_added_for_solvable.insert(solvable_id) {
-                pending_solvables.push(solvable_id);
+        {
+            let mut clauses_added_for_solvable = self.clauses_added_for_solvable.borrow_mut();
+            for solvable_id in solvable_ids {
+                if clauses_added_for_solvable.insert(solvable_id) {
+                    pending_solvables.push(solvable_id);
+                }
             }
         }
 
-        let mut clauses_added_for_package = self.clauses_added_for_package.borrow_mut();
         let mut seen = pending_solvables.iter().copied().collect::<HashSet<_>>();
         let mut pending_futures = FuturesUnordered::new();
         loop {
@@ -264,6 +265,9 @@ impl<VS: VersionSet, N: PackageName + Display, D: DependencyProvider<VS, N>> Sol
                 break;
             };
 
+            let mut clauses_added_for_solvable = self.clauses_added_for_solvable.borrow_mut();
+            let mut clauses_added_for_package = self.clauses_added_for_package.borrow_mut();
+
             match result? {
                 TaskResult::Dependencies {
                     solvable_id,

tests/solver.rs

@@ -5,6 +5,8 @@ use resolvo::{
     KnownDependencies, NameId, Pool, SolvableId, Solver, SolverCache, UnsolvableOrCancelled,
     VersionSet, VersionSetId,
 };
+use std::cell::RefCell;
+use std::collections::HashSet;
 use std::rc::Rc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
@@ -153,6 +155,10 @@ struct BundleBoxProvider {
     concurrent_requests: Arc<AtomicUsize>,
     concurrent_requests_max: Rc<Cell<usize>>,
     sleep_before_return: bool,
+
+    // A mapping of packages that we have requested candidates for. This way we can keep track of duplicate requests.
+    requested_candidates: RefCell<HashSet<NameId>>,
+    requested_dependencies: RefCell<HashSet<SolvableId>>,
 }
 
 struct BundleBoxPackageDependencies {
@@ -272,6 +278,11 @@ impl DependencyProvider<Range<Pack>> for BundleBoxProvider {
                 .max(concurrent_requests + 1),
         );
 
+        assert!(
+            self.requested_candidates.borrow_mut().insert(name),
+            "duplicate get_candidates request"
+        );
+
         let package_name = self.pool.resolve_package_name(name);
         let Some(package) = self.packages.get(package_name) else {
             return self.maybe_delay(None).await;
@@ -319,6 +330,11 @@ impl DependencyProvider<Range<Pack>> for BundleBoxProvider {
                 .max(concurrent_requests + 1),
         );
 
+        assert!(
+            self.requested_dependencies.borrow_mut().insert(solvable),
+            "duplicate get_dependencies request"
+        );
+
         let candidate = self.pool.resolve_solvable(solvable);
         let package_name = self.pool.resolve_package_name(candidate.name_id());
         let pack = candidate.inner();