From 7f01f4024a65c0bd7cb96921f4fdfb5a938b57ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Sun, 30 Jul 2023 20:32:30 +0200 Subject: [PATCH] Upgrade hashbrown and indexmap crates --- Cargo.lock | 52 +++++++++++++++++++++++++------ aquatic_common/Cargo.toml | 4 +-- aquatic_http_load_test/Cargo.toml | 2 +- aquatic_udp/Cargo.toml | 2 +- aquatic_udp_load_test/Cargo.toml | 2 +- aquatic_ws/Cargo.toml | 2 +- aquatic_ws_protocol/Cargo.toml | 2 +- 7 files changed, 49 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ba3943..55d9237 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,6 +58,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "anes" version = "0.1.6" @@ -98,10 +104,10 @@ dependencies = [ "duplicate", "git-testament", "glommio", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "hex", "hwloc", - "indexmap", + "indexmap 2.0.0", "libc", "log", "privdrop", @@ -157,7 +163,7 @@ dependencies = [ "futures-lite", "futures-rustls", "glommio", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "log", "mimalloc", "quickcheck", @@ -233,7 +239,7 @@ dependencies = [ "constant_time_eq 0.2.6", "crossbeam-channel", "getrandom", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "hdrhistogram", "hex", "io-uring", @@ -282,7 +288,7 @@ dependencies = [ "aquatic_common", "aquatic_toml_config", "aquatic_udp_protocol", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "mimalloc", "mio", "quickcheck", @@ -319,7 +325,7 @@ dependencies = [ "futures-lite", "futures-rustls", "glommio", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "httparse", "log", "metrics", @@ -369,7 +375,7 @@ version = "0.8.0" dependencies = [ "anyhow", "criterion 0.5.1", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "quickcheck", "quickcheck_macros", "serde", @@ -604,7 +610,7 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "bitflags 1.3.2", "clap_lex 0.2.4", - "indexmap", + "indexmap 1.9.3", "textwrap", ] @@ -925,6 +931,12 @@ dependencies = [ "regex", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.2.8" @@ -1243,6 +1255,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ "ahash 0.8.3", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", "serde", ] @@ -1379,6 +1401,16 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "indicatif" version = "0.17.5" @@ -1664,7 +1696,7 @@ checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" dependencies = [ "base64 0.21.2", "hyper", - "indexmap", + "indexmap 1.9.3", "ipnet", "metrics", "metrics-util", @@ -1694,7 +1726,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.13.2", - "indexmap", + "indexmap 1.9.3", "metrics", "num_cpus", "ordered-float", diff --git a/aquatic_common/Cargo.toml b/aquatic_common/Cargo.toml index 631c068..10ec9ca 100644 --- a/aquatic_common/Cargo.toml +++ b/aquatic_common/Cargo.toml @@ -23,9 +23,9 @@ anyhow = "1" arc-swap = "1" duplicate = "1" git-testament = "0.2" -hashbrown = "0.13" +hashbrown = "0.14" hex = "0.4" -indexmap = "1" +indexmap = "2" libc = "0.2" log = "0.4" privdrop = "0.5" diff --git a/aquatic_http_load_test/Cargo.toml b/aquatic_http_load_test/Cargo.toml index dc6a141..291d094 100644 --- a/aquatic_http_load_test/Cargo.toml +++ b/aquatic_http_load_test/Cargo.toml @@ -21,7 +21,7 @@ aquatic_toml_config.workspace = true anyhow = "1" futures-lite = "1" futures-rustls = "0.24" -hashbrown = "0.13" +hashbrown = "0.14" glommio = "0.8" log = "0.4" mimalloc = { version = "0.1", default-features = false } diff --git a/aquatic_udp/Cargo.toml b/aquatic_udp/Cargo.toml index 7f779bc..59d0d0e 100644 --- a/aquatic_udp/Cargo.toml +++ b/aquatic_udp/Cargo.toml @@ -34,7 +34,7 @@ compact_str = "0.7" constant_time_eq = "0.2" crossbeam-channel = "0.5" getrandom = "0.2" -hashbrown = { version = "0.13", default-features = false } +hashbrown = { version = "0.14", default-features = false } hdrhistogram = "7" hex = "0.4" io-uring = { version = "0.6", optional = true } diff --git a/aquatic_udp_load_test/Cargo.toml b/aquatic_udp_load_test/Cargo.toml index 6802cfc..5c3df5c 100644 --- a/aquatic_udp_load_test/Cargo.toml +++ b/aquatic_udp_load_test/Cargo.toml @@ -22,7 +22,7 @@ aquatic_toml_config.workspace = true aquatic_udp_protocol.workspace = true anyhow = "1" -hashbrown = "0.13" +hashbrown = "0.14" mimalloc = { version = "0.1", default-features = false } mio = { version = "0.8", features = ["net", "os-poll"] } rand_distr = "0.4" diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml index 90b656c..598cb1f 100644 --- a/aquatic_ws/Cargo.toml +++ b/aquatic_ws/Cargo.toml @@ -34,7 +34,7 @@ futures = "0.3" futures-lite = "1" futures-rustls = "0.24" glommio = "0.8" -hashbrown = { version = "0.13", features = ["serde"] } +hashbrown = { version = "0.14", features = ["serde"] } httparse = "1" log = "0.4" metrics = { version = "0.21", optional = true } diff --git a/aquatic_ws_protocol/Cargo.toml b/aquatic_ws_protocol/Cargo.toml index 0abe6b0..ba89914 100644 --- a/aquatic_ws_protocol/Cargo.toml +++ b/aquatic_ws_protocol/Cargo.toml @@ -21,7 +21,7 @@ harness = false [dependencies] anyhow = "1" -hashbrown = { version = "0.13", features = ["serde"] } +hashbrown = { version = "0.14", features = ["serde"] } serde = { version = "1", features = ["derive"] } serde_json = "1" simd-json = { version = "0.10", features = ["allow-non-simd"] }