refactor(registry): Move query out-param to be last

diff --git a/crates/resolver-tests/src/lib.rs b/crates/resolver-tests/src/lib.rs
index eae6469545d40c2d214823e4915c4e353e7e12a1..a86b67905733312cebbac71a8f750e1a5cbf2e5c 100644 (file)
--- a/crates/resolver-tests/src/lib.rs
+++ b/crates/resolver-tests/src/lib.rs
@@ -128,8 +128,8 @@ pub fn resolve_with_config_raw(
         fn query(
             &mut self,
             dep: &Dependency,
-            f: &mut dyn FnMut(Summary),
             fuzzy: bool,
+            f: &mut dyn FnMut(Summary),
         ) -> Poll<CargoResult<()>> {
             for summary in self.list.iter() {
                 if fuzzy || dep.matches(summary) {

diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
index 9e9d140843275caeed61db45d1c29611bc1336b0..57d1acace565cedfc0d7bef9ffa6f8941d7c6594 100644 (file)
--- a/src/cargo/core/registry.rs
+++ b/src/cargo/core/registry.rs
@@ -19,13 +19,13 @@ pub trait Registry {
     fn query(
         &mut self,
         dep: &Dependency,
-        f: &mut dyn FnMut(Summary),
         fuzzy: bool,
+        f: &mut dyn FnMut(Summary),
     ) -> Poll<CargoResult<()>>;
 
     fn query_vec(&mut self, dep: &Dependency, fuzzy: bool) -> Poll<CargoResult<Vec<Summary>>> {
         let mut ret = Vec::new();
-        self.query(dep, &mut |s| ret.push(s), fuzzy)
+        self.query(dep, fuzzy, &mut |s| ret.push(s))
             .map_ok(|()| ret)
     }
 
@@ -575,8 +575,8 @@ impl<'cfg> Registry for PackageRegistry<'cfg> {
     fn query(
         &mut self,
         dep: &Dependency,
-        f: &mut dyn FnMut(Summary),
         fuzzy: bool,
+        f: &mut dyn FnMut(Summary),
     ) -> Poll<CargoResult<()>> {
         assert!(self.patches_locked);
         let (override_summary, n, to_warn) = {

diff --git a/src/cargo/core/resolver/dep_cache.rs b/src/cargo/core/resolver/dep_cache.rs
index 067f8f74f3ee4983201708c9775453541ba6dfaa..c07dadc31e8e89d07f69b0cd0beb6be8afb78a5a 100644 (file)
--- a/src/cargo/core/resolver/dep_cache.rs
+++ b/src/cargo/core/resolver/dep_cache.rs
@@ -100,13 +100,9 @@ impl<'a> RegistryQueryer<'a> {
         }
 
         let mut ret = Vec::new();
-        let ready = self.registry.query(
-            dep,
-            &mut |s| {
-                ret.push(s);
-            },
-            false,
-        )?;
+        let ready = self.registry.query(dep, false, &mut |s| {
+            ret.push(s);
+        })?;
         if ready.is_pending() {
             self.registry_cache.insert(dep.clone(), Poll::Pending);
             return Poll::Pending;