From 32541c5c1507d5028de9a3f7495b089721f55bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Sun, 15 Aug 2021 22:29:09 +0200 Subject: [PATCH] Upgrade hashbrown --- Cargo.lock | 39 +++++++++++++++---------------- aquatic/Cargo.toml | 2 +- aquatic_common/Cargo.toml | 2 +- aquatic_http/Cargo.toml | 2 +- aquatic_http_load_test/Cargo.toml | 2 +- aquatic_http_protocol/Cargo.toml | 2 +- aquatic_udp/Cargo.toml | 2 +- aquatic_udp_load_test/Cargo.toml | 2 +- aquatic_udp_protocol/Cargo.toml | 2 +- aquatic_ws/Cargo.toml | 2 +- aquatic_ws_load_test/Cargo.toml | 2 +- aquatic_ws_protocol/Cargo.toml | 2 +- 12 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c52fcee..36da3b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,9 +23,14 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" [[package]] name = "ahash" -version = "0.4.7" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] [[package]] name = "aho-corasick" @@ -81,7 +86,7 @@ dependencies = [ "aquatic_http_protocol", "crossbeam-channel", "either", - "hashbrown 0.9.1", + "hashbrown 0.11.2", "histogram", "indexmap", "itoa", @@ -107,7 +112,7 @@ dependencies = [ "anyhow", "aquatic_cli_helpers", "aquatic_http_protocol", - "hashbrown 0.9.1", + "hashbrown 0.11.2", "mimalloc", "mio", "quickcheck", @@ -124,7 +129,7 @@ dependencies = [ "anyhow", "bendy", "criterion", - "hashbrown 0.9.1", + "hashbrown 0.11.2", "hex", "httparse", "itoa", @@ -148,7 +153,7 @@ dependencies = [ "aquatic_common", "aquatic_udp_protocol", "crossbeam-channel", - "hashbrown 0.9.1", + "hashbrown 0.11.2", "histogram", "indexmap", "log", @@ -187,7 +192,7 @@ dependencies = [ "aquatic_cli_helpers", "aquatic_udp_protocol", "crossbeam-channel", - "hashbrown 0.9.1", + "hashbrown 0.11.2", "mimalloc", "mio", "parking_lot", @@ -218,7 +223,7 @@ dependencies = [ "aquatic_ws_protocol", "crossbeam-channel", "either", - "hashbrown 0.9.1", + "hashbrown 0.11.2", "histogram", "indexmap", "log", @@ -242,7 +247,7 @@ dependencies = [ "anyhow", "aquatic_cli_helpers", "aquatic_ws_protocol", - "hashbrown 0.9.1", + "hashbrown 0.11.2", "mimalloc", "mio", "quickcheck", @@ -261,7 +266,7 @@ version = "0.1.0" dependencies = [ "anyhow", "criterion", - "hashbrown 0.9.1", + "hashbrown 0.11.2", "quickcheck", "quickcheck_macros", "serde", @@ -706,21 +711,15 @@ dependencies = [ "autocfg", ] -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -dependencies = [ - "ahash 0.4.7", - "serde", -] - [[package]] name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash 0.7.4", + "serde", +] [[package]] name = "hermit-abi" diff --git a/aquatic/Cargo.toml b/aquatic/Cargo.toml index c6f08fb..2d9e4bc 100644 --- a/aquatic/Cargo.toml +++ b/aquatic/Cargo.toml @@ -16,4 +16,4 @@ aquatic_cli_helpers = "0.1.0" aquatic_http = "0.1.0" aquatic_udp = "0.1.0" aquatic_ws = "0.1.0" -mimalloc = { version = "0.1", default-features = false } \ No newline at end of file +mimalloc = { version = "0.1", default-features = false } diff --git a/aquatic_common/Cargo.toml b/aquatic_common/Cargo.toml index df81bee..b74988f 100644 --- a/aquatic_common/Cargo.toml +++ b/aquatic_common/Cargo.toml @@ -12,4 +12,4 @@ name = "aquatic_common" [dependencies] indexmap = "1" -rand = { version = "0.8", features = ["small_rng"] } \ No newline at end of file +rand = { version = "0.8", features = ["small_rng"] } diff --git a/aquatic_http/Cargo.toml b/aquatic_http/Cargo.toml index da71513..238ca0d 100644 --- a/aquatic_http/Cargo.toml +++ b/aquatic_http/Cargo.toml @@ -22,7 +22,7 @@ aquatic_common = "0.1.0" aquatic_http_protocol = "0.1.0" crossbeam-channel = "0.5" either = "1" -hashbrown = "0.9" +hashbrown = "0.11.2" histogram = "0.6" indexmap = "1" itoa = "0.4" diff --git a/aquatic_http_load_test/Cargo.toml b/aquatic_http_load_test/Cargo.toml index a5b2edb..7d29e52 100644 --- a/aquatic_http_load_test/Cargo.toml +++ b/aquatic_http_load_test/Cargo.toml @@ -13,7 +13,7 @@ name = "aquatic_http_load_test" anyhow = "1" aquatic_cli_helpers = "0.1.0" aquatic_http_protocol = "0.1.0" -hashbrown = "0.9" +hashbrown = "0.11.2" mimalloc = { version = "0.1", default-features = false } mio = { version = "0.7", features = ["udp", "os-poll", "os-util"] } rand = { version = "0.8", features = ["small_rng"] } diff --git a/aquatic_http_protocol/Cargo.toml b/aquatic_http_protocol/Cargo.toml index f1b5cda..96064d0 100644 --- a/aquatic_http_protocol/Cargo.toml +++ b/aquatic_http_protocol/Cargo.toml @@ -23,7 +23,7 @@ harness = false [dependencies] anyhow = "1" -hashbrown = "0.9" +hashbrown = "0.11.2" hex = { version = "0.4", default-features = false } httparse = "1" itoa = "0.4" diff --git a/aquatic_udp/Cargo.toml b/aquatic_udp/Cargo.toml index 15c43b3..d05c3b7 100644 --- a/aquatic_udp/Cargo.toml +++ b/aquatic_udp/Cargo.toml @@ -20,7 +20,7 @@ aquatic_cli_helpers = "0.1.0" aquatic_common = "0.1.0" aquatic_udp_protocol = "0.1.0" crossbeam-channel = "0.5" -hashbrown = "0.9" +hashbrown = "0.11.2" histogram = "0.6" indexmap = "1" log = "0.4" diff --git a/aquatic_udp_load_test/Cargo.toml b/aquatic_udp_load_test/Cargo.toml index 6f4d2c0..61067b0 100644 --- a/aquatic_udp_load_test/Cargo.toml +++ b/aquatic_udp_load_test/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1" aquatic_cli_helpers = "0.1.0" aquatic_udp_protocol = "0.1.0" crossbeam-channel = "0.5" -hashbrown = "0.9" +hashbrown = "0.11.2" mimalloc = { version = "0.1", default-features = false } mio = { version = "0.7", features = ["udp", "os-poll", "os-util"] } parking_lot = "0.11" diff --git a/aquatic_udp_protocol/Cargo.toml b/aquatic_udp_protocol/Cargo.toml index e70ad78..12d11ce 100644 --- a/aquatic_udp_protocol/Cargo.toml +++ b/aquatic_udp_protocol/Cargo.toml @@ -12,4 +12,4 @@ byteorder = "1" [dev-dependencies] quickcheck = "1.0" -quickcheck_macros = "1.0" \ No newline at end of file +quickcheck_macros = "1.0" diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml index 0feb908..7f677c8 100644 --- a/aquatic_ws/Cargo.toml +++ b/aquatic_ws/Cargo.toml @@ -22,7 +22,7 @@ aquatic_common = "0.1.0" aquatic_ws_protocol = "0.1.0" crossbeam-channel = "0.5" either = "1" -hashbrown = { version = "0.9", features = ["serde"] } +hashbrown = { version = "0.11.2", features = ["serde"] } histogram = "0.6" indexmap = "1" log = "0.4" diff --git a/aquatic_ws_load_test/Cargo.toml b/aquatic_ws_load_test/Cargo.toml index 90e4869..54a5923 100644 --- a/aquatic_ws_load_test/Cargo.toml +++ b/aquatic_ws_load_test/Cargo.toml @@ -13,7 +13,7 @@ name = "aquatic_ws_load_test" anyhow = "1" aquatic_cli_helpers = "0.1.0" aquatic_ws_protocol = "0.1.0" -hashbrown = { version = "0.9", features = ["serde"] } +hashbrown = { version = "0.11.2", features = ["serde"] } mimalloc = { version = "0.1", default-features = false } mio = { version = "0.7", features = ["udp", "os-poll", "os-util"] } rand = { version = "0.8", features = ["small_rng"] } diff --git a/aquatic_ws_protocol/Cargo.toml b/aquatic_ws_protocol/Cargo.toml index 8e34e38..ac35a62 100644 --- a/aquatic_ws_protocol/Cargo.toml +++ b/aquatic_ws_protocol/Cargo.toml @@ -18,7 +18,7 @@ harness = false [dependencies] anyhow = "1" -hashbrown = { version = "0.9", features = ["serde"] } +hashbrown = { version = "0.11.2", features = ["serde"] } serde = { version = "1", features = ["derive"] } serde_json = "1" simd-json = { version = "0.3", features = ["allow-non-simd"] }