Skip to content

Commit a389d48

Browse files
committed
Fix tests
1 parent e3835f7 commit a389d48

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

src/cargo/core/registry.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,12 @@ pub mod test {
441441
let overrides = self.query_overrides(dep);
442442

443443
if overrides.is_empty() {
444-
self.summaries.query(dep, f)
444+
for s in self.summaries.iter() {
445+
if dep.matches(s) {
446+
f(s.clone());
447+
}
448+
}
449+
Ok(())
445450
} else {
446451
for s in overrides {
447452
f(s);

tests/resolve.rs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,26 @@ use cargo::core::{Dependency, PackageId, Summary, Registry};
1313
use cargo::util::{CargoResult, ToUrl};
1414
use cargo::core::resolver::{self, Method};
1515

16-
fn resolve<R: Registry>(pkg: PackageId, deps: Vec<Dependency>,
17-
registry: &mut R)
18-
-> CargoResult<Vec<PackageId>> {
16+
fn resolve(pkg: PackageId, deps: Vec<Dependency>, registry: &[Summary])
17+
-> CargoResult<Vec<PackageId>>
18+
{
19+
struct MyRegistry<'a>(&'a [Summary]);
20+
impl<'a> Registry for MyRegistry<'a> {
21+
fn query(&mut self,
22+
dep: &Dependency,
23+
f: &mut FnMut(Summary)) -> CargoResult<()> {
24+
for summary in self.0.iter() {
25+
if dep.matches(summary) {
26+
f(summary.clone());
27+
}
28+
}
29+
Ok(())
30+
}
31+
}
32+
let mut registry = MyRegistry(registry);
1933
let summary = Summary::new(pkg.clone(), deps, HashMap::new()).unwrap();
2034
let method = Method::Everything;
21-
let resolve = resolver::resolve(&[(summary, method)], &[], registry)?;
35+
let resolve = resolver::resolve(&[(summary, method)], &[], &mut registry)?;
2236
let res = resolve.iter().cloned().collect();
2337
Ok(res)
2438
}

0 commit comments

Comments
 (0)