diff --git a/Cargo.lock b/Cargo.lock index 106a82196d..ac0dbc4829 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3483,7 +3483,6 @@ dependencies = [ "my-workspace-hack", "redis 0.13.0", "time 0.1.45", - "tokio", "version-sync", ] @@ -3930,6 +3929,7 @@ dependencies = [ "clap", "combine 4.6.6", "crossbeam-utils 0.8.16", + "crypto-common", "deranged", "derive_more", "digest 0.10.7", @@ -3945,7 +3945,6 @@ dependencies = [ "futures-task", "futures-util", "generic-array", - "getrandom 0.1.16", "getrandom 0.2.11", "hashbrown 0.12.3", "hashbrown 0.14.5", @@ -3966,7 +3965,6 @@ dependencies = [ "num-iter", "num-rational", "num-traits", - "once_cell", "openssl", "openssl-sys", "proc-macro2", diff --git a/crates/my-workspace-hack/Cargo.toml b/crates/my-workspace-hack/Cargo.toml index 1eabf029e9..14110222cc 100644 --- a/crates/my-workspace-hack/Cargo.toml +++ b/crates/my-workspace-hack/Cargo.toml @@ -15,7 +15,7 @@ publish = false ### BEGIN HAKARI SECTION [dependencies] actix-rt = { version = "2.9.0" } -ahash = { version = "0.8.6" } +ahash = { version = "0.8.11" } base64 = { version = "0.21.5" } base64ct = { version = "1.6.0", default-features = false, features = ["alloc"] } bitflags = { version = "2.4.1", default-features = false, features = ["serde", "std"] } @@ -26,6 +26,7 @@ chrono = { version = "0.4.31", features = ["alloc", "serde"] } clap = { version = "4.4.8", features = ["derive"] } combine = { version = "4.6.6", default-features = false, features = ["std", "tokio"] } crossbeam-utils = { version = "0.8.16" } +crypto-common = { version = "0.1.6", default-features = false, features = ["std"] } deranged = { version = "0.3.9", default-features = false, features = ["powerfmt", "serde", "std"] } digest = { version = "0.10.7", features = ["mac", "oid", "std"] } either = { version = "1.9.0", features = ["serde"] } @@ -40,9 +41,8 @@ futures-sink = { version = "0.3.29" } futures-task = { version = "0.3.29", default-features = false, features = ["std"] } futures-util = { version = "0.3.29", features = ["channel", "io", "sink"] } generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths"] } -getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2.11", default-features = false, features = ["std"] } -getrandom-c65f7effa3be6d31 = { package = "getrandom", version = "0.1.16", default-features = false, features = ["std"] } -hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14.2", features = ["raw"] } +getrandom = { version = "0.2.11", default-features = false, features = ["std"] } +hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14.5", features = ["raw"] } hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12.3", features = ["raw"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } hyper = { version = "0.14.27", features = ["full"] } @@ -60,7 +60,6 @@ num-integer = { version = "0.1.45", default-features = false, features = ["i128" num-iter = { version = "0.1.43", default-features = false, features = ["i128", "std"] } num-rational = { version = "0.4.1", features = ["serde"] } num-traits = { version = "0.2.17", features = ["i128", "libm"] } -once_cell = { version = "1.18.0", features = ["unstable"] } proc-macro2 = { version = "1.0.78", features = ["span-locations"] } pulldown-cmark = { version = "0.9.3" } quote = { version = "1.0.35" } @@ -93,7 +92,7 @@ void = { version = "1.0.2" } zip = { version = "0.6.6" } [build-dependencies] -ahash = { version = "0.8.6" } +ahash = { version = "0.8.11" } base64 = { version = "0.21.5" } base64ct = { version = "1.6.0", default-features = false, features = ["alloc"] } bitflags = { version = "2.4.1", default-features = false, features = ["serde", "std"] } @@ -101,6 +100,7 @@ byteorder = { version = "1.5.0" } cc = { version = "1.0.83", default-features = false, features = ["parallel"] } chrono = { version = "0.4.31", features = ["alloc", "serde"] } crossbeam-utils = { version = "0.8.16" } +crypto-common = { version = "0.1.6", default-features = false, features = ["std"] } deranged = { version = "0.3.9", default-features = false, features = ["powerfmt", "serde", "std"] } derive_more = { version = "0.99.17", features = ["nightly"] } digest = { version = "0.10.7", features = ["mac", "oid", "std"] } @@ -115,8 +115,8 @@ futures-sink = { version = "0.3.29" } futures-task = { version = "0.3.29", default-features = false, features = ["std"] } futures-util = { version = "0.3.29", features = ["channel", "io", "sink"] } generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths"] } -getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2.11", default-features = false, features = ["std"] } -hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14.2", features = ["raw"] } +getrandom = { version = "0.2.11", default-features = false, features = ["std"] } +hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14.5", features = ["raw"] } heck = { version = "0.4.1", features = ["unicode"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } indexmap = { version = "2.2.3", features = ["serde"] } @@ -131,7 +131,6 @@ native-tls = { version = "0.2.11", default-features = false, features = ["vendor num-integer = { version = "0.1.45", default-features = false, features = ["i128", "std"] } num-iter = { version = "0.1.43", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2.17", features = ["i128", "libm"] } -once_cell = { version = "1.18.0", features = ["unstable"] } proc-macro2 = { version = "1.0.78", features = ["span-locations"] } quote = { version = "1.0.35" } rand = { version = "0.8.5", features = ["small_rng"] } diff --git a/crates/vendor/limitation/Cargo.toml b/crates/vendor/limitation/Cargo.toml index 63cc5f6ce5..781647e782 100644 --- a/crates/vendor/limitation/Cargo.toml +++ b/crates/vendor/limitation/Cargo.toml @@ -30,5 +30,5 @@ time = "0.1.42" my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" } [dev-dependencies] -tokio = "1.34.0" +#tokio = "1.34.0" # NB(bt,2024-05-16): Dependency fix recommends this is unused version-sync = "0.9.5" diff --git a/execute_dependency_fix.sh b/execute_dependency_fix.sh index fb1b436051..5cb35460ef 100755 --- a/execute_dependency_fix.sh +++ b/execute_dependency_fix.sh @@ -2,6 +2,10 @@ set -euxo pipefail +echo 'Updating hakari (dependency graph build optimization)' + +cargo hakari generate + echo 'Looking for unused dependencies' # https://github.com/est31/cargo-udeps