From 4484f3742f0a43668b39c4f2f5251fda56fbe087 Mon Sep 17 00:00:00 2001 From: Orson Peters Date: Wed, 15 May 2024 00:56:36 +0200 Subject: [PATCH 1/2] [DO NOT MERGE] perf run for rustc-hash candidate --- Cargo.lock | 3 +-- Cargo.toml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df4e4f326135e..8bb26f6d35008 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3449,8 +3449,7 @@ dependencies = [ [[package]] name = "rustc-hash" version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +source = "git+https://github.com/orlp/rustc-hash/?branch=faster-hash#d5b36344139e1271104307686bb2f59c2cc4f46b" [[package]] name = "rustc-main" diff --git a/Cargo.toml b/Cargo.toml index a601ebf4369e0..16bba42b98386 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -111,3 +111,4 @@ strip = true rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' } rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' } rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' } +rustc-hash = { git = "https://github.com/orlp/rustc-hash/", branch = "faster-hash", features = ["nightly"] } From f4b59b1a13545dd4e43d03d2d923ca7cd4ab3ba3 Mon Sep 17 00:00:00 2001 From: Orson Peters Date: Wed, 15 May 2024 05:38:52 +0200 Subject: [PATCH 2/2] Enable nightly features. --- Cargo.toml | 2 +- compiler/rustc_data_structures/Cargo.toml | 2 +- compiler/rustc_pattern_analysis/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/salsa/Cargo.toml | 2 +- src/tools/tidy/Cargo.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 16bba42b98386..3a939cab7260e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -111,4 +111,4 @@ strip = true rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' } rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' } rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' } -rustc-hash = { git = "https://github.com/orlp/rustc-hash/", branch = "faster-hash", features = ["nightly"] } +rustc-hash = { git = "https://github.com/orlp/rustc-hash/", branch = "faster-hash" } diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index 2b61e17efa28d..8d9d82d50a246 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -14,7 +14,7 @@ indexmap = { version = "2.0.0" } jobserver_crate = { version = "0.1.28", package = "jobserver" } libc = "0.2" measureme = "11" -rustc-hash = "1.1.0" +rustc-hash = { version = "1.1.0", features = ["nightly"] } rustc-rayon = { version = "0.5.0", optional = true } rustc-rayon-core = { version = "0.5.0", optional = true } rustc_arena = { path = "../rustc_arena" } diff --git a/compiler/rustc_pattern_analysis/Cargo.toml b/compiler/rustc_pattern_analysis/Cargo.toml index 0cb47e03441ba..0414a9acc817c 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 = "1.1.0" +rustc-hash = { version = "1.1.0", features = ["nightly"] } rustc_apfloat = "0.2.0" rustc_arena = { path = "../rustc_arena", optional = true } rustc_data_structures = { path = "../rustc_data_structures", optional = true } diff --git a/src/rustdoc-json-types/Cargo.toml b/src/rustdoc-json-types/Cargo.toml index d3548036d4c72..14d5c27024f8c 100644 --- a/src/rustdoc-json-types/Cargo.toml +++ b/src/rustdoc-json-types/Cargo.toml @@ -8,7 +8,7 @@ path = "lib.rs" [dependencies] serde = { version = "1.0", features = ["derive"] } -rustc-hash = "1.1.0" +rustc-hash = { version = "1.1.0", features = ["nightly"] } [dev-dependencies] serde_json = "1.0" diff --git a/src/tools/jsondoclint/Cargo.toml b/src/tools/jsondoclint/Cargo.toml index 1318a1f447620..486138beba67f 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 = "1.1.0" +rustc-hash = { version = "1.1.0", 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 f7e3ae51dfd00..de6cf4609fcda 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -135,7 +135,7 @@ object = { version = "0.33.0", default-features = false, features = [ pulldown-cmark-to-cmark = "10.0.4" pulldown-cmark = { version = "0.9.0", default-features = false } rayon = "1.8.0" -rustc-hash = "1.1.0" +rustc-hash = { version = "1.1.0", features = ["nightly"] } semver = "1.0.14" serde = { version = "1.0.192", features = ["derive"] } serde_json = "1.0.108" diff --git a/src/tools/rust-analyzer/crates/salsa/Cargo.toml b/src/tools/rust-analyzer/crates/salsa/Cargo.toml index 0d3e1197b5c67..7e17a91a311bd 100644 --- a/src/tools/rust-analyzer/crates/salsa/Cargo.toml +++ b/src/tools/rust-analyzer/crates/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 = "1.0" +rustc-hash = { version = "1.1.0", features = ["nightly"] } smallvec = "1.0.0" oorandom = "11" triomphe = "0.1.11" diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml index 63963b0bd1ced..45a601838d839 100644 --- a/src/tools/tidy/Cargo.toml +++ b/src/tools/tidy/Cargo.toml @@ -12,7 +12,7 @@ walkdir = "2" ignore = "0.4.18" semver = "1.0" termcolor = "1.1.3" -rustc-hash = "1.1.0" +rustc-hash = { version = "1.1.0", features = ["nightly"] } [[bin]] name = "rust-tidy"