Skip to content

Commit ca782bc

Browse files
tranzystorekktranzystorekk
authored
refactor: use arrays to provide dependency lists (#109)
1 parent 27c1da7 commit ca782bc

11 files changed

+96
-96
lines changed

‎examples/branching_error_reporting.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ fn main() {
1313
// root 1.0.0 depends on foo ^1.0.0
1414
dependency_provider.add_dependencies(
1515
"root", (1, 0, 0),
16-
vec![("foo", Range::between((1, 0, 0), (2, 0, 0)))],
16+
[("foo", Range::between((1, 0, 0), (2, 0, 0)))],
1717
);
1818
#[rustfmt::skip]
1919
// foo 1.0.0 depends on a ^1.0.0 and b ^1.0.0
2020
dependency_provider.add_dependencies(
2121
"foo", (1, 0, 0),
22-
vec![
22+
[
2323
("a", Range::between((1, 0, 0), (2, 0, 0))),
2424
("b", Range::between((1, 0, 0), (2, 0, 0))),
2525
],
@@ -28,7 +28,7 @@ fn main() {
2828
// foo 1.1.0 depends on x ^1.0.0 and y ^1.0.0
2929
dependency_provider.add_dependencies(
3030
"foo", (1, 1, 0),
31-
vec![
31+
[
3232
("x", Range::between((1, 0, 0), (2, 0, 0))),
3333
("y", Range::between((1, 0, 0), (2, 0, 0))),
3434
],
@@ -37,20 +37,20 @@ fn main() {
3737
// a 1.0.0 depends on b ^2.0.0
3838
dependency_provider.add_dependencies(
3939
"a", (1, 0, 0),
40-
vec![("b", Range::between((2, 0, 0), (3, 0, 0)))],
40+
[("b", Range::between((2, 0, 0), (3, 0, 0)))],
4141
);
4242
// b 1.0.0 and 2.0.0 have no dependencies.
43-
dependency_provider.add_dependencies("b", (1, 0, 0), vec![]);
44-
dependency_provider.add_dependencies("b", (2, 0, 0), vec![]);
43+
dependency_provider.add_dependencies("b", (1, 0, 0), []);
44+
dependency_provider.add_dependencies("b", (2, 0, 0), []);
4545
#[rustfmt::skip]
4646
// x 1.0.0 depends on y ^2.0.0.
4747
dependency_provider.add_dependencies(
4848
"x", (1, 0, 0),
49-
vec![("y", Range::between((2, 0, 0), (3, 0, 0)))],
49+
[("y", Range::between((2, 0, 0), (3, 0, 0)))],
5050
);
5151
// y 1.0.0 and 2.0.0 have no dependencies.
52-
dependency_provider.add_dependencies("y", (1, 0, 0), vec![]);
53-
dependency_provider.add_dependencies("y", (2, 0, 0), vec![]);
52+
dependency_provider.add_dependencies("y", (1, 0, 0), []);
53+
dependency_provider.add_dependencies("y", (2, 0, 0), []);
5454

5555
// Run the algorithm.
5656
match resolve(&dependency_provider, "root", (1, 0, 0)) {

‎examples/caching_dependency_provider.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl<P: Package, V: Version, DP: DependencyProvider<P, V>> DependencyProvider<P,
4949
cache.add_dependencies(
5050
package.clone(),
5151
version.clone(),
52-
dependencies.clone().into_iter(),
52+
dependencies.clone(),
5353
);
5454
Ok(Dependencies::Known(dependencies))
5555
}

‎examples/doc_interface.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ use pubgrub::version::NumberVersion;
1212
fn main() {
1313
let mut dependency_provider = OfflineDependencyProvider::<&str, NumberVersion>::new();
1414
dependency_provider.add_dependencies(
15-
"root", 1, vec![("menu", Range::any()), ("icons", Range::any())],
15+
"root", 1, [("menu", Range::any()), ("icons", Range::any())],
1616
);
17-
dependency_provider.add_dependencies("menu", 1, vec![("dropdown", Range::any())]);
18-
dependency_provider.add_dependencies("dropdown", 1, vec![("icons", Range::any())]);
19-
dependency_provider.add_dependencies("icons", 1, vec![]);
17+
dependency_provider.add_dependencies("menu", 1, [("dropdown", Range::any())]);
18+
dependency_provider.add_dependencies("dropdown", 1, [("icons", Range::any())]);
19+
dependency_provider.add_dependencies("icons", 1, []);
2020

2121
// Run the algorithm.
2222
let solution = resolve(&dependency_provider, "root", 1);

‎examples/doc_interface_error.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,57 +17,57 @@ use pubgrub::version::SemanticVersion;
1717
fn main() {
1818
let mut dependency_provider = OfflineDependencyProvider::<&str, SemanticVersion>::new();
1919
// Direct dependencies: menu and icons.
20-
dependency_provider.add_dependencies("root", (1, 0, 0), vec![
20+
dependency_provider.add_dependencies("root", (1, 0, 0), [
2121
("menu", Range::any()),
2222
("icons", Range::exact((1, 0, 0))),
2323
("intl", Range::exact((5, 0, 0))),
2424
]);
2525

2626
// Dependencies of the menu lib.
27-
dependency_provider.add_dependencies("menu", (1, 0, 0), vec![
27+
dependency_provider.add_dependencies("menu", (1, 0, 0), [
2828
("dropdown", Range::strictly_lower_than((2, 0, 0))),
2929
]);
30-
dependency_provider.add_dependencies("menu", (1, 1, 0), vec![
30+
dependency_provider.add_dependencies("menu", (1, 1, 0), [
3131
("dropdown", Range::higher_than((2, 0, 0))),
3232
]);
33-
dependency_provider.add_dependencies("menu", (1, 2, 0), vec![
33+
dependency_provider.add_dependencies("menu", (1, 2, 0), [
3434
("dropdown", Range::higher_than((2, 0, 0))),
3535
]);
36-
dependency_provider.add_dependencies("menu", (1, 3, 0), vec![
36+
dependency_provider.add_dependencies("menu", (1, 3, 0), [
3737
("dropdown", Range::higher_than((2, 0, 0))),
3838
]);
39-
dependency_provider.add_dependencies("menu", (1, 4, 0), vec![
39+
dependency_provider.add_dependencies("menu", (1, 4, 0), [
4040
("dropdown", Range::higher_than((2, 0, 0))),
4141
]);
42-
dependency_provider.add_dependencies("menu", (1, 5, 0), vec![
42+
dependency_provider.add_dependencies("menu", (1, 5, 0), [
4343
("dropdown", Range::higher_than((2, 0, 0))),
4444
]);
4545

4646
// Dependencies of the dropdown lib.
47-
dependency_provider.add_dependencies("dropdown", (1, 8, 0), vec![
47+
dependency_provider.add_dependencies("dropdown", (1, 8, 0), [
4848
("intl", Range::exact((3, 0, 0))),
4949
]);
50-
dependency_provider.add_dependencies("dropdown", (2, 0, 0), vec![
50+
dependency_provider.add_dependencies("dropdown", (2, 0, 0), [
5151
("icons", Range::exact((2, 0, 0))),
5252
]);
53-
dependency_provider.add_dependencies("dropdown", (2, 1, 0), vec![
53+
dependency_provider.add_dependencies("dropdown", (2, 1, 0), [
5454
("icons", Range::exact((2, 0, 0))),
5555
]);
56-
dependency_provider.add_dependencies("dropdown", (2, 2, 0), vec![
56+
dependency_provider.add_dependencies("dropdown", (2, 2, 0), [
5757
("icons", Range::exact((2, 0, 0))),
5858
]);
59-
dependency_provider.add_dependencies("dropdown", (2, 3, 0), vec![
59+
dependency_provider.add_dependencies("dropdown", (2, 3, 0), [
6060
("icons", Range::exact((2, 0, 0))),
6161
]);
6262

6363
// Icons have no dependencies.
64-
dependency_provider.add_dependencies("icons", (1, 0, 0), vec![]);
65-
dependency_provider.add_dependencies("icons", (2, 0, 0), vec![]);
64+
dependency_provider.add_dependencies("icons", (1, 0, 0), []);
65+
dependency_provider.add_dependencies("icons", (2, 0, 0), []);
6666

6767
// Intl have no dependencies.
68-
dependency_provider.add_dependencies("intl", (3, 0, 0), vec![]);
69-
dependency_provider.add_dependencies("intl", (4, 0, 0), vec![]);
70-
dependency_provider.add_dependencies("intl", (5, 0, 0), vec![]);
68+
dependency_provider.add_dependencies("intl", (3, 0, 0), []);
69+
dependency_provider.add_dependencies("intl", (4, 0, 0), []);
70+
dependency_provider.add_dependencies("intl", (5, 0, 0), []);
7171

7272
// Run the algorithm.
7373
match resolve(&dependency_provider, "root", (1, 0, 0)) {

‎examples/doc_interface_semantic.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,49 @@ use pubgrub::version::SemanticVersion;
1616
fn main() {
1717
let mut dependency_provider = OfflineDependencyProvider::<&str, SemanticVersion>::new();
1818
// Direct dependencies: menu and icons.
19-
dependency_provider.add_dependencies("root", (1, 0, 0), vec![
19+
dependency_provider.add_dependencies("root", (1, 0, 0), [
2020
("menu", Range::any()),
2121
("icons", Range::exact((1, 0, 0))),
2222
]);
2323

2424
// Dependencies of the menu lib.
25-
dependency_provider.add_dependencies("menu", (1, 0, 0), vec![
25+
dependency_provider.add_dependencies("menu", (1, 0, 0), [
2626
("dropdown", Range::strictly_lower_than((2, 0, 0))),
2727
]);
28-
dependency_provider.add_dependencies("menu", (1, 1, 0), vec![
28+
dependency_provider.add_dependencies("menu", (1, 1, 0), [
2929
("dropdown", Range::higher_than((2, 0, 0))),
3030
]);
31-
dependency_provider.add_dependencies("menu", (1, 2, 0), vec![
31+
dependency_provider.add_dependencies("menu", (1, 2, 0), [
3232
("dropdown", Range::higher_than((2, 0, 0))),
3333
]);
34-
dependency_provider.add_dependencies("menu", (1, 3, 0), vec![
34+
dependency_provider.add_dependencies("menu", (1, 3, 0), [
3535
("dropdown", Range::higher_than((2, 0, 0))),
3636
]);
37-
dependency_provider.add_dependencies("menu", (1, 4, 0), vec![
37+
dependency_provider.add_dependencies("menu", (1, 4, 0), [
3838
("dropdown", Range::higher_than((2, 0, 0))),
3939
]);
40-
dependency_provider.add_dependencies("menu", (1, 5, 0), vec![
40+
dependency_provider.add_dependencies("menu", (1, 5, 0), [
4141
("dropdown", Range::higher_than((2, 0, 0))),
4242
]);
4343

4444
// Dependencies of the dropdown lib.
45-
dependency_provider.add_dependencies("dropdown", (1, 8, 0), vec![]);
46-
dependency_provider.add_dependencies("dropdown", (2, 0, 0), vec![
45+
dependency_provider.add_dependencies("dropdown", (1, 8, 0), []);
46+
dependency_provider.add_dependencies("dropdown", (2, 0, 0), [
4747
("icons", Range::exact((2, 0, 0))),
4848
]);
49-
dependency_provider.add_dependencies("dropdown", (2, 1, 0), vec![
49+
dependency_provider.add_dependencies("dropdown", (2, 1, 0), [
5050
("icons", Range::exact((2, 0, 0))),
5151
]);
52-
dependency_provider.add_dependencies("dropdown", (2, 2, 0), vec![
52+
dependency_provider.add_dependencies("dropdown", (2, 2, 0), [
5353
("icons", Range::exact((2, 0, 0))),
5454
]);
55-
dependency_provider.add_dependencies("dropdown", (2, 3, 0), vec![
55+
dependency_provider.add_dependencies("dropdown", (2, 3, 0), [
5656
("icons", Range::exact((2, 0, 0))),
5757
]);
5858

5959
// Icons has no dependency.
60-
dependency_provider.add_dependencies("icons", (1, 0, 0), vec![]);
61-
dependency_provider.add_dependencies("icons", (2, 0, 0), vec![]);
60+
dependency_provider.add_dependencies("icons", (1, 0, 0), []);
61+
dependency_provider.add_dependencies("icons", (2, 0, 0), []);
6262

6363
// Run the algorithm.
6464
match resolve(&dependency_provider, "root", (1, 0, 0)) {

‎examples/linear_error_reporting.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn main() {
1313
// root 1.0.0 depends on foo ^1.0.0 and baz ^1.0.0
1414
dependency_provider.add_dependencies(
1515
"root", (1, 0, 0),
16-
vec![
16+
[
1717
("foo", Range::between((1, 0, 0), (2, 0, 0))),
1818
("baz", Range::between((1, 0, 0), (2, 0, 0))),
1919
],
@@ -22,17 +22,17 @@ fn main() {
2222
// foo 1.0.0 depends on bar ^2.0.0
2323
dependency_provider.add_dependencies(
2424
"foo", (1, 0, 0),
25-
vec![("bar", Range::between((2, 0, 0), (3, 0, 0)))],
25+
[("bar", Range::between((2, 0, 0), (3, 0, 0)))],
2626
);
2727
#[rustfmt::skip]
2828
// bar 2.0.0 depends on baz ^3.0.0
2929
dependency_provider.add_dependencies(
3030
"bar", (2, 0, 0),
31-
vec![("baz", Range::between((3, 0, 0), (4, 0, 0)))],
31+
[("baz", Range::between((3, 0, 0), (4, 0, 0)))],
3232
);
3333
// baz 1.0.0 and 3.0.0 have no dependencies
34-
dependency_provider.add_dependencies("baz", (1, 0, 0), vec![]);
35-
dependency_provider.add_dependencies("baz", (3, 0, 0), vec![]);
34+
dependency_provider.add_dependencies("baz", (1, 0, 0), []);
35+
dependency_provider.add_dependencies("baz", (3, 0, 0), []);
3636

3737
// Run the algorithm.
3838
match resolve(&dependency_provider, "root", (1, 0, 0)) {

‎src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
//! let mut dependency_provider = OfflineDependencyProvider::<&str, NumberVersion>::new();
5454
//!
5555
//! dependency_provider.add_dependencies(
56-
//! "root", 1, vec![("menu", Range::any()), ("icons", Range::any())],
56+
//! "root", 1, [("menu", Range::any()), ("icons", Range::any())],
5757
//! );
58-
//! dependency_provider.add_dependencies("menu", 1, vec![("dropdown", Range::any())]);
59-
//! dependency_provider.add_dependencies("dropdown", 1, vec![("icons", Range::any())]);
60-
//! dependency_provider.add_dependencies("icons", 1, vec![]);
58+
//! dependency_provider.add_dependencies("menu", 1, [("dropdown", Range::any())]);
59+
//! dependency_provider.add_dependencies("dropdown", 1, [("icons", Range::any())]);
60+
//! dependency_provider.add_dependencies("icons", 1, []);
6161
//!
6262
//! // Run the algorithm.
6363
//! let solution = resolve(&dependency_provider, "root", 1).unwrap();

0 commit comments

Comments
 (0)