Skip to content

Commit 1823acf

Browse files
committed
Auto merge of #129533 - Noratrieb:fxhashup, r=<try>
Update rustc-hash to version 2 This brings in the new algorithm. see rust-lang/rustc-hash#37 and #125133
2 parents f167efa + 9f95dcf commit 1823acf

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

Cargo.lock

+15-9
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ dependencies = [
12421242
"fluent-syntax",
12431243
"intl-memoizer",
12441244
"intl_pluralrules",
1245-
"rustc-hash",
1245+
"rustc-hash 1.1.0",
12461246
"self_cell 0.10.3",
12471247
"smallvec",
12481248
"unic-langid",
@@ -1915,7 +1915,7 @@ dependencies = [
19151915
"anyhow",
19161916
"clap",
19171917
"fs-err",
1918-
"rustc-hash",
1918+
"rustc-hash 2.0.0",
19191919
"rustdoc-json-types",
19201920
"serde",
19211921
"serde_json",
@@ -2184,7 +2184,7 @@ dependencies = [
21842184
"memmap2",
21852185
"parking_lot",
21862186
"perf-event-open-sys",
2187-
"rustc-hash",
2187+
"rustc-hash 1.1.0",
21882188
"smallvec",
21892189
]
21902190

@@ -2778,7 +2778,7 @@ checksum = "c4e8e505342045d397d0b6674dcb82d6faf5cf40484d30eeb88fc82ef14e903f"
27782778
dependencies = [
27792779
"datafrog",
27802780
"log",
2781-
"rustc-hash",
2781+
"rustc-hash 1.1.0",
27822782
]
27832783

27842784
[[package]]
@@ -3161,6 +3161,12 @@ version = "1.1.0"
31613161
source = "registry+https://github.com/rust-lang/crates.io-index"
31623162
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
31633163

3164+
[[package]]
3165+
name = "rustc-hash"
3166+
version = "2.0.0"
3167+
source = "registry+https://github.com/rust-lang/crates.io-index"
3168+
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
3169+
31643170
[[package]]
31653171
name = "rustc-main"
31663172
version = "0.0.0"
@@ -3529,7 +3535,7 @@ dependencies = [
35293535
"memmap2",
35303536
"parking_lot",
35313537
"portable-atomic",
3532-
"rustc-hash",
3538+
"rustc-hash 2.0.0",
35333539
"rustc-rayon",
35343540
"rustc-stable-hash",
35353541
"rustc_arena",
@@ -4221,7 +4227,7 @@ dependencies = [
42214227
name = "rustc_pattern_analysis"
42224228
version = "0.0.0"
42234229
dependencies = [
4224-
"rustc-hash",
4230+
"rustc-hash 2.0.0",
42254231
"rustc_apfloat",
42264232
"rustc_arena",
42274233
"rustc_data_structures",
@@ -4613,7 +4619,7 @@ name = "rustdoc-json-types"
46134619
version = "0.1.0"
46144620
dependencies = [
46154621
"bincode",
4616-
"rustc-hash",
4622+
"rustc-hash 2.0.0",
46174623
"serde",
46184624
"serde_json",
46194625
]
@@ -5267,7 +5273,7 @@ dependencies = [
52675273
"ignore",
52685274
"miropt-test-tools",
52695275
"regex",
5270-
"rustc-hash",
5276+
"rustc-hash 2.0.0",
52715277
"semver",
52725278
"similar",
52735279
"termcolor",
@@ -5496,7 +5502,7 @@ version = "0.5.0"
54965502
source = "registry+https://github.com/rust-lang/crates.io-index"
54975503
checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
54985504
dependencies = [
5499-
"rustc-hash",
5505+
"rustc-hash 1.1.0",
55005506
]
55015507

55025508
[[package]]

compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ena = "0.14.3"
1313
indexmap = { version = "2.4.0" }
1414
jobserver_crate = { version = "0.1.28", package = "jobserver" }
1515
measureme = "11"
16-
rustc-hash = "1.1.0"
16+
rustc-hash = "2.0.0"
1717
rustc-rayon = { version = "0.5.0", optional = true }
1818
rustc-stable-hash = { version = "0.1.0", features = ["nightly"] }
1919
rustc_arena = { path = "../rustc_arena" }

compiler/rustc_pattern_analysis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
rustc-hash = "1.1.0"
8+
rustc-hash = "2.0.0"
99
rustc_apfloat = "0.2.0"
1010
rustc_arena = { path = "../rustc_arena", optional = true }
1111
rustc_data_structures = { path = "../rustc_data_structures", optional = true }

src/rustdoc-json-types/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ path = "lib.rs"
88

99
[dependencies]
1010
serde = { version = "1.0", features = ["derive"] }
11-
rustc-hash = "1.1.0"
11+
rustc-hash = "2.0.0"
1212

1313
[dev-dependencies]
1414
serde_json = "1.0"

src/tools/jsondoclint/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition = "2021"
99
anyhow = "1.0.62"
1010
clap = { version = "4.0.15", features = ["derive"] }
1111
fs-err = "2.8.1"
12-
rustc-hash = "1.1.0"
12+
rustc-hash = "2.0.0"
1313
rustdoc-json-types = { version = "0.1.0", path = "../../rustdoc-json-types" }
1414
serde = { version = "1.0", features = ["derive"] }
1515
serde_json = "1.0.85"

src/tools/tidy/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ walkdir = "2"
1313
ignore = "0.4.18"
1414
semver = "1.0"
1515
termcolor = "1.1.3"
16-
rustc-hash = "1.1.0"
16+
rustc-hash = "2.0.0"
1717
fluent-syntax = "0.11.1"
1818
similar = "2.5.0"
1919

0 commit comments

Comments
 (0)