let's try blake2s_simd

Cargo.lock

@@ -243,6 +243,12 @@ dependencies = [
  "object 0.32.2",
 ]
 
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https:/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -363,12 +369,14 @@ source = "registry+https:/rust-lang/crates.io-index"
 checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
-name = "blake2"
-version = "0.10.6"
+name = "blake2s_simd"
+version = "1.0.2"
 source = "registry+https:/rust-lang/crates.io-index"
-checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae"
 dependencies = [
- "digest",
+ "arrayref",
+ "arrayvec",
+ "constant_time_eq",
 ]
 
 [[package]]
@@ -857,6 +865,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https:/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
 [[package]]
 name = "core"
 version = "0.0.0"
@@ -1140,7 +1154,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
@@ -3528,9 +3541,9 @@ checksum = "5be1bdc7edf596692617627bbfeaba522131b18e06ca4df2b6b689e3c5d5ce84"
 [[package]]
 name = "rustc-stable-hash"
 version = "0.1.0"
-source = "git+https:/Urgau/rustc-stable-hash.git?rev=5dbe93b#5dbe93b5959372a64f6f7ea60382fe35be55dcb3"
+source = "git+https:/Urgau/rustc-stable-hash.git?rev=4f8c5a9#4f8c5a993536388a22fba12d0be76837dcd52017"
 dependencies = [
- "blake2",
+ "blake2s_simd",
 ]
 
 [[package]]
@@ -5420,12 +5433,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https:/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
 [[package]]
 name = "suggest-tests"
 version = "0.1.0"

compiler/rustc_data_structures/Cargo.toml

@@ -15,7 +15,7 @@ jobserver_crate = { version = "0.1.28", package = "jobserver" }
 measureme = "11"
 rustc-hash = "1.1.0"
 rustc-rayon = { version = "0.5.0", optional = true }
-rustc-stable-hash = { git = "https:/Urgau/rustc-stable-hash.git", rev = "5dbe93b", features = ["blake2", "nightly"] }
+rustc-stable-hash = { git = "https:/Urgau/rustc-stable-hash.git", rev = "4f8c5a9", features = ["blake2", "nightly"] }
 rustc_arena = { path = "../rustc_arena" }
 rustc_graphviz = { path = "../rustc_graphviz" }
 rustc_index = { path = "../rustc_index", package = "rustc_index" }

src/tools/tidy/src/deps.rs

@@ -21,6 +21,7 @@ const LICENSES: &[&str] = &[
  "Apache-2.0",
  "Apache-2.0/MIT",
  "BSD-2-Clause OR Apache-2.0 OR MIT", // zerocopy
+ "CC0-1.0 OR MIT-0 OR Apache-2.0", // contant_time_eq
  "ISC",
  "MIT / Apache-2.0",
  "MIT OR Apache-2.0 OR LGPL-2.1-or-later", // r-efi, r-efi-alloc
@@ -83,6 +84,7 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)
 const EXCEPTIONS: ExceptionList = &[
  // tidy-alphabetical-start
  ("ar_archive_writer", "Apache-2.0 WITH LLVM-exception"), // rustc
+ ("arrayref", "BSD-2-Clause"), // rustc
  ("colored", "MPL-2.0"), // rustfmt
  ("dissimilar", "Apache-2.0"), // rustdoc, rustc_lexer (few tests) via expect-test, (dev deps)
  ("fluent-langneg", "Apache-2.0"), // rustc (fluent translations)
@@ -94,7 +96,6 @@ const EXCEPTIONS: ExceptionList = &[
  ("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0 // cargo/... (because of serde)
  ("self_cell", "Apache-2.0"), // rustc (fluent translations)
  ("snap", "BSD-3-Clause"), // rustc
- ("subtle", "BSD-3-Clause"), // rustc blake2 deps
  ("wasm-encoder", "Apache-2.0 WITH LLVM-exception"), // rustc
  ("wasmparser", "Apache-2.0 WITH LLVM-exception"), // rustc
  // tidy-alphabetical-end
@@ -233,16 +234,18 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
  "annotate-snippets",
  "anstyle",
  "ar_archive_writer",
+ "arrayref",
  "arrayvec",
  "autocfg",
  "bitflags",
- "blake2",
+ "blake2s_simd",
  "block-buffer",
  "byteorder", // via ruzstd in object in thorin-dwp
  "cc",
  "cfg-if",
  "cfg_aliases",
  "compiler_builtins",
+ "constant_time_eq",
  "cpufeatures",
  "crc32fast",
  "crossbeam-channel",
@@ -378,7 +381,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
  "stacker",
  "static_assertions",
  "strsim",
- "subtle",
  "syn",
  "synstructure",
  "tempfile",

src/tools/tidy/src/extdeps.rs

@@ -10,7 +10,7 @@ const ALLOWED_SOURCES: &[&str] = &[
  // This is `rust_team_data` used by `site` in src/tools/rustc-perf,
  r#""git+https:/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
  // WIP Blake2 in rustc-stable-hash
- r#""git+https:/Urgau/rustc-stable-hash.git?rev=5dbe93b#5dbe93b5959372a64f6f7ea60382fe35be55dcb3""#,
+ r#""git+https:/Urgau/rustc-stable-hash.git?rev=4f8c5a9#4f8c5a993536388a22fba12d0be76837dcd52017""#,
 ];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the