Skip to content

Commit a560a4e

Browse files
committed
Auto merge of #131099 - cuviper:indexmap-hash_table, r=<try>
Test indexmap#343 - using hashbrown 0.15 with HashTable In indexmap-rs/indexmap#343, I've ported to hashbrown 0.15, which also requires a change from `RawTable` (now private) to `HashTable`. This PR is patching to use that unpublished branch so I can test rustc performance. r? ghost
2 parents c4f7176 + 8ed63d7 commit a560a4e

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

Cargo.lock

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,6 +1492,12 @@ dependencies = [
14921492
"serde",
14931493
]
14941494

1495+
[[package]]
1496+
name = "hashbrown"
1497+
version = "0.15.0"
1498+
source = "registry+https://github.com/rust-lang/crates.io-index"
1499+
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
1500+
14951501
[[package]]
14961502
name = "heck"
14971503
version = "0.4.1"
@@ -1741,11 +1747,10 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
17411747
[[package]]
17421748
name = "indexmap"
17431749
version = "2.5.0"
1744-
source = "registry+https://github.com/rust-lang/crates.io-index"
1745-
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
1750+
source = "git+https://github.com/cuviper/indexmap?branch=hash_table#e577bf2556a40cb85d3befceeead50ee77ae508d"
17461751
dependencies = [
17471752
"equivalent",
1748-
"hashbrown",
1753+
"hashbrown 0.15.0",
17491754
"rustc-rayon",
17501755
"serde",
17511756
]
@@ -2439,7 +2444,7 @@ checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
24392444
dependencies = [
24402445
"crc32fast",
24412446
"flate2",
2442-
"hashbrown",
2447+
"hashbrown 0.14.5",
24432448
"indexmap",
24442449
"memchr",
24452450
"ruzstd",
@@ -2468,7 +2473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
24682473
checksum = "30c7f82d6d446dd295845094f3a76bcdc5e6183b66667334e169f019cd05e5a0"
24692474
dependencies = [
24702475
"ahash",
2471-
"hashbrown",
2476+
"hashbrown 0.14.5",
24722477
"parking_lot",
24732478
"stable_deref_trait",
24742479
]
@@ -5183,7 +5188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
51835188
checksum = "813ba76597db32dc4f6992fd8bf8f394715b88d352fd97401da67dab6283b4c6"
51845189
dependencies = [
51855190
"gimli 0.30.0",
5186-
"hashbrown",
5191+
"hashbrown 0.14.5",
51875192
"object 0.36.4",
51885193
"tracing",
51895194
]
@@ -5843,7 +5848,7 @@ checksum = "ca917a21307d3adf2b9857b94dd05ebf8496bdcff4437a9b9fb3899d3e6c74e7"
58435848
dependencies = [
58445849
"ahash",
58455850
"bitflags 2.6.0",
5846-
"hashbrown",
5851+
"hashbrown 0.14.5",
58475852
"indexmap",
58485853
"semver",
58495854
"serde",

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,7 @@ codegen-units = 1
9090
# FIXME: LTO cannot be enabled for binaries in a workspace
9191
# <https://github.com/rust-lang/cargo/issues/9330>
9292
# lto = true
93+
94+
[patch.crates-io.indexmap]
95+
git = "https://github.com/cuviper/indexmap"
96+
branch = "hash_table"

0 commit comments

Comments
 (0)