From ceee880b318457f6dfa861ebd126988facc3362c Mon Sep 17 00:00:00 2001 From: klensy Date: Tue, 22 Nov 2022 17:41:06 +0300 Subject: [PATCH] update cpufeatures, swap difference to dissimilar --- Cargo.lock | 22 +++++++++++----------- compiler/rustc_lexer/Cargo.toml | 2 +- src/bootstrap/Cargo.lock | 4 ++-- src/librustdoc/Cargo.toml | 2 +- src/tools/tidy/src/deps.rs | 3 ++- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d43dbc9e06..250c3db4e10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -906,9 +906,9 @@ version = "0.0.0" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] @@ -1085,12 +1085,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "digest" version = "0.10.2" @@ -1162,6 +1156,12 @@ dependencies = [ "syn", ] +[[package]] +name = "dissimilar" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5" + [[package]] name = "dlmalloc" version = "0.2.3" @@ -1283,11 +1283,11 @@ dependencies = [ [[package]] name = "expect-test" -version = "1.0.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb96f3eaa0d4e8769c52dacfd4eb60183b817ed2f176171b3c691d5022b0f2e" +checksum = "1d4661aca38d826eb7c72fe128e4238220616de4c0cc00db7bfc38e2e1364dd3" dependencies = [ - "difference", + "dissimilar", "once_cell", ] diff --git a/compiler/rustc_lexer/Cargo.toml b/compiler/rustc_lexer/Cargo.toml index ad685c2ad19..23294dc2e1b 100644 --- a/compiler/rustc_lexer/Cargo.toml +++ b/compiler/rustc_lexer/Cargo.toml @@ -19,4 +19,4 @@ unicode-xid = "0.2.0" unic-emoji-char = "0.9.0" [dev-dependencies] -expect-test = "1.0" +expect-test = "1.4.0" diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock index fe8a028dfd3..c57a6b86f13 100644 --- a/src/bootstrap/Cargo.lock +++ b/src/bootstrap/Cargo.lock @@ -108,9 +108,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index 1e7b4fe15b6..0271c27b4f5 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -32,7 +32,7 @@ features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] rayon = "1.5.1" [dev-dependencies] -expect-test = "1.0" +expect-test = "1.4.0" [features] jemalloc = [] diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index a7f40167284..08913d736bb 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -48,6 +48,7 @@ ("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)] = &[ @@ -110,9 +111,9 @@ "cstr", "datafrog", "derive_more", - "difference", "digest", "displaydoc", + "dissimilar", "dlmalloc", "either", "ena",