Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit e44ea24

Browse files
cuviperMark-Simulacrum
authored andcommitted
Upgrade indexmap and thorin-dwp to use hashbrown 0.12
This removes the last dependencies on hashbrown 0.11.
1 parent eb5fb32 commit e44ea24

File tree

7 files changed

+20
-41
lines changed

7 files changed

+20
-41
lines changed

Cargo.lock

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,15 +1698,6 @@ dependencies = [
16981698
"serde_json",
16991699
]
17001700

1701-
[[package]]
1702-
name = "hashbrown"
1703-
version = "0.11.2"
1704-
source = "registry+https://github.com/rust-lang/crates.io-index"
1705-
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
1706-
dependencies = [
1707-
"ahash",
1708-
]
1709-
17101701
[[package]]
17111702
name = "hashbrown"
17121703
version = "0.12.0"
@@ -1873,12 +1864,12 @@ dependencies = [
18731864

18741865
[[package]]
18751866
name = "indexmap"
1876-
version = "1.8.2"
1867+
version = "1.9.1"
18771868
source = "registry+https://github.com/rust-lang/crates.io-index"
1878-
checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
1869+
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
18791870
dependencies = [
18801871
"autocfg",
1881-
"hashbrown 0.11.2",
1872+
"hashbrown",
18821873
"rustc-rayon",
18831874
"serde",
18841875
]
@@ -2559,27 +2550,15 @@ dependencies = [
25592550
"rustc-std-workspace-core",
25602551
]
25612552

2562-
[[package]]
2563-
name = "object"
2564-
version = "0.28.4"
2565-
source = "registry+https://github.com/rust-lang/crates.io-index"
2566-
checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
2567-
dependencies = [
2568-
"crc32fast",
2569-
"flate2",
2570-
"hashbrown 0.11.2",
2571-
"indexmap",
2572-
"memchr",
2573-
]
2574-
25752553
[[package]]
25762554
name = "object"
25772555
version = "0.29.0"
25782556
source = "registry+https://github.com/rust-lang/crates.io-index"
25792557
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
25802558
dependencies = [
25812559
"crc32fast",
2582-
"hashbrown 0.12.0",
2560+
"flate2",
2561+
"hashbrown",
25832562
"indexmap",
25842563
"memchr",
25852564
]
@@ -5047,7 +5026,7 @@ dependencies = [
50475026
"core",
50485027
"dlmalloc",
50495028
"fortanix-sgx-abi",
5050-
"hashbrown 0.12.0",
5029+
"hashbrown",
50515030
"hermit-abi 0.2.0",
50525031
"libc",
50535032
"miniz_oxide",
@@ -5306,13 +5285,13 @@ dependencies = [
53065285

53075286
[[package]]
53085287
name = "thorin-dwp"
5309-
version = "0.2.0"
5288+
version = "0.3.0"
53105289
source = "registry+https://github.com/rust-lang/crates.io-index"
5311-
checksum = "dd95b4559c196987c8451b4e14d08a4c796c2844f9adf4d2a2dbc9b3142843be"
5290+
checksum = "e6cb0c7868d7f90407531108ab03263d9452a8811b7cdd87675343a40d4aa254"
53125291
dependencies = [
53135292
"gimli 0.26.1",
5314-
"hashbrown 0.11.2",
5315-
"object 0.28.4",
5293+
"hashbrown",
5294+
"object 0.29.0",
53165295
"tracing",
53175296
]
53185297

compiler/rustc_codegen_cranelift/Cargo.lock

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 1 deletion
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.6.1"

compiler/rustc_codegen_ssa/Cargo.toml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ version = "0.0.0"
44
edition = "2021"
55

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

1010
[dev-dependencies]
1111
rustc_macros = { path = "../rustc_macros" }

src/tools/bump-stage0/Cargo.toml

Lines changed: 1 addition & 1 deletion
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 = "1.0.59"
1414
toml = "0.5.7"

0 commit comments

Comments
 (0)