Skip to content

Commit

Permalink
Auto merge of rust-lang#136095 - orlp:rustc-hash-folded-multiply-perf…
Browse files Browse the repository at this point in the history
…, r=<try>

[DO NOT MERGE] perf run for rustc-hash candidate (folded multiply)

See rust-lang/rustc-hash#55.
  • Loading branch information
bors committed Jan 26, 2025
2 parents d9b4598 + 7051d3c commit bf4c342
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 15 deletions.
19 changes: 12 additions & 7 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
]
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
]
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_pattern_analysis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_type_ir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion src/rustdoc-json-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/jsondoclint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion src/tools/rust-analyzer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit bf4c342

Please sign in to comment.