Skip to content

Commit

Permalink
bump: dependencies (#33)
Browse files Browse the repository at this point in the history
  • Loading branch information
baszalmstra authored May 22, 2024
1 parent 17fcbe5 commit e170bd9
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 16 deletions.
11 changes: 10 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
labels:
- "dependencies"
commit-message:
prefix: "chore(ci)"
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "weekly"
labels:
- "dependencies"
commit-message:
prefix: "bump"
open-pull-requests-limit: 10
22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ readme = "README.md"
resolver = "2"

[dependencies]
itertools = "0.12.1"
petgraph = "0.6.4"
tracing = "0.1.37"
elsa = "1.9.0"
itertools = "0.13"
petgraph = "0.6.5"
tracing = "0.1.40"
elsa = "1.10.0"
bitvec = "1.0.1"
serde = { version = "1.0", features = ["derive"], optional = true }
futures = { version = "0.3.30", default-features = false, features = ["alloc"] }
event-listener = "5.0.0"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
event-listener = "5.3"

tokio = { version = "1.35.1", features = ["rt"], optional = true }
async-std = { version = "1.12.0", default-features = false, features = ["alloc", "default"], optional = true }
tokio = { version = "1.37", features = ["rt"], optional = true }
async-std = { version = "1.12", default-features = false, features = ["alloc", "default"], optional = true }

[dev-dependencies]
insta = "1.31.0"
indexmap = "2.0.0"
proptest = "1.2.0"
insta = "1.39.0"
indexmap = "2"
proptest = "1.2"
tracing-test = { version = "0.2.4", features = ["no-env-filter"] }
tokio = { version = "1.35.1", features = ["time", "rt"] }
resolvo = { path = ".", features = ["tokio"] }
8 changes: 4 additions & 4 deletions src/problem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ impl ProblemGraph {
ProblemEdge::Requires(version_set_id) => (version_set_id, e.target()),
ProblemEdge::Conflict(_) => unreachable!(),
})
.group_by(|(&version_set_id, _)| version_set_id);
.chunk_by(|(&version_set_id, _)| version_set_id);

for (_, mut deps) in &dependencies {
if deps.all(|(_, target)| !installable.contains(&target)) {
Expand Down Expand Up @@ -493,7 +493,7 @@ impl ProblemGraph {
ProblemEdge::Requires(version_set_id) => (version_set_id, e.target()),
ProblemEdge::Conflict(_) => unreachable!(),
})
.group_by(|(&version_set_id, _)| version_set_id);
.chunk_by(|(&version_set_id, _)| version_set_id);

// Missing if at least one dependency is missing
if dependencies
Expand Down Expand Up @@ -673,7 +673,7 @@ impl<'pool, VS: VersionSet, N: PackageName + Display, M: SolvableDisplay<VS, N>>
let mut stack = top_level_edges
.iter()
.filter(|e| e.weight().try_requires().is_some())
.group_by(|e| e.weight().requires())
.chunk_by(|e| e.weight().requires())
.into_iter()
.map(|(version_set_id, group)| {
let edges: Vec<_> = group.map(|e| e.id()).collect();
Expand Down Expand Up @@ -907,7 +907,7 @@ impl<'pool, VS: VersionSet, N: PackageName + Display, M: SolvableDisplay<VS, N>>
writeln!(f, "{indent}{name} {version} would require",)?;
let mut requirements = graph
.edges(candidate)
.group_by(|e| e.weight().requires())
.chunk_by(|e| e.weight().requires())
.into_iter()
.map(|(version_set_id, group)| {
let edges: Vec<_> = group.map(|e| e.id()).collect();
Expand Down

0 comments on commit e170bd9

Please sign in to comment.