Skip to content

Commit 6a62d35

Browse files
committed
refactor(registry): Move query out-param to be last
1 parent d8d30a7 commit 6a62d35

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

crates/resolver-tests/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ pub fn resolve_with_config_raw(
128128
fn query(
129129
&mut self,
130130
dep: &Dependency,
131-
f: &mut dyn FnMut(Summary),
132131
fuzzy: bool,
132+
f: &mut dyn FnMut(Summary),
133133
) -> Poll<CargoResult<()>> {
134134
for summary in self.list.iter() {
135135
if fuzzy || dep.matches(summary) {

src/cargo/core/registry.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ pub trait Registry {
1919
fn query(
2020
&mut self,
2121
dep: &Dependency,
22-
f: &mut dyn FnMut(Summary),
2322
fuzzy: bool,
23+
f: &mut dyn FnMut(Summary),
2424
) -> Poll<CargoResult<()>>;
2525

2626
fn query_vec(&mut self, dep: &Dependency, fuzzy: bool) -> Poll<CargoResult<Vec<Summary>>> {
2727
let mut ret = Vec::new();
28-
self.query(dep, &mut |s| ret.push(s), fuzzy)
28+
self.query(dep, fuzzy, &mut |s| ret.push(s))
2929
.map_ok(|()| ret)
3030
}
3131

@@ -575,8 +575,8 @@ impl<'cfg> Registry for PackageRegistry<'cfg> {
575575
fn query(
576576
&mut self,
577577
dep: &Dependency,
578-
f: &mut dyn FnMut(Summary),
579578
fuzzy: bool,
579+
f: &mut dyn FnMut(Summary),
580580
) -> Poll<CargoResult<()>> {
581581
assert!(self.patches_locked);
582582
let (override_summary, n, to_warn) = {

src/cargo/core/resolver/dep_cache.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,9 @@ impl<'a> RegistryQueryer<'a> {
100100
}
101101

102102
let mut ret = Vec::new();
103-
let ready = self.registry.query(
104-
dep,
105-
&mut |s| {
106-
ret.push(s);
107-
},
108-
false,
109-
)?;
103+
let ready = self.registry.query(dep, false, &mut |s| {
104+
ret.push(s);
105+
})?;
110106
if ready.is_pending() {
111107
self.registry_cache.insert(dep.clone(), Poll::Pending);
112108
return Poll::Pending;

0 commit comments

Comments
 (0)