Auto merge of #129533 - Noratrieb:fxhashup, r= · rust-lang/rust@1823acf (original) (raw)

6 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -1242,7 +1242,7 @@ dependencies = [
1242 1242 "fluent-syntax",
1243 1243 "intl-memoizer",
1244 1244 "intl_pluralrules",
1245 -"rustc-hash",
1245 +"rustc-hash 1.1.0",
1246 1246 "self_cell 0.10.3",
1247 1247 "smallvec",
1248 1248 "unic-langid",
@@ -1915,7 +1915,7 @@ dependencies = [
1915 1915 "anyhow",
1916 1916 "clap",
1917 1917 "fs-err",
1918 -"rustc-hash",
1918 +"rustc-hash 2.0.0",
1919 1919 "rustdoc-json-types",
1920 1920 "serde",
1921 1921 "serde_json",
@@ -2184,7 +2184,7 @@ dependencies = [
2184 2184 "memmap2",
2185 2185 "parking_lot",
2186 2186 "perf-event-open-sys",
2187 -"rustc-hash",
2187 +"rustc-hash 1.1.0",
2188 2188 "smallvec",
2189 2189 ]
2190 2190
@@ -2778,7 +2778,7 @@ checksum = "c4e8e505342045d397d0b6674dcb82d6faf5cf40484d30eeb88fc82ef14e903f"
2778 2778 dependencies = [
2779 2779 "datafrog",
2780 2780 "log",
2781 -"rustc-hash",
2781 +"rustc-hash 1.1.0",
2782 2782 ]
2783 2783
2784 2784 [[package]]
@@ -3161,6 +3161,12 @@ version = "1.1.0"
3161 3161 source = "registry+https://github.com/rust-lang/crates.io-index"
3162 3162 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
3163 3163
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 +
3164 3170 [[package]]
3165 3171 name = "rustc-main"
3166 3172 version = "0.0.0"
@@ -3529,7 +3535,7 @@ dependencies = [
3529 3535 "memmap2",
3530 3536 "parking_lot",
3531 3537 "portable-atomic",
3532 -"rustc-hash",
3538 +"rustc-hash 2.0.0",
3533 3539 "rustc-rayon",
3534 3540 "rustc-stable-hash",
3535 3541 "rustc_arena",
@@ -4221,7 +4227,7 @@ dependencies = [
4221 4227 name = "rustc_pattern_analysis"
4222 4228 version = "0.0.0"
4223 4229 dependencies = [
4224 -"rustc-hash",
4230 +"rustc-hash 2.0.0",
4225 4231 "rustc_apfloat",
4226 4232 "rustc_arena",
4227 4233 "rustc_data_structures",
@@ -4613,7 +4619,7 @@ name = "rustdoc-json-types"
4613 4619 version = "0.1.0"
4614 4620 dependencies = [
4615 4621 "bincode",
4616 -"rustc-hash",
4622 +"rustc-hash 2.0.0",
4617 4623 "serde",
4618 4624 "serde_json",
4619 4625 ]
@@ -5267,7 +5273,7 @@ dependencies = [
5267 5273 "ignore",
5268 5274 "miropt-test-tools",
5269 5275 "regex",
5270 -"rustc-hash",
5276 +"rustc-hash 2.0.0",
5271 5277 "semver",
5272 5278 "similar",
5273 5279 "termcolor",
@@ -5496,7 +5502,7 @@ version = "0.5.0"
5496 5502 source = "registry+https://github.com/rust-lang/crates.io-index"
5497 5503 checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
5498 5504 dependencies = [
5499 -"rustc-hash",
5505 +"rustc-hash 1.1.0",
5500 5506 ]
5501 5507
5502 5508 [[package]]
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ ena = "0.14.3"
13 13 indexmap = { version = "2.4.0" }
14 14 jobserver_crate = { version = "0.1.28", package = "jobserver" }
15 15 measureme = "11"
16 -rustc-hash = "1.1.0"
16 +rustc-hash = "2.0.0"
17 17 rustc-rayon = { version = "0.5.0", optional = true }
18 18 rustc-stable-hash = { version = "0.1.0", features = ["nightly"] }
19 19 rustc_arena = { path = "../rustc_arena" }
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ edition = "2021"
5 5
6 6 [dependencies]
7 7 # tidy-alphabetical-start
8 -rustc-hash = "1.1.0"
8 +rustc-hash = "2.0.0"
9 9 rustc_apfloat = "0.2.0"
10 10 rustc_arena = { path = "../rustc_arena", optional = true }
11 11 rustc_data_structures = { path = "../rustc_data_structures", optional = true }
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ path = "lib.rs"
8 8
9 9 [dependencies]
10 10 serde = { version = "1.0", features = ["derive"] }
11 -rustc-hash = "1.1.0"
11 +rustc-hash = "2.0.0"
12 12
13 13 [dev-dependencies]
14 14 serde_json = "1.0"
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ edition = "2021"
9 9 anyhow = "1.0.62"
10 10 clap = { version = "4.0.15", features = ["derive"] }
11 11 fs-err = "2.8.1"
12 -rustc-hash = "1.1.0"
12 +rustc-hash = "2.0.0"
13 13 rustdoc-json-types = { version = "0.1.0", path = "../../rustdoc-json-types" }
14 14 serde = { version = "1.0", features = ["derive"] }
15 15 serde_json = "1.0.85"
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ walkdir = "2"
13 13 ignore = "0.4.18"
14 14 semver = "1.0"
15 15 termcolor = "1.1.3"
16 -rustc-hash = "1.1.0"
16 +rustc-hash = "2.0.0"
17 17 fluent-syntax = "0.11.1"
18 18 similar = "2.5.0"
19 19