From 6f569cea08297501f332f4d7114065df38fa98f7 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sun, 15 Jun 2025 20:51:52 +0200 Subject: [PATCH 1/2] update `hashbrown` to 0.15. --- gix-index/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gix-index/Cargo.toml b/gix-index/Cargo.toml index cf34775d764..6c443032833 100644 --- a/gix-index/Cargo.toml +++ b/gix-index/Cargo.toml @@ -34,7 +34,7 @@ gix-lock = { version = "^17.1.0", path = "../gix-lock" } gix-fs = { version = "^0.15.0", path = "../gix-fs" } gix-utils = { version = "^0.3.0", path = "../gix-utils" } -hashbrown = "0.14.3" +hashbrown = "0.15.4" fnv = "1.0.7" thiserror = "2.0.0" memmap2 = "0.9.0" From c1d0868c331c2f8ca8b22d22ff68744926a907b3 Mon Sep 17 00:00:00 2001 From: blinxen Date: Sun, 15 Jun 2025 20:23:09 +0200 Subject: [PATCH 2/2] chore!: Update hashbrown to the latest version This updates re-exports, removing `raw` and adding `hash_table`. --- Cargo.lock | 60 ++++++++-------------------------------- gix-hashtable/Cargo.toml | 5 +--- gix-hashtable/src/lib.rs | 2 +- 3 files changed, 14 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b04d4447a1..2cc5787b025 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,18 +17,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy 0.7.35", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -1841,7 +1829,7 @@ name = "gix-hashtable" version = "0.8.1" dependencies = [ "gix-hash", - "hashbrown 0.14.5", + "hashbrown 0.15.4", "parking_lot", ] @@ -1879,7 +1867,7 @@ dependencies = [ "gix-traverse", "gix-utils", "gix-validate", - "hashbrown 0.14.5", + "hashbrown 0.15.4", "itoa", "libc", "memmap2", @@ -2702,16 +2690,12 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" dependencies = [ "allocator-api2", "equivalent", @@ -2724,7 +2708,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.15.2", + "hashbrown 0.15.4", ] [[package]] @@ -2996,7 +2980,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17d34b7d42178945f775e84bc4c36dde7c1c6cdfea656d3354d009056f2bb3d2" dependencies = [ - "hashbrown 0.15.2", + "hashbrown 0.15.4", ] [[package]] @@ -3006,7 +2990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.15.4", ] [[package]] @@ -3282,7 +3266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.53.0", ] [[package]] @@ -3377,7 +3361,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.2", + "hashbrown 0.15.4", ] [[package]] @@ -3831,7 +3815,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.23", + "zerocopy", ] [[package]] @@ -5375,7 +5359,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -5866,33 +5850,13 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive 0.7.35", -] - [[package]] name = "zerocopy" version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" dependencies = [ - "zerocopy-derive 0.8.23", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", + "zerocopy-derive", ] [[package]] diff --git a/gix-hashtable/Cargo.toml b/gix-hashtable/Cargo.toml index 31fadc49451..3b84f51cac2 100644 --- a/gix-hashtable/Cargo.toml +++ b/gix-hashtable/Cargo.toml @@ -16,8 +16,5 @@ doctest = false [dependencies] parking_lot = "0.12.4" -hashbrown = { version = "0.14.0", default-features = false, features = [ - "inline-more", - "raw" -] } +hashbrown = { version = "0.15.4", default-features = false, features = ["inline-more"] } gix-hash = { version = "^0.18.0", path = "../gix-hash" } diff --git a/gix-hashtable/src/lib.rs b/gix-hashtable/src/lib.rs index 54935bcbca7..dab18be0f06 100644 --- a/gix-hashtable/src/lib.rs +++ b/gix-hashtable/src/lib.rs @@ -5,7 +5,7 @@ #![forbid(unsafe_code)] use gix_hash::ObjectId; -pub use hashbrown::{hash_map, hash_set, raw, Equivalent}; +pub use hashbrown::{hash_map, hash_set, hash_table, Equivalent}; /// thread-safe types pub mod sync {