Skip to content

Commit daa7c14

Browse files
committed
Upgrade indexmap and thorin-dwp to use hashbrown 0.12
This removes the last dependencies on hashbrown 0.11.
1 parent 967a9c9 commit daa7c14

File tree

7 files changed

+19
-40
lines changed

7 files changed

+19
-40
lines changed

Cargo.lock

+10-31
Original file line numberDiff line numberDiff line change
@@ -1647,15 +1647,6 @@ dependencies = [
16471647
"serde_json",
16481648
]
16491649

1650-
[[package]]
1651-
name = "hashbrown"
1652-
version = "0.11.2"
1653-
source = "registry+https://github.com/rust-lang/crates.io-index"
1654-
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
1655-
dependencies = [
1656-
"ahash",
1657-
]
1658-
16591650
[[package]]
16601651
name = "hashbrown"
16611652
version = "0.12.0"
@@ -1822,12 +1813,12 @@ dependencies = [
18221813

18231814
[[package]]
18241815
name = "indexmap"
1825-
version = "1.8.2"
1816+
version = "1.9.1"
18261817
source = "registry+https://github.com/rust-lang/crates.io-index"
1827-
checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
1818+
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
18281819
dependencies = [
18291820
"autocfg",
1830-
"hashbrown 0.11.2",
1821+
"hashbrown",
18311822
"rustc-rayon",
18321823
"serde",
18331824
]
@@ -2494,27 +2485,15 @@ dependencies = [
24942485
"rustc-std-workspace-core",
24952486
]
24962487

2497-
[[package]]
2498-
name = "object"
2499-
version = "0.28.4"
2500-
source = "registry+https://github.com/rust-lang/crates.io-index"
2501-
checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
2502-
dependencies = [
2503-
"crc32fast",
2504-
"flate2",
2505-
"hashbrown 0.11.2",
2506-
"indexmap",
2507-
"memchr",
2508-
]
2509-
25102488
[[package]]
25112489
name = "object"
25122490
version = "0.29.0"
25132491
source = "registry+https://github.com/rust-lang/crates.io-index"
25142492
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
25152493
dependencies = [
25162494
"crc32fast",
2517-
"hashbrown 0.12.0",
2495+
"flate2",
2496+
"hashbrown",
25182497
"indexmap",
25192498
"memchr",
25202499
]
@@ -4978,7 +4957,7 @@ dependencies = [
49784957
"core",
49794958
"dlmalloc",
49804959
"fortanix-sgx-abi",
4981-
"hashbrown 0.12.0",
4960+
"hashbrown",
49824961
"hermit-abi 0.2.0",
49834962
"libc",
49844963
"miniz_oxide",
@@ -5207,13 +5186,13 @@ dependencies = [
52075186

52085187
[[package]]
52095188
name = "thorin-dwp"
5210-
version = "0.2.0"
5189+
version = "0.3.0"
52115190
source = "registry+https://github.com/rust-lang/crates.io-index"
5212-
checksum = "dd95b4559c196987c8451b4e14d08a4c796c2844f9adf4d2a2dbc9b3142843be"
5191+
checksum = "e6cb0c7868d7f90407531108ab03263d9452a8811b7cdd87675343a40d4aa254"
52135192
dependencies = [
52145193
"gimli 0.26.1",
5215-
"hashbrown 0.11.2",
5216-
"object 0.28.4",
5194+
"hashbrown",
5195+
"object 0.29.0",
52175196
"tracing",
52185197
]
52195198

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.0"
167167
source = "registry+https://github.com/rust-lang/crates.io-index"
168-
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
168+
checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
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",

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"

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"

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" }

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]

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)