Skip to content

Commit faed860

Browse files
committed
let's try blake2s_simd
1 parent 9b14ce5 commit faed860

File tree

4 files changed

+27
-18
lines changed

4 files changed

+27
-18
lines changed

Cargo.lock

+20-13
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,12 @@ dependencies = [
243243
"object 0.32.2",
244244
]
245245

246+
[[package]]
247+
name = "arrayref"
248+
version = "0.3.7"
249+
source = "registry+https://github.com/rust-lang/crates.io-index"
250+
checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
251+
246252
[[package]]
247253
name = "arrayvec"
248254
version = "0.7.4"
@@ -363,12 +369,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
363369
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
364370

365371
[[package]]
366-
name = "blake2"
367-
version = "0.10.6"
372+
name = "blake2s_simd"
373+
version = "1.0.2"
368374
source = "registry+https://github.com/rust-lang/crates.io-index"
369-
checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
375+
checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae"
370376
dependencies = [
371-
"digest",
377+
"arrayref",
378+
"arrayvec",
379+
"constant_time_eq",
372380
]
373381

374382
[[package]]
@@ -857,6 +865,12 @@ dependencies = [
857865
"windows-sys 0.52.0",
858866
]
859867

868+
[[package]]
869+
name = "constant_time_eq"
870+
version = "0.3.0"
871+
source = "registry+https://github.com/rust-lang/crates.io-index"
872+
checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
873+
860874
[[package]]
861875
name = "core"
862876
version = "0.0.0"
@@ -1140,7 +1154,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
11401154
dependencies = [
11411155
"block-buffer",
11421156
"crypto-common",
1143-
"subtle",
11441157
]
11451158

11461159
[[package]]
@@ -3528,9 +3541,9 @@ checksum = "5be1bdc7edf596692617627bbfeaba522131b18e06ca4df2b6b689e3c5d5ce84"
35283541
[[package]]
35293542
name = "rustc-stable-hash"
35303543
version = "0.1.0"
3531-
source = "git+https://github.com/Urgau/rustc-stable-hash.git?rev=5dbe93b#5dbe93b5959372a64f6f7ea60382fe35be55dcb3"
3544+
source = "git+https://github.com/Urgau/rustc-stable-hash.git?rev=4f8c5a9#4f8c5a993536388a22fba12d0be76837dcd52017"
35323545
dependencies = [
3533-
"blake2",
3546+
"blake2s_simd",
35343547
]
35353548

35363549
[[package]]
@@ -5420,12 +5433,6 @@ dependencies = [
54205433
"syn 1.0.109",
54215434
]
54225435

5423-
[[package]]
5424-
name = "subtle"
5425-
version = "2.6.1"
5426-
source = "registry+https://github.com/rust-lang/crates.io-index"
5427-
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
5428-
54295436
[[package]]
54305437
name = "suggest-tests"
54315438
version = "0.1.0"

compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobserver_crate = { version = "0.1.28", package = "jobserver" }
1515
measureme = "11"
1616
rustc-hash = "1.1.0"
1717
rustc-rayon = { version = "0.5.0", optional = true }
18-
rustc-stable-hash = { git = "https://github.com/Urgau/rustc-stable-hash.git", rev = "5dbe93b", features = ["blake2", "nightly"] }
18+
rustc-stable-hash = { git = "https://github.com/Urgau/rustc-stable-hash.git", rev = "4f8c5a9", features = ["blake2", "nightly"] }
1919
rustc_arena = { path = "../rustc_arena" }
2020
rustc_graphviz = { path = "../rustc_graphviz" }
2121
rustc_index = { path = "../rustc_index", package = "rustc_index" }

src/tools/tidy/src/deps.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const LICENSES: &[&str] = &[
2121
"Apache-2.0",
2222
"Apache-2.0/MIT",
2323
"BSD-2-Clause OR Apache-2.0 OR MIT", // zerocopy
24+
"CC0-1.0 OR MIT-0 OR Apache-2.0", // contant_time_eq
2425
"ISC",
2526
"MIT / Apache-2.0",
2627
"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])>)
8384
const EXCEPTIONS: ExceptionList = &[
8485
// tidy-alphabetical-start
8586
("ar_archive_writer", "Apache-2.0 WITH LLVM-exception"), // rustc
87+
("arrayref", "BSD-2-Clause"), // rustc
8688
("colored", "MPL-2.0"), // rustfmt
8789
("dissimilar", "Apache-2.0"), // rustdoc, rustc_lexer (few tests) via expect-test, (dev deps)
8890
("fluent-langneg", "Apache-2.0"), // rustc (fluent translations)
@@ -94,7 +96,6 @@ const EXCEPTIONS: ExceptionList = &[
9496
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0 // cargo/... (because of serde)
9597
("self_cell", "Apache-2.0"), // rustc (fluent translations)
9698
("snap", "BSD-3-Clause"), // rustc
97-
("subtle", "BSD-3-Clause"), // rustc blake2 deps
9899
("wasm-encoder", "Apache-2.0 WITH LLVM-exception"), // rustc
99100
("wasmparser", "Apache-2.0 WITH LLVM-exception"), // rustc
100101
// tidy-alphabetical-end
@@ -233,16 +234,18 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
233234
"annotate-snippets",
234235
"anstyle",
235236
"ar_archive_writer",
237+
"arrayref",
236238
"arrayvec",
237239
"autocfg",
238240
"bitflags",
239-
"blake2",
241+
"blake2s_simd",
240242
"block-buffer",
241243
"byteorder", // via ruzstd in object in thorin-dwp
242244
"cc",
243245
"cfg-if",
244246
"cfg_aliases",
245247
"compiler_builtins",
248+
"constant_time_eq",
246249
"cpufeatures",
247250
"crc32fast",
248251
"crossbeam-channel",
@@ -378,7 +381,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
378381
"stacker",
379382
"static_assertions",
380383
"strsim",
381-
"subtle",
382384
"syn",
383385
"synstructure",
384386
"tempfile",

src/tools/tidy/src/extdeps.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const ALLOWED_SOURCES: &[&str] = &[
1010
// This is `rust_team_data` used by `site` in src/tools/rustc-perf,
1111
r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
1212
// WIP Blake2 in rustc-stable-hash
13-
r#""git+https://github.com/Urgau/rustc-stable-hash.git?rev=5dbe93b#5dbe93b5959372a64f6f7ea60382fe35be55dcb3""#,
13+
r#""git+https://github.com/Urgau/rustc-stable-hash.git?rev=4f8c5a9#4f8c5a993536388a22fba12d0be76837dcd52017""#,
1414
];
1515

1616
/// Checks for external package sources. `root` is the path to the directory that contains the

0 commit comments

Comments
 (0)