Skip to content

Commit f4bd3a4

Browse files
committed
dont have arg if it is all ways pkg_id("root")
1 parent 5a30d17 commit f4bd3a4

File tree

2 files changed

+57
-126
lines changed

2 files changed

+57
-126
lines changed

crates/resolver-tests/src/lib.rs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@ use proptest::sample::Index;
1717
use proptest::string::string_regex;
1818
use varisat::{self, ExtendFormula};
1919

20-
pub fn resolve(
21-
pkg: PackageId,
22-
deps: Vec<Dependency>,
23-
registry: &[Summary],
24-
) -> CargoResult<Vec<PackageId>> {
25-
resolve_with_config(pkg, deps, registry, None)
20+
pub fn resolve(deps: Vec<Dependency>, registry: &[Summary]) -> CargoResult<Vec<PackageId>> {
21+
resolve_with_config(deps, registry, None)
2622
}
2723

2824
pub fn resolve_and_validated(
29-
pkg: PackageId,
3025
deps: Vec<Dependency>,
3126
registry: &[Summary],
3227
sat_resolve: Option<&mut SatResolve>,
@@ -36,11 +31,11 @@ pub fn resolve_and_validated(
3631
} else {
3732
SatResolve::new(registry).sat_resolve(&deps)
3833
};
39-
let resolve = resolve_with_config_raw(pkg, deps, registry, None);
34+
let resolve = resolve_with_config_raw(deps, registry, None);
4035
assert_eq!(resolve.is_ok(), should_resolve);
4136

4237
let resolve = resolve?;
43-
let mut stack = vec![pkg];
38+
let mut stack = vec![pkg_id("root")];
4439
let mut used = HashSet::new();
4540
let mut links = HashSet::new();
4641
while let Some(p) = stack.pop() {
@@ -92,17 +87,15 @@ pub fn resolve_and_validated(
9287
}
9388

9489
pub fn resolve_with_config(
95-
pkg: PackageId,
9690
deps: Vec<Dependency>,
9791
registry: &[Summary],
9892
config: Option<&Config>,
9993
) -> CargoResult<Vec<PackageId>> {
100-
let resolve = resolve_with_config_raw(pkg, deps, registry, config)?;
94+
let resolve = resolve_with_config_raw(deps, registry, config)?;
10195
Ok(resolve.sort())
10296
}
10397

10498
pub fn resolve_with_config_raw(
105-
pkg: PackageId,
10699
deps: Vec<Dependency>,
107100
registry: &[Summary],
108101
config: Option<&Config>,
@@ -158,7 +151,7 @@ pub fn resolve_with_config_raw(
158151
used: HashSet::new(),
159152
};
160153
let summary = Summary::new(
161-
pkg,
154+
pkg_id("root"),
162155
deps,
163156
&BTreeMap::<String, Vec<String>>::new(),
164157
None::<String>,
@@ -856,7 +849,6 @@ fn meta_test_deep_trees_from_strategy() {
856849
let reg = registry(input.clone());
857850
for this in input.iter().rev().take(10) {
858851
let res = resolve(
859-
pkg_id("root"),
860852
vec![dep_req(&this.name(), &format!("={}", this.version()))],
861853
&reg,
862854
);
@@ -898,7 +890,6 @@ fn meta_test_multiple_versions_strategy() {
898890
let reg = registry(input.clone());
899891
for this in input.iter().rev().take(10) {
900892
let res = resolve(
901-
pkg_id("root"),
902893
vec![dep_req(&this.name(), &format!("={}", this.version()))],
903894
&reg,
904895
);

0 commit comments

Comments
 (0)