From 88a339ed73b82bdb3aa9afcb5facdd5e63c20f99 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Sat, 27 Aug 2022 18:14:30 +0300 Subject: [PATCH] Update a few crates "cargo tree -d" showed that we're building multiple versions of some crates. Update some crates, to avoid depending on multiple versions. --- Cargo.lock | 45 ++++++++++----------------------------- libs/utils/Cargo.toml | 2 +- proxy/Cargo.toml | 4 ++-- workspace_hack/Cargo.toml | 10 +++++---- 4 files changed, 20 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 505cbb66c3..73b9c318ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1164,20 +1164,14 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "heck" @@ -1379,7 +1373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -2274,7 +2268,7 @@ dependencies = [ "clap 3.2.16", "futures", "git-version", - "hashbrown 0.11.2", + "hashbrown", "hex", "hmac 0.12.1", "hyper", @@ -2289,7 +2283,7 @@ dependencies = [ "routerify", "rstest", "rustls", - "rustls-pemfile 0.2.1", + "rustls-pemfile", "scopeguard", "serde", "serde_json", @@ -2315,15 +2309,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "rand", -] - [[package]] name = "quote" version = "1.0.21" @@ -2508,7 +2493,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", @@ -2697,15 +2682,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64", -] - [[package]] name = "rustls-pemfile" version = "1.0.1" @@ -3242,7 +3218,6 @@ dependencies = [ "js-sys", "libc", "num_threads", - "quickcheck", "time-macros", ] @@ -3683,7 +3658,7 @@ dependencies = [ "rand", "routerify", "rustls", - "rustls-pemfile 0.2.1", + "rustls-pemfile", "rustls-split", "serde", "serde_json", @@ -3969,6 +3944,7 @@ version = "0.1.0" dependencies = [ "ahash", "anyhow", + "bstr", "bytes", "chrono", "clap 2.34.0", @@ -3978,7 +3954,7 @@ dependencies = [ "futures-task", "futures-util", "generic-array", - "hashbrown 0.11.2", + "hashbrown", "hex", "hyper", "indexmap", @@ -3993,6 +3969,7 @@ dependencies = [ "prost", "rand", "regex", + "regex-automata", "regex-syntax", "scopeguard", "serde", diff --git a/libs/utils/Cargo.toml b/libs/utils/Cargo.toml index e3e78ec68f..28ad658de4 100644 --- a/libs/utils/Cargo.toml +++ b/libs/utils/Cargo.toml @@ -39,7 +39,7 @@ bytes = "1.0.1" hex-literal = "0.3" tempfile = "3.2" criterion = "0.3" -rustls-pemfile = "0.2.1" +rustls-pemfile = "1" [[bench]] name = "benchmarks" diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml index 230fc8a253..d3f7ea5fdc 100644 --- a/proxy/Cargo.toml +++ b/proxy/Cargo.toml @@ -11,7 +11,7 @@ bstr = "0.2.17" bytes = { version = "1.0.1", features = ['serde'] } clap = "3.0" futures = "0.3.13" -hashbrown = "0.11.2" +hashbrown = "0.12" hex = "0.4.3" hmac = "0.12.1" hyper = "0.14" @@ -23,7 +23,7 @@ rand = "0.8.3" reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls"] } routerify = "3" rustls = "0.20.0" -rustls-pemfile = "0.2.1" +rustls-pemfile = "1" scopeguard = "1.1.0" serde = "1" serde_json = "1" diff --git a/workspace_hack/Cargo.toml b/workspace_hack/Cargo.toml index 4dc7e4e157..bfe61b9ced 100644 --- a/workspace_hack/Cargo.toml +++ b/workspace_hack/Cargo.toml @@ -16,6 +16,7 @@ publish = false [dependencies] ahash = { version = "0.7", features = ["std"] } anyhow = { version = "1", features = ["backtrace", "std"] } +bstr = { version = "0.2", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] } bytes = { version = "1", features = ["serde", "std"] } chrono = { version = "0.4", features = ["clock", "libc", "oldtime", "serde", "std", "time", "winapi"] } clap = { version = "2", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] } @@ -25,7 +26,7 @@ futures-channel = { version = "0.3", features = ["alloc", "futures-sink", "sink" futures-task = { version = "0.3", default-features = false, features = ["alloc", "std"] } futures-util = { version = "0.3", default-features = false, features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std"] } generic-array = { version = "0.14", default-features = false, features = ["more_lengths"] } -hashbrown = { version = "0.11", features = ["ahash", "inline-more", "raw"] } +hashbrown = { version = "0.12", features = ["ahash", "inline-more", "raw"] } hex = { version = "0.4", features = ["alloc", "serde", "std"] } hyper = { version = "0.14", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] } indexmap = { version = "1", default-features = false, features = ["std"] } @@ -40,12 +41,13 @@ num-traits = { version = "0.2", features = ["i128", "std"] } prost = { version = "0.10", features = ["prost-derive", "std"] } rand = { version = "0.8", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] } regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +regex-automata = { version = "0.1", features = ["regex-syntax", "std"] } regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } scopeguard = { version = "1", features = ["use_std"] } serde = { version = "1", features = ["alloc", "derive", "serde_derive", "std"] } -time = { version = "0.3", features = ["alloc", "formatting", "itoa", "macros", "parsing", "quickcheck", "quickcheck-dep", "std", "time-macros"] } +time = { version = "0.3", features = ["alloc", "formatting", "itoa", "macros", "parsing", "std", "time-macros"] } tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "process", "rt", "rt-multi-thread", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros", "winapi"] } -tokio-util = { version = "0.7", features = ["codec", "io"] } +tokio-util = { version = "0.7", features = ["codec", "io", "tracing"] } tracing = { version = "0.1", features = ["attributes", "log", "std", "tracing-attributes"] } tracing-core = { version = "0.1", features = ["lazy_static", "std", "valuable"] } @@ -55,7 +57,7 @@ anyhow = { version = "1", features = ["backtrace", "std"] } bytes = { version = "1", features = ["serde", "std"] } clap = { version = "2", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] } either = { version = "1", features = ["use_std"] } -hashbrown = { version = "0.11", features = ["ahash", "inline-more", "raw"] } +hashbrown = { version = "0.12", features = ["ahash", "inline-more", "raw"] } indexmap = { version = "1", default-features = false, features = ["std"] } libc = { version = "0.2", features = ["extra_traits", "std"] } log = { version = "0.4", default-features = false, features = ["serde", "std"] }