Skip to content

Commit 4dbc89d

Browse files
committed
Auto merge of #99251 - cuviper:hashbrown-0.12, r=Mark-Simulacrum
Upgrade indexmap and thorin-dwp to use hashbrown 0.12 This removes the last dependencies on hashbrown 0.11. This also upgrades to hashbrown 0.12.3 to fix a double-free (#99372).
2 parents db8086e + 931a8f8 commit 4dbc89d

File tree

7 files changed

+21
-42
lines changed

7 files changed

+21
-42
lines changed

Diff for: Cargo.lock

+12-33
Original file line numberDiff line numberDiff line change
@@ -1726,18 +1726,9 @@ dependencies = [
17261726

17271727
[[package]]
17281728
name = "hashbrown"
1729-
version = "0.11.2"
1730-
source = "registry+https://github.com/rust-lang/crates.io-index"
1731-
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
1732-
dependencies = [
1733-
"ahash",
1734-
]
1735-
1736-
[[package]]
1737-
name = "hashbrown"
1738-
version = "0.12.0"
1729+
version = "0.12.3"
17391730
source = "registry+https://github.com/rust-lang/crates.io-index"
1740-
checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
1731+
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
17411732
dependencies = [
17421733
"ahash",
17431734
"compiler_builtins",
@@ -1896,12 +1887,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
18961887

18971888
[[package]]
18981889
name = "indexmap"
1899-
version = "1.8.2"
1890+
version = "1.9.1"
19001891
source = "registry+https://github.com/rust-lang/crates.io-index"
1901-
checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
1892+
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
19021893
dependencies = [
19031894
"autocfg",
1904-
"hashbrown 0.11.2",
1895+
"hashbrown",
19051896
"rustc-rayon",
19061897
"serde",
19071898
]
@@ -2576,27 +2567,15 @@ dependencies = [
25762567
"rustc-std-workspace-core",
25772568
]
25782569

2579-
[[package]]
2580-
name = "object"
2581-
version = "0.28.4"
2582-
source = "registry+https://github.com/rust-lang/crates.io-index"
2583-
checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
2584-
dependencies = [
2585-
"crc32fast",
2586-
"flate2",
2587-
"hashbrown 0.11.2",
2588-
"indexmap",
2589-
"memchr",
2590-
]
2591-
25922570
[[package]]
25932571
name = "object"
25942572
version = "0.29.0"
25952573
source = "registry+https://github.com/rust-lang/crates.io-index"
25962574
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
25972575
dependencies = [
25982576
"crc32fast",
2599-
"hashbrown 0.12.0",
2577+
"flate2",
2578+
"hashbrown",
26002579
"indexmap",
26012580
"memchr",
26022581
]
@@ -5068,7 +5047,7 @@ dependencies = [
50685047
"core",
50695048
"dlmalloc",
50705049
"fortanix-sgx-abi",
5071-
"hashbrown 0.12.0",
5050+
"hashbrown",
50725051
"hermit-abi 0.2.0",
50735052
"libc",
50745053
"miniz_oxide 0.4.0",
@@ -5279,13 +5258,13 @@ dependencies = [
52795258

52805259
[[package]]
52815260
name = "thorin-dwp"
5282-
version = "0.2.0"
5261+
version = "0.3.0"
52835262
source = "registry+https://github.com/rust-lang/crates.io-index"
5284-
checksum = "dd95b4559c196987c8451b4e14d08a4c796c2844f9adf4d2a2dbc9b3142843be"
5263+
checksum = "e6cb0c7868d7f90407531108ab03263d9452a8811b7cdd87675343a40d4aa254"
52855264
dependencies = [
52865265
"gimli 0.26.1",
5287-
"hashbrown 0.11.2",
5288-
"object 0.28.4",
5266+
"hashbrown",
5267+
"object 0.29.0",
52895268
"tracing",
52905269
]
52915270

Diff for: compiler/rustc_codegen_cranelift/Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ dependencies = [
163163

164164
[[package]]
165165
name = "hashbrown"
166-
version = "0.11.2"
166+
version = "0.12.3"
167167
source = "registry+https://github.com/rust-lang/crates.io-index"
168-
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
168+
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
169169

170170
[[package]]
171171
name = "indexmap"
172-
version = "1.8.0"
172+
version = "1.9.1"
173173
source = "registry+https://github.com/rust-lang/crates.io-index"
174-
checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
174+
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
175175
dependencies = [
176176
"autocfg",
177177
"hashbrown",

Diff for: compiler/rustc_codegen_cranelift/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ gimli = { version = "0.26.0", default-features = false, features = ["write"]}
1919
object = { version = "0.27.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
2020

2121
ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
22-
indexmap = "1.8.0"
22+
indexmap = "1.9.1"
2323
libloading = { version = "0.6.0", optional = true }
2424
once_cell = "1.10.0"
2525
smallvec = "1.8.1"

Diff for: compiler/rustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tracing = "0.1"
1414
libc = "0.2.50"
1515
jobserver = "0.1.22"
1616
tempfile = "3.2"
17-
thorin-dwp = "0.2"
17+
thorin-dwp = "0.3"
1818
pathdiff = "0.2.0"
1919
serde_json = "1.0.59"
2020
snap = "1"

Diff for: compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ doctest = false
99
[dependencies]
1010
arrayvec = { version = "0.7", default-features = false }
1111
ena = "0.14"
12-
indexmap = { version = "1.8.2" }
12+
indexmap = { version = "1.9.1" }
1313
tracing = "0.1"
1414
jobserver_crate = { version = "0.1.13", package = "jobserver" }
1515
rustc_serialize = { path = "../rustc_serialize" }

Diff for: compiler/rustc_serialize/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
indexmap = "1.8.0"
7+
indexmap = "1.9.1"
88
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
99

1010
[dev-dependencies]

Diff for: src/tools/bump-stage0/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
anyhow = "1.0.34"
1010
curl = "0.4.38"
11-
indexmap = { version = "1.7.0", features = ["serde"] }
11+
indexmap = { version = "1.9.1", features = ["serde"] }
1212
serde = { version = "1.0.125", features = ["derive"] }
1313
serde_json = { version = "1.0.59", features = ["preserve_order"] }
1414
toml = "0.5.7"

0 commit comments

Comments
 (0)