Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 65899c0

Browse files
committed
Auto merge of #138893 - klensy:thorin-0.9, r=Mark-Simulacrum
bump thorin to 0.9 to drop duped deps Bumps `thorin`, removing duped deps. This also changes features for hashbrown: ``` hashbrown v0.15.2 `-- indexmap v2.7.0 |-- object v0.36.7 |-- wasmparser v0.219.1 |-- wasmparser v0.223.0 `-- wit-component v0.223.0 |-- indexmap feature "default" |-- indexmap feature "serde" `-- indexmap feature "std" |-- hashbrown feature "default-hasher" | |-- object v0.36.7 (*) | `-- wasmparser v0.223.0 (*) |-- hashbrown feature "nightly" | |-- rustc_data_structures v0.0.0 | `-- rustc_query_system v0.0.0 `-- hashbrown feature "serde" `-- wasmparser feature "serde" ``` to ``` hashbrown v0.15.2 `-- indexmap v2.7.0 |-- object v0.36.7 |-- wasmparser v0.219.1 |-- wasmparser v0.223.0 `-- wit-component v0.223.0 |-- indexmap feature "default" |-- indexmap feature "serde" `-- indexmap feature "std" |-- hashbrown feature "allocator-api2" | `-- hashbrown feature "default" |-- hashbrown feature "default" (*) |-- hashbrown feature "default-hasher" | |-- object v0.36.7 (*) | `-- wasmparser v0.223.0 (*) | `-- hashbrown feature "default" (*) |-- hashbrown feature "equivalent" | `-- hashbrown feature "default" (*) |-- hashbrown feature "inline-more" | `-- hashbrown feature "default" (*) |-- hashbrown feature "nightly" | |-- rustc_data_structures v0.0.0 | `-- rustc_query_system v0.0.0 |-- hashbrown feature "raw-entry" | `-- hashbrown feature "default" (*) `-- hashbrown feature "serde" `-- wasmparser feature "serde" ``` To be safe, as this can be perf-sensitive: `@bors` rollup=never
2 parents 6e8abb5 + 75f283e commit 65899c0

File tree

4 files changed

+13
-46
lines changed

4 files changed

+13
-46
lines changed

‎Cargo.lock‎

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,6 @@ dependencies = [
3434
"cpufeatures",
3535
]
3636

37-
[[package]]
38-
name = "ahash"
39-
version = "0.8.11"
40-
source = "registry+https://github.com/rust-lang/crates.io-index"
41-
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
42-
dependencies = [
43-
"cfg-if",
44-
"once_cell",
45-
"version_check",
46-
"zerocopy 0.7.35",
47-
]
48-
4937
[[package]]
5038
name = "aho-corasick"
5139
version = "1.1.3"
@@ -1425,17 +1413,6 @@ version = "0.28.1"
14251413
source = "registry+https://github.com/rust-lang/crates.io-index"
14261414
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
14271415

1428-
[[package]]
1429-
name = "gimli"
1430-
version = "0.30.0"
1431-
source = "registry+https://github.com/rust-lang/crates.io-index"
1432-
checksum = "e2e1d97fbe9722ba9bbd0c97051c2956e726562b61f86a25a4360398a40edfc9"
1433-
dependencies = [
1434-
"fallible-iterator",
1435-
"indexmap",
1436-
"stable_deref_trait",
1437-
]
1438-
14391416
[[package]]
14401417
name = "gimli"
14411418
version = "0.31.1"
@@ -1475,23 +1452,14 @@ dependencies = [
14751452
"serde",
14761453
]
14771454

1478-
[[package]]
1479-
name = "hashbrown"
1480-
version = "0.14.5"
1481-
source = "registry+https://github.com/rust-lang/crates.io-index"
1482-
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
1483-
dependencies = [
1484-
"ahash",
1485-
"allocator-api2",
1486-
]
1487-
14881455
[[package]]
14891456
name = "hashbrown"
14901457
version = "0.15.2"
14911458
source = "registry+https://github.com/rust-lang/crates.io-index"
14921459
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
14931460
dependencies = [
14941461
"allocator-api2",
1462+
"equivalent",
14951463
"foldhash",
14961464
"serde",
14971465
]
@@ -1815,7 +1783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
18151783
checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
18161784
dependencies = [
18171785
"equivalent",
1818-
"hashbrown 0.15.2",
1786+
"hashbrown",
18191787
"serde",
18201788
]
18211789

@@ -2470,7 +2438,7 @@ checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
24702438
dependencies = [
24712439
"crc32fast",
24722440
"flate2",
2473-
"hashbrown 0.15.2",
2441+
"hashbrown",
24742442
"indexmap",
24752443
"memchr",
24762444
"ruzstd",
@@ -3413,7 +3381,7 @@ name = "rustc_codegen_llvm"
34133381
version = "0.0.0"
34143382
dependencies = [
34153383
"bitflags",
3416-
"gimli 0.30.0",
3384+
"gimli 0.31.1",
34173385
"itertools",
34183386
"libc",
34193387
"measureme 12.0.1",
@@ -3527,7 +3495,7 @@ dependencies = [
35273495
"either",
35283496
"elsa",
35293497
"ena",
3530-
"hashbrown 0.15.2",
3498+
"hashbrown",
35313499
"indexmap",
35323500
"jobserver",
35333501
"libc",
@@ -4306,7 +4274,7 @@ dependencies = [
43064274
name = "rustc_query_system"
43074275
version = "0.0.0"
43084276
dependencies = [
4309-
"hashbrown 0.15.2",
4277+
"hashbrown",
43104278
"parking_lot",
43114279
"rustc-rayon-core",
43124280
"rustc_abi",
@@ -5241,12 +5209,12 @@ dependencies = [
52415209

52425210
[[package]]
52435211
name = "thorin-dwp"
5244-
version = "0.8.0"
5212+
version = "0.9.0"
52455213
source = "registry+https://github.com/rust-lang/crates.io-index"
5246-
checksum = "813ba76597db32dc4f6992fd8bf8f394715b88d352fd97401da67dab6283b4c6"
5214+
checksum = "9e9c1e705f82a260173f3eec93f2ff6d7807f23ad5a8cc2e7316a891733ea7a1"
52475215
dependencies = [
5248-
"gimli 0.30.0",
5249-
"hashbrown 0.14.5",
5216+
"gimli 0.31.1",
5217+
"hashbrown",
52505218
"object 0.36.7",
52515219
"tracing",
52525220
]
@@ -5972,7 +5940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
59725940
checksum = "d5a99faceb1a5a84dd6084ec4bfa4b2ab153b5793b43fd8f58b89232634afc35"
59735941
dependencies = [
59745942
"bitflags",
5975-
"hashbrown 0.15.2",
5943+
"hashbrown",
59765944
"indexmap",
59775945
"semver",
59785946
"serde",

‎compiler/rustc_codegen_llvm/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test = false
1111
bitflags = "2.4.1"
1212
# To avoid duplicate dependencies, this should match the version of gimli used
1313
# by `rustc_codegen_ssa` via its `thorin-dwp` dependency.
14-
gimli = "0.30"
14+
gimli = "0.31"
1515
itertools = "0.12"
1616
libc = "0.2"
1717
measureme = "12.0.1"

‎compiler/rustc_codegen_ssa/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ serde_json = "1.0.59"
4242
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
4343
tempfile = "3.2"
4444
thin-vec = "0.2.12"
45-
thorin-dwp = "0.8"
45+
thorin-dwp = "0.9"
4646
tracing = "0.1"
4747
wasm-encoder = "0.219"
4848
# tidy-alphabetical-end

‎src/tools/tidy/src/deps.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ const PERMITTED_DEPS_LOCATION: &str = concat!(file!(), ":", line!());
240240
const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
241241
// tidy-alphabetical-start
242242
"adler2",
243-
"ahash",
244243
"aho-corasick",
245244
"allocator-api2", // FIXME: only appears in Cargo.lock due to https://github.com/rust-lang/cargo/issues/10801
246245
"annotate-snippets",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /