diff options
| author | bors <bors@rust-lang.org> | 2022-12-05 05:54:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-05 05:54:33 +0000 |
| commit | e72ea1dc376e9c302c68faefafd967a8a7ef255a (patch) | |
| tree | 8360d1fa23f9256f771a4247687df2693da925f2 /src/tools/tidy | |
| parent | b9341bfdb1dec09b49b1e7d01d7c4db0e2436737 (diff) | |
| parent | ceee880b318457f6dfa861ebd126988facc3362c (diff) | |
| download | rust-e72ea1dc376e9c302c68faefafd967a8a7ef255a.tar.gz rust-e72ea1dc376e9c302c68faefafd967a8a7ef255a.zip | |
Auto merge of #104824 - klensy:bump-some, r=Mark-Simulacrum
deps: update cpufeatures, swap difference to dissimilar
Updating cpufeatures v0.2.1 -> v0.2.5: https://github.com/RustCrypto/utils/blob/master/cpufeatures/CHANGELOG.md#025-2022-09-04, was yanked bc of miscompile (https://github.com/RustCrypto/utils/pull/800, https://github.com/rust-lang/rust/issues/101346)
Removing difference v2.0.0
Adding dissimilar v1.0.4
Updating expect-test v1.0.1 -> v1.4.0
difference unmaintened https://rustsec.org/advisories/RUSTSEC-2020-0095.html, so replaced with https://github.com/dtolnay/dissimilar (as dependency of `expect-test`)
Diffstat (limited to 'src/tools/tidy')
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 510614aa152..ff7a219d9bd 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -49,6 +49,7 @@ const EXCEPTIONS: &[(&str, &str)] = &[ ("dunce", "CC0-1.0"), // cargo (dev dependency) ("similar", "Apache-2.0"), // cargo (dev dependency) ("normalize-line-endings", "Apache-2.0"), // cargo (dev dependency) + ("dissimilar", "Apache-2.0"), // rustdoc, rustc_lexer (few tests) via expect-test, (dev deps) ]; const EXCEPTIONS_CRANELIFT: &[(&str, &str)] = &[ @@ -112,9 +113,9 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "cstr", "datafrog", "derive_more", - "difference", "digest", "displaydoc", + "dissimilar", "dlmalloc", "either", "ena", |