From 7051d3c2cc59c39875849d1f6cc228608aefb16a Mon Sep 17 00:00:00 2001 From: Orson Peters Date: Sun, 26 Jan 2025 15:38:52 +0100 Subject: [PATCH 1/3] [DO NOT MERGE] perf run for rustc-hash candidate (folded multiply) --- Cargo.lock | 19 ++++++++++++------- compiler/rustc_data_structures/Cargo.toml | 2 +- compiler/rustc_pattern_analysis/Cargo.toml | 2 +- compiler/rustc_type_ir/Cargo.toml | 2 +- src/rustdoc-json-types/Cargo.toml | 2 +- src/tools/jsondoclint/Cargo.toml | 2 +- src/tools/rust-analyzer/Cargo.toml | 2 +- .../rust-analyzer/crates/ra-salsa/Cargo.toml | 2 +- src/tools/tidy/Cargo.toml | 2 +- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 979198cece80f..c033ff491684e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1982,7 +1982,7 @@ dependencies = [ "anyhow", "clap", "fs-err", - "rustc-hash 2.1.0", + "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", "rustdoc-json-types", "serde", "serde_json", @@ -3151,7 +3151,7 @@ dependencies = [ "proc-macro2", "quote", "rinja_parser", - "rustc-hash 2.1.0", + "rustc-hash 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "syn 2.0.96", ] @@ -3219,6 +3219,11 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +[[package]] +name = "rustc-hash" +version = "2.1.0" +source = "git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663#3a89863922cb4ba5237a5bef65a9535b3d598663" + [[package]] name = "rustc-main" version = "0.0.0" @@ -3621,7 +3626,7 @@ dependencies = [ "memmap2", "parking_lot", "portable-atomic", - "rustc-hash 2.1.0", + "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", "rustc-rayon", "rustc-stable-hash", "rustc_arena", @@ -4324,7 +4329,7 @@ dependencies = [ name = "rustc_pattern_analysis" version = "0.0.0" dependencies = [ - "rustc-hash 2.1.0", + "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", "rustc_abi", "rustc_apfloat", "rustc_arena", @@ -4647,7 +4652,7 @@ dependencies = [ "bitflags", "derive-where", "indexmap", - "rustc-hash 1.1.0", + "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", "rustc_ast_ir", "rustc_data_structures", "rustc_index", @@ -4720,7 +4725,7 @@ name = "rustdoc-json-types" version = "0.1.0" dependencies = [ "bincode", - "rustc-hash 2.1.0", + "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", "serde", "serde_json", ] @@ -5371,7 +5376,7 @@ dependencies = [ "ignore", "miropt-test-tools", "regex", - "rustc-hash 2.1.0", + "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", "semver", "similar", "termcolor", diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index 889a8299c18f8..28d6f5a371611 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -13,7 +13,7 @@ ena = "0.14.3" indexmap = { version = "2.4.0", features = ["rustc-rayon"] } jobserver_crate = { version = "0.1.28", package = "jobserver" } measureme = "11" -rustc-hash = "2.0.0" +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } rustc-rayon = "0.5.0" rustc-stable-hash = { version = "0.1.0", features = ["nightly"] } rustc_arena = { path = "../rustc_arena" } diff --git a/compiler/rustc_pattern_analysis/Cargo.toml b/compiler/rustc_pattern_analysis/Cargo.toml index 16eea9e4ff90a..80c0b5d4f021f 100644 --- a/compiler/rustc_pattern_analysis/Cargo.toml +++ b/compiler/rustc_pattern_analysis/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] # tidy-alphabetical-start -rustc-hash = "2.0.0" +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } rustc_abi = { path = "../rustc_abi", optional = true } rustc_apfloat = "0.2.0" diff --git a/compiler/rustc_type_ir/Cargo.toml b/compiler/rustc_type_ir/Cargo.toml index 8d97ec728304e..3da62af27af41 100644 --- a/compiler/rustc_type_ir/Cargo.toml +++ b/compiler/rustc_type_ir/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" bitflags = "2.4.1" derive-where = "1.2.7" indexmap = "2.0.0" -rustc-hash = "1.1.0" +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } rustc_ast_ir = { path = "../rustc_ast_ir", default-features = false } rustc_data_structures = { path = "../rustc_data_structures", optional = true } rustc_index = { path = "../rustc_index", default-features = false } diff --git a/src/rustdoc-json-types/Cargo.toml b/src/rustdoc-json-types/Cargo.toml index 14ff1d0881639..aa9cd742a25ac 100644 --- a/src/rustdoc-json-types/Cargo.toml +++ b/src/rustdoc-json-types/Cargo.toml @@ -11,7 +11,7 @@ default = ["rustc-hash"] [dependencies] serde = { version = "1.0", features = ["derive"] } -rustc-hash = { version = "2.0", optional = true } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"], optional=true } [dev-dependencies] serde_json = "1.0" diff --git a/src/tools/jsondoclint/Cargo.toml b/src/tools/jsondoclint/Cargo.toml index cc8ecefd530b4..9cedda6e0b479 100644 --- a/src/tools/jsondoclint/Cargo.toml +++ b/src/tools/jsondoclint/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" anyhow = "1.0.62" clap = { version = "4.0.15", features = ["derive"] } fs-err = "2.8.1" -rustc-hash = "2.0.0" +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } rustdoc-json-types = { version = "0.1.0", path = "../../rustdoc-json-types" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.85" diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml index 1029844cd3ab4..cd6029a0985ea 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -136,7 +136,7 @@ process-wrap = { version = "8.0.2", features = ["std"] } pulldown-cmark-to-cmark = "10.0.4" pulldown-cmark = { version = "0.9.0", default-features = false } rayon = "1.8.0" -rustc-hash = "2.0.0" +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } semver = "1.0.14" serde = { version = "1.0.192" } serde_derive = { version = "1.0.192" } diff --git a/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml b/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml index 57a20be0cadd7..399a754aa0fe6 100644 --- a/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml +++ b/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml @@ -17,7 +17,7 @@ indexmap = "2.1.0" lock_api = "0.4" tracing = "0.1" parking_lot = "0.12.1" -rustc-hash = "2.0.0" +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } smallvec = "1.0.0" oorandom = "11" triomphe.workspace = true diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml index 2f424a482b5bb..8f6e6b02fed4c 100644 --- a/src/tools/tidy/Cargo.toml +++ b/src/tools/tidy/Cargo.toml @@ -13,7 +13,7 @@ walkdir = "2" ignore = "0.4.18" semver = "1.0" termcolor = "1.1.3" -rustc-hash = "2.0.0" +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } fluent-syntax = "0.11.1" similar = "2.5.0" From 3a6da61357aca9fbf7b3017ed9d795cab46b57dd Mon Sep 17 00:00:00 2001 From: Orson Peters Date: Sun, 26 Jan 2025 15:53:14 +0100 Subject: [PATCH 2/3] remove nightly features for apple-to-apples comparison --- compiler/rustc_data_structures/Cargo.toml | 2 +- compiler/rustc_pattern_analysis/Cargo.toml | 2 +- compiler/rustc_type_ir/Cargo.toml | 2 +- src/rustdoc-json-types/Cargo.toml | 2 +- src/tools/jsondoclint/Cargo.toml | 2 +- src/tools/rust-analyzer/Cargo.toml | 2 +- src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml | 2 +- src/tools/tidy/Cargo.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index 28d6f5a371611..a086cf804f6a5 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -13,7 +13,7 @@ ena = "0.14.3" indexmap = { version = "2.4.0", features = ["rustc-rayon"] } jobserver_crate = { version = "0.1.28", package = "jobserver" } measureme = "11" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } rustc-rayon = "0.5.0" rustc-stable-hash = { version = "0.1.0", features = ["nightly"] } rustc_arena = { path = "../rustc_arena" } diff --git a/compiler/rustc_pattern_analysis/Cargo.toml b/compiler/rustc_pattern_analysis/Cargo.toml index 80c0b5d4f021f..020faa4f5dc2b 100644 --- a/compiler/rustc_pattern_analysis/Cargo.toml +++ b/compiler/rustc_pattern_analysis/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] # tidy-alphabetical-start -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } rustc_abi = { path = "../rustc_abi", optional = true } rustc_apfloat = "0.2.0" diff --git a/compiler/rustc_type_ir/Cargo.toml b/compiler/rustc_type_ir/Cargo.toml index 3da62af27af41..a2d3736ba7b27 100644 --- a/compiler/rustc_type_ir/Cargo.toml +++ b/compiler/rustc_type_ir/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" bitflags = "2.4.1" derive-where = "1.2.7" indexmap = "2.0.0" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } rustc_ast_ir = { path = "../rustc_ast_ir", default-features = false } rustc_data_structures = { path = "../rustc_data_structures", optional = true } rustc_index = { path = "../rustc_index", default-features = false } diff --git a/src/rustdoc-json-types/Cargo.toml b/src/rustdoc-json-types/Cargo.toml index aa9cd742a25ac..016c2ebe05e48 100644 --- a/src/rustdoc-json-types/Cargo.toml +++ b/src/rustdoc-json-types/Cargo.toml @@ -11,7 +11,7 @@ default = ["rustc-hash"] [dependencies] serde = { version = "1.0", features = ["derive"] } -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"], optional=true } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", optional=true } [dev-dependencies] serde_json = "1.0" diff --git a/src/tools/jsondoclint/Cargo.toml b/src/tools/jsondoclint/Cargo.toml index 9cedda6e0b479..078c3e1c7c3c4 100644 --- a/src/tools/jsondoclint/Cargo.toml +++ b/src/tools/jsondoclint/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" anyhow = "1.0.62" clap = { version = "4.0.15", features = ["derive"] } fs-err = "2.8.1" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } rustdoc-json-types = { version = "0.1.0", path = "../../rustdoc-json-types" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.85" diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml index cd6029a0985ea..dc280e740d50e 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -136,7 +136,7 @@ process-wrap = { version = "8.0.2", features = ["std"] } pulldown-cmark-to-cmark = "10.0.4" pulldown-cmark = { version = "0.9.0", default-features = false } rayon = "1.8.0" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } semver = "1.0.14" serde = { version = "1.0.192" } serde_derive = { version = "1.0.192" } diff --git a/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml b/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml index 399a754aa0fe6..d708b4eed4a18 100644 --- a/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml +++ b/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml @@ -17,7 +17,7 @@ indexmap = "2.1.0" lock_api = "0.4" tracing = "0.1" parking_lot = "0.12.1" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } smallvec = "1.0.0" oorandom = "11" triomphe.workspace = true diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml index 8f6e6b02fed4c..1dc82f785af6c 100644 --- a/src/tools/tidy/Cargo.toml +++ b/src/tools/tidy/Cargo.toml @@ -13,7 +13,7 @@ walkdir = "2" ignore = "0.4.18" semver = "1.0" termcolor = "1.1.3" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", features = ["nightly"] } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } fluent-syntax = "0.11.1" similar = "2.5.0" From b0fe3f16264ddf3d03c1502a17250dc97de21ea8 Mon Sep 17 00:00:00 2001 From: Orson Peters Date: Sun, 26 Jan 2025 18:08:08 +0100 Subject: [PATCH 3/3] Use version 2.2.0 to work around duplicate version issue. --- Cargo.lock | 18 +++++++++--------- compiler/rustc_data_structures/Cargo.toml | 2 +- compiler/rustc_pattern_analysis/Cargo.toml | 2 +- compiler/rustc_type_ir/Cargo.toml | 2 +- src/rustdoc-json-types/Cargo.toml | 2 +- src/tools/jsondoclint/Cargo.toml | 2 +- src/tools/rust-analyzer/Cargo.toml | 2 +- .../rust-analyzer/crates/ra-salsa/Cargo.toml | 2 +- src/tools/tidy/Cargo.toml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c033ff491684e..038c48eab50ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1982,7 +1982,7 @@ dependencies = [ "anyhow", "clap", "fs-err", - "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", + "rustc-hash 2.2.0", "rustdoc-json-types", "serde", "serde_json", @@ -3151,7 +3151,7 @@ dependencies = [ "proc-macro2", "quote", "rinja_parser", - "rustc-hash 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hash 2.1.0", "serde", "syn 2.0.96", ] @@ -3221,8 +3221,8 @@ checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc-hash" -version = "2.1.0" -source = "git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663#3a89863922cb4ba5237a5bef65a9535b3d598663" +version = "2.2.0" +source = "git+https://github.com/orlp/rustc-hash?rev=2ccde1ec8a948b5463011d3c7363c273fc2bb80e#2ccde1ec8a948b5463011d3c7363c273fc2bb80e" [[package]] name = "rustc-main" @@ -3626,7 +3626,7 @@ dependencies = [ "memmap2", "parking_lot", "portable-atomic", - "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", + "rustc-hash 2.2.0", "rustc-rayon", "rustc-stable-hash", "rustc_arena", @@ -4329,7 +4329,7 @@ dependencies = [ name = "rustc_pattern_analysis" version = "0.0.0" dependencies = [ - "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", + "rustc-hash 2.2.0", "rustc_abi", "rustc_apfloat", "rustc_arena", @@ -4652,7 +4652,7 @@ dependencies = [ "bitflags", "derive-where", "indexmap", - "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", + "rustc-hash 2.2.0", "rustc_ast_ir", "rustc_data_structures", "rustc_index", @@ -4725,7 +4725,7 @@ name = "rustdoc-json-types" version = "0.1.0" dependencies = [ "bincode", - "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", + "rustc-hash 2.2.0", "serde", "serde_json", ] @@ -5376,7 +5376,7 @@ dependencies = [ "ignore", "miropt-test-tools", "regex", - "rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)", + "rustc-hash 2.2.0", "semver", "similar", "termcolor", diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index a086cf804f6a5..b067e5be15d2b 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -13,7 +13,7 @@ ena = "0.14.3" indexmap = { version = "2.4.0", features = ["rustc-rayon"] } jobserver_crate = { version = "0.1.28", package = "jobserver" } measureme = "11" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" } rustc-rayon = "0.5.0" rustc-stable-hash = { version = "0.1.0", features = ["nightly"] } rustc_arena = { path = "../rustc_arena" } diff --git a/compiler/rustc_pattern_analysis/Cargo.toml b/compiler/rustc_pattern_analysis/Cargo.toml index 020faa4f5dc2b..7200e1c74c584 100644 --- a/compiler/rustc_pattern_analysis/Cargo.toml +++ b/compiler/rustc_pattern_analysis/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] # tidy-alphabetical-start -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" } rustc_abi = { path = "../rustc_abi", optional = true } rustc_apfloat = "0.2.0" diff --git a/compiler/rustc_type_ir/Cargo.toml b/compiler/rustc_type_ir/Cargo.toml index a2d3736ba7b27..86ff70083886c 100644 --- a/compiler/rustc_type_ir/Cargo.toml +++ b/compiler/rustc_type_ir/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" bitflags = "2.4.1" derive-where = "1.2.7" indexmap = "2.0.0" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" } rustc_ast_ir = { path = "../rustc_ast_ir", default-features = false } rustc_data_structures = { path = "../rustc_data_structures", optional = true } rustc_index = { path = "../rustc_index", default-features = false } diff --git a/src/rustdoc-json-types/Cargo.toml b/src/rustdoc-json-types/Cargo.toml index 016c2ebe05e48..f518f9c3ab4b8 100644 --- a/src/rustdoc-json-types/Cargo.toml +++ b/src/rustdoc-json-types/Cargo.toml @@ -11,7 +11,7 @@ default = ["rustc-hash"] [dependencies] serde = { version = "1.0", features = ["derive"] } -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", optional=true } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e", optional=true } [dev-dependencies] serde_json = "1.0" diff --git a/src/tools/jsondoclint/Cargo.toml b/src/tools/jsondoclint/Cargo.toml index 078c3e1c7c3c4..18330694ecdb2 100644 --- a/src/tools/jsondoclint/Cargo.toml +++ b/src/tools/jsondoclint/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" anyhow = "1.0.62" clap = { version = "4.0.15", features = ["derive"] } fs-err = "2.8.1" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" } rustdoc-json-types = { version = "0.1.0", path = "../../rustdoc-json-types" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.85" diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml index dc280e740d50e..27877d8ce52fe 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -136,7 +136,7 @@ process-wrap = { version = "8.0.2", features = ["std"] } pulldown-cmark-to-cmark = "10.0.4" pulldown-cmark = { version = "0.9.0", default-features = false } rayon = "1.8.0" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" } semver = "1.0.14" serde = { version = "1.0.192" } serde_derive = { version = "1.0.192" } diff --git a/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml b/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml index d708b4eed4a18..9d4dcef094407 100644 --- a/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml +++ b/src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml @@ -17,7 +17,7 @@ indexmap = "2.1.0" lock_api = "0.4" tracing = "0.1" parking_lot = "0.12.1" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" } smallvec = "1.0.0" oorandom = "11" triomphe.workspace = true diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml index 1dc82f785af6c..b7e7a4635c007 100644 --- a/src/tools/tidy/Cargo.toml +++ b/src/tools/tidy/Cargo.toml @@ -13,7 +13,7 @@ walkdir = "2" ignore = "0.4.18" semver = "1.0" termcolor = "1.1.3" -rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" } +rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" } fluent-syntax = "0.11.1" similar = "2.5.0"