From 8887ed88aa265c9b71f020a927b8e9f70c19c028 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 14 Jan 2022 08:43:42 +1000 Subject: [PATCH] Update Zebra's allowed duplicate dependencies (#3316) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- deny.toml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/deny.toml b/deny.toml index bf5088600bc..fea5269aeb4 100644 --- a/deny.toml +++ b/deny.toml @@ -31,9 +31,6 @@ skip = [ # dependencies starting at the specified crate, up to a certain depth, which is # by default infinite skip-tree = [ - # ticket #2953: tracing dependencies - { name = "tracing-subscriber", version = "=0.1.6" }, - # ticket #2983: criterion dependencies { name = "criterion", version = "=0.3.4" }, @@ -46,9 +43,8 @@ skip-tree = [ # ticket #3063: redjubjub dependencies { name = "redjubjub", version = "=0.4.0" }, - # ordered-map dependencies that should be dev-dependencies - # https://github.com/qwfy/ordered-map/pull/1 - { name = "env_logger", version = "=0.7.1" }, + # ticket #3315: ordered-map dependencies that should be dev-dependencies + { name = "ordered-map", version = "=0.4.2" }, # ticket #2984: owo-colors dependencies { name = "color-eyre", version = "=0.5.11" }, @@ -65,9 +61,8 @@ skip-tree = [ # ticket #3061: reqwest and minreq dependencies { name = "webpki-roots", version = "=0.18.0" }, - # ticket #2980: inferno and orchard/cryptographic dependencies - { name = "inferno", version = "=0.10.8" }, - { name = "orchard", version = "=0.0.0" }, + # ticket #2980: inferno dependency on outdated arrayvec + { name = "inferno", version = "=0.10.9" }, # upgrade orchard from deprecated `bigint` to `uint`: https://github.com/zcash/orchard/issues/219 # alternative: downgrade Zebra to `bigint` @@ -80,7 +75,6 @@ skip-tree = [ { name = "rand", version = "=0.7.3" }, # wait for lots of crates in the tokio ecosystem to upgrade - { name = "redox_syscall", version = "=0.1.57" }, { name = "socket2", version = "=0.3.16" }, ]