Skip to content

Commit b1ea8c5

Browse files
committed
refactor(source): Be consistent with Registry::query_vec
1 parent c7f614c commit b1ea8c5

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/cargo/core/compiler/future_incompat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ fn get_updates(ws: &Workspace<'_>, package_ids: &BTreeSet<PackageId>) -> Option<
293293
Ok(dep) => dep,
294294
Err(_) => return false,
295295
};
296-
match source.query_vec(&dep) {
296+
match source.query_vec(&dep, false) {
297297
Poll::Ready(Ok(sum)) => {
298298
summaries.push((pkg_id, sum));
299299
false

src/cargo/core/registry.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ impl<'cfg> PackageRegistry<'cfg> {
327327
.get_mut(dep.source_id())
328328
.expect("loaded source not present");
329329

330-
let summaries = match source.query_vec(dep)? {
330+
let summaries = match source.query_vec(dep, false)? {
331331
Poll::Ready(deps) => deps,
332332
Poll::Pending => {
333333
deps_pending.push(dep_remaining);
@@ -483,7 +483,7 @@ impl<'cfg> PackageRegistry<'cfg> {
483483
for &s in self.overrides.iter() {
484484
let src = self.sources.get_mut(s).unwrap();
485485
let dep = Dependency::new_override(dep.package_name(), s);
486-
let mut results = match src.query_vec(&dep) {
486+
let mut results = match src.query_vec(&dep, false) {
487487
Poll::Ready(results) => results?,
488488
Poll::Pending => return Poll::Pending,
489489
};
@@ -881,7 +881,7 @@ fn summary_for_patch(
881881
// No summaries found, try to help the user figure out what is wrong.
882882
if let Some(locked) = locked {
883883
// Since the locked patch did not match anything, try the unlocked one.
884-
let orig_matches = match source.query_vec(orig_patch) {
884+
let orig_matches = match source.query_vec(orig_patch, false) {
885885
Poll::Pending => return Poll::Pending,
886886
Poll::Ready(deps) => deps,
887887
}
@@ -906,7 +906,7 @@ fn summary_for_patch(
906906
// Try checking if there are *any* packages that match this by name.
907907
let name_only_dep = Dependency::new_override(orig_patch.package_name(), orig_patch.source_id());
908908

909-
let name_summaries = match source.query_vec(&name_only_dep) {
909+
let name_summaries = match source.query_vec(&name_only_dep, false) {
910910
Poll::Pending => return Poll::Pending,
911911
Poll::Ready(deps) => deps,
912912
}

src/cargo/core/source/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ pub trait Source {
4040
f: &mut dyn FnMut(Summary),
4141
) -> Poll<CargoResult<()>>;
4242

43-
fn query_vec(&mut self, dep: &Dependency) -> Poll<CargoResult<Vec<Summary>>> {
43+
fn query_vec(&mut self, dep: &Dependency, fuzzy: bool) -> Poll<CargoResult<Vec<Summary>>> {
4444
let mut ret = Vec::new();
45-
self.query(dep, false, &mut |s| ret.push(s)).map_ok(|_| ret)
45+
self.query(dep, fuzzy, &mut |s| ret.push(s)).map_ok(|_| ret)
4646
}
4747

4848
/// Ensure that the source is fully up-to-date for the current session on the next query.

src/cargo/ops/common_for_install_and_uninstall.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ where
540540
}
541541

542542
let deps = loop {
543-
match source.query_vec(&dep)? {
543+
match source.query_vec(&dep, false)? {
544544
Poll::Ready(deps) => break deps,
545545
Poll::Pending => source.block_until_ready()?,
546546
}

0 commit comments

Comments
 (0)