mirror of
https://github.com/rust-lang/cargo
synced 2024-09-13 21:11:44 +00:00
Update im-rc
to 15.0.0
Hopefully just a routine update triggered by dependabot!
This commit is contained in:
parent
13bded9a33
commit
b5c191911c
|
@ -68,7 +68,7 @@ walkdir = "2.2"
|
||||||
clap = "2.31.2"
|
clap = "2.31.2"
|
||||||
unicode-width = "0.1.5"
|
unicode-width = "0.1.5"
|
||||||
openssl = { version = '0.10.11', optional = true }
|
openssl = { version = '0.10.11', optional = true }
|
||||||
im-rc = "14.0.0"
|
im-rc = "15.0.0"
|
||||||
|
|
||||||
# A noop dependency that changes in the Rust repository, it's a bit of a hack.
|
# A noop dependency that changes in the Rust repository, it's a bit of a hack.
|
||||||
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
|
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
|
||||||
|
|
|
@ -844,7 +844,7 @@ fn generalize_conflicting(
|
||||||
for (critical_parent, critical_parents_deps) in
|
for (critical_parent, critical_parents_deps) in
|
||||||
cx.parents.edges(&backtrack_critical_id).filter(|(p, _)| {
|
cx.parents.edges(&backtrack_critical_id).filter(|(p, _)| {
|
||||||
// it will only help backjump further if it is older then the critical_age
|
// it will only help backjump further if it is older then the critical_age
|
||||||
cx.is_active(*p).expect("parent not currently active!?") < backtrack_critical_age
|
cx.is_active(**p).expect("parent not currently active!?") < backtrack_critical_age
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
for critical_parents_dep in critical_parents_deps.iter() {
|
for critical_parents_dep in critical_parents_deps.iter() {
|
||||||
|
|
|
@ -37,7 +37,7 @@ impl<N: Eq + Ord + Clone, E: Default + Clone> Graph<N, E> {
|
||||||
self.nodes.get(from)?.get(to)
|
self.nodes.get(from)?.get(to)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn edges(&self, from: &N) -> impl Iterator<Item = &(N, E)> {
|
pub fn edges(&self, from: &N) -> impl Iterator<Item = (&N, &E)> {
|
||||||
self.nodes.get(from).into_iter().flat_map(|x| x.iter())
|
self.nodes.get(from).into_iter().flat_map(|x| x.iter())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,8 +95,8 @@ impl<N: Eq + Ord + Clone, E: Default + Clone> Graph<N, E> {
|
||||||
p.iter()
|
p.iter()
|
||||||
// Note that we can have "cycles" introduced through dev-dependency
|
// Note that we can have "cycles" introduced through dev-dependency
|
||||||
// edges, so make sure we don't loop infinitely.
|
// edges, so make sure we don't loop infinitely.
|
||||||
.find(|&(node, _)| !result.contains(&node))
|
.find(|(node, _)| !result.contains(node))
|
||||||
.map(|(ref p, _)| p)
|
.map(|(p, _)| p)
|
||||||
}) {
|
}) {
|
||||||
result.push(p);
|
result.push(p);
|
||||||
pkg = p;
|
pkg = p;
|
||||||
|
@ -114,11 +114,11 @@ impl<N: Eq + Ord + Clone, E: Default + Clone> Graph<N, E> {
|
||||||
let first_pkg_depending_on = |pkg: &N, res: &[&N]| {
|
let first_pkg_depending_on = |pkg: &N, res: &[&N]| {
|
||||||
self.nodes
|
self.nodes
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|&(_, adjacent)| adjacent.contains_key(pkg))
|
.filter(|(_, adjacent)| adjacent.contains_key(pkg))
|
||||||
// Note that we can have "cycles" introduced through dev-dependency
|
// Note that we can have "cycles" introduced through dev-dependency
|
||||||
// edges, so make sure we don't loop infinitely.
|
// edges, so make sure we don't loop infinitely.
|
||||||
.find(|&(node, _)| !res.contains(&node))
|
.find(|(node, _)| !res.contains(node))
|
||||||
.map(|(ref p, _)| p)
|
.map(|(p, _)| p)
|
||||||
};
|
};
|
||||||
while let Some(p) = first_pkg_depending_on(pkg, &result) {
|
while let Some(p) = first_pkg_depending_on(pkg, &result) {
|
||||||
result.push(p);
|
result.push(p);
|
||||||
|
|
Loading…
Reference in a new issue