From 6a62d3545889acb5e7842ed2630f93b947d3dab3 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 19 Jul 2022 16:59:04 -0500
Subject: [PATCH] refactor(registry): Move query out-param to be last

---
 crates/resolver-tests/src/lib.rs     |  2 +-
 src/cargo/core/registry.rs           |  6 +++---
 src/cargo/core/resolver/dep_cache.rs | 10 +++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/crates/resolver-tests/src/lib.rs b/crates/resolver-tests/src/lib.rs
index eae646954..a86b67905 100644
--- 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 9e9d14084..57d1acace 100644
--- 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 067f8f74f..c07dadc31 100644
--- 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;
-- 
2.39.5