From 4cb2a281cbf7e56f54c0c5864c9c290c22ab1e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Rakic?= <remy.rakic+github@gmail.com>
Date: Thu, 14 Dec 2023 15:40:50 +0000
Subject: [PATCH 1/2] update measureme to 10.1.2 to deduplicate parking_lot
---
Cargo.lock | 43 +++++++++----------------------------------
1 file changed, 9 insertions(+), 34 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index a5bdc14fe998c..98c030b3996a8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -548,7 +548,7 @@ dependencies = [
"futures",
"if_chain",
"itertools",
- "parking_lot 0.12.1",
+ "parking_lot",
"quote",
"regex",
"rustc_tools_util",
@@ -2356,13 +2356,13 @@ dependencies = [
[[package]]
name = "measureme"
-version = "10.1.1"
+version = "10.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1930d162935fecd56fc4e0f6729eb3483bac1264542eb4ea31570b86a434b6bc"
+checksum = "45e381dcdad44c3c435f8052b08c5c4a1449c48ab56f312345eae12d7a693dbe"
dependencies = [
"log",
"memmap2",
- "parking_lot 0.11.2",
+ "parking_lot",
"perf-event-open-sys",
"rustc-hash",
"smallvec",
@@ -2780,17 +2780,6 @@ dependencies = [
"unicode-width",
]
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
[[package]]
name = "parking_lot"
version = "0.12.1"
@@ -2798,21 +2787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.8",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
+ "parking_lot_core",
]
[[package]]
@@ -3682,7 +3657,7 @@ dependencies = [
"libc",
"measureme",
"memmap2",
- "parking_lot 0.12.1",
+ "parking_lot",
"portable-atomic",
"rustc-hash",
"rustc-rayon",
@@ -4417,7 +4392,7 @@ dependencies = [
name = "rustc_query_system"
version = "0.0.0"
dependencies = [
- "parking_lot 0.12.1",
+ "parking_lot",
"rustc-rayon-core",
"rustc_ast",
"rustc_data_structures",
@@ -5134,7 +5109,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
dependencies = [
"new_debug_unreachable",
"once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
"phf_shared",
"precomputed-hash",
"serde",
@@ -5659,7 +5634,7 @@ dependencies = [
"matchers",
"nu-ansi-term",
"once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
"regex",
"sharded-slab",
"smallvec",
From 05b64a84a3cd85bf0b8ab4fcb1dc2b34fea521d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Rakic?= <remy.rakic+github@gmail.com>
Date: Thu, 14 Dec 2023 16:05:46 +0000
Subject: [PATCH 2/2] remove `instant` from allowed dependencies
---
src/tools/tidy/src/deps.rs | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 2081d1b3b075b..3bfe811b58e6d 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -254,7 +254,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"icu_provider_macros",
"ident_case",
"indexmap",
- "instant",
"intl-memoizer",
"intl_pluralrules",
"is-terminal",