@@ -17,16 +17,11 @@ use proptest::sample::Index;
17
17
use proptest:: string:: string_regex;
18
18
use varisat:: { self , ExtendFormula } ;
19
19
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 )
26
22
}
27
23
28
24
pub fn resolve_and_validated (
29
- pkg : PackageId ,
30
25
deps : Vec < Dependency > ,
31
26
registry : & [ Summary ] ,
32
27
sat_resolve : Option < & mut SatResolve > ,
@@ -36,11 +31,11 @@ pub fn resolve_and_validated(
36
31
} else {
37
32
SatResolve :: new ( registry) . sat_resolve ( & deps)
38
33
} ;
39
- let resolve = resolve_with_config_raw ( pkg , deps, registry, None ) ;
34
+ let resolve = resolve_with_config_raw ( deps, registry, None ) ;
40
35
assert_eq ! ( resolve. is_ok( ) , should_resolve) ;
41
36
42
37
let resolve = resolve?;
43
- let mut stack = vec ! [ pkg ] ;
38
+ let mut stack = vec ! [ pkg_id ( "root" ) ] ;
44
39
let mut used = HashSet :: new ( ) ;
45
40
let mut links = HashSet :: new ( ) ;
46
41
while let Some ( p) = stack. pop ( ) {
@@ -92,17 +87,15 @@ pub fn resolve_and_validated(
92
87
}
93
88
94
89
pub fn resolve_with_config (
95
- pkg : PackageId ,
96
90
deps : Vec < Dependency > ,
97
91
registry : & [ Summary ] ,
98
92
config : Option < & Config > ,
99
93
) -> CargoResult < Vec < PackageId > > {
100
- let resolve = resolve_with_config_raw ( pkg , deps, registry, config) ?;
94
+ let resolve = resolve_with_config_raw ( deps, registry, config) ?;
101
95
Ok ( resolve. sort ( ) )
102
96
}
103
97
104
98
pub fn resolve_with_config_raw (
105
- pkg : PackageId ,
106
99
deps : Vec < Dependency > ,
107
100
registry : & [ Summary ] ,
108
101
config : Option < & Config > ,
@@ -158,7 +151,7 @@ pub fn resolve_with_config_raw(
158
151
used : HashSet :: new ( ) ,
159
152
} ;
160
153
let summary = Summary :: new (
161
- pkg ,
154
+ pkg_id ( "root" ) ,
162
155
deps,
163
156
& BTreeMap :: < String , Vec < String > > :: new ( ) ,
164
157
None :: < String > ,
@@ -856,7 +849,6 @@ fn meta_test_deep_trees_from_strategy() {
856
849
let reg = registry ( input. clone ( ) ) ;
857
850
for this in input. iter ( ) . rev ( ) . take ( 10 ) {
858
851
let res = resolve (
859
- pkg_id ( "root" ) ,
860
852
vec ! [ dep_req( & this. name( ) , & format!( "={}" , this. version( ) ) ) ] ,
861
853
& reg,
862
854
) ;
@@ -898,7 +890,6 @@ fn meta_test_multiple_versions_strategy() {
898
890
let reg = registry ( input. clone ( ) ) ;
899
891
for this in input. iter ( ) . rev ( ) . take ( 10 ) {
900
892
let res = resolve (
901
- pkg_id ( "root" ) ,
902
893
vec ! [ dep_req( & this. name( ) , & format!( "={}" , this. version( ) ) ) ] ,
903
894
& reg,
904
895
) ;
0 commit comments