Skip to content

Commit b62511f

Browse files
Rollup merge of #118943 - lqd:update-deps2, r=michaelwoerister
update `measureme` to 10.1.2 to deduplicate `parking_lot` This PR updates `measureme` to the latest release to remove the last duplicates of `parking_lot` 0.11 we had in our dependency tree. ```console Updating measureme v10.1.1 -> v10.1.2 Removing parking_lot v0.11.2 Removing parking_lot_core v0.8.6 ``` Also removes `instant` from the allowed list of dependencies, as it's no longer used. r? `@michaelwoerister` (Thanks for the release in the first place 🙏)
2 parents 9e872b7 + 05b64a8 commit b62511f

File tree

2 files changed

+9
-35
lines changed

2 files changed

+9
-35
lines changed

Diff for: Cargo.lock

+9-34
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ dependencies = [
548548
"futures",
549549
"if_chain",
550550
"itertools",
551-
"parking_lot 0.12.1",
551+
"parking_lot",
552552
"quote",
553553
"regex",
554554
"rustc_tools_util",
@@ -2356,13 +2356,13 @@ dependencies = [
23562356

23572357
[[package]]
23582358
name = "measureme"
2359-
version = "10.1.1"
2359+
version = "10.1.2"
23602360
source = "registry+https://github.com/rust-lang/crates.io-index"
2361-
checksum = "1930d162935fecd56fc4e0f6729eb3483bac1264542eb4ea31570b86a434b6bc"
2361+
checksum = "45e381dcdad44c3c435f8052b08c5c4a1449c48ab56f312345eae12d7a693dbe"
23622362
dependencies = [
23632363
"log",
23642364
"memmap2",
2365-
"parking_lot 0.11.2",
2365+
"parking_lot",
23662366
"perf-event-open-sys",
23672367
"rustc-hash",
23682368
"smallvec",
@@ -2780,39 +2780,14 @@ dependencies = [
27802780
"unicode-width",
27812781
]
27822782

2783-
[[package]]
2784-
name = "parking_lot"
2785-
version = "0.11.2"
2786-
source = "registry+https://github.com/rust-lang/crates.io-index"
2787-
checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
2788-
dependencies = [
2789-
"instant",
2790-
"lock_api",
2791-
"parking_lot_core 0.8.6",
2792-
]
2793-
27942783
[[package]]
27952784
name = "parking_lot"
27962785
version = "0.12.1"
27972786
source = "registry+https://github.com/rust-lang/crates.io-index"
27982787
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
27992788
dependencies = [
28002789
"lock_api",
2801-
"parking_lot_core 0.9.8",
2802-
]
2803-
2804-
[[package]]
2805-
name = "parking_lot_core"
2806-
version = "0.8.6"
2807-
source = "registry+https://github.com/rust-lang/crates.io-index"
2808-
checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
2809-
dependencies = [
2810-
"cfg-if",
2811-
"instant",
2812-
"libc",
2813-
"redox_syscall 0.2.16",
2814-
"smallvec",
2815-
"winapi",
2790+
"parking_lot_core",
28162791
]
28172792

28182793
[[package]]
@@ -3682,7 +3657,7 @@ dependencies = [
36823657
"libc",
36833658
"measureme",
36843659
"memmap2",
3685-
"parking_lot 0.12.1",
3660+
"parking_lot",
36863661
"portable-atomic",
36873662
"rustc-hash",
36883663
"rustc-rayon",
@@ -4417,7 +4392,7 @@ dependencies = [
44174392
name = "rustc_query_system"
44184393
version = "0.0.0"
44194394
dependencies = [
4420-
"parking_lot 0.12.1",
4395+
"parking_lot",
44214396
"rustc-rayon-core",
44224397
"rustc_ast",
44234398
"rustc_data_structures",
@@ -5134,7 +5109,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
51345109
dependencies = [
51355110
"new_debug_unreachable",
51365111
"once_cell",
5137-
"parking_lot 0.12.1",
5112+
"parking_lot",
51385113
"phf_shared",
51395114
"precomputed-hash",
51405115
"serde",
@@ -5659,7 +5634,7 @@ dependencies = [
56595634
"matchers",
56605635
"nu-ansi-term",
56615636
"once_cell",
5662-
"parking_lot 0.12.1",
5637+
"parking_lot",
56635638
"regex",
56645639
"sharded-slab",
56655640
"smallvec",

Diff for: src/tools/tidy/src/deps.rs

-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
254254
"icu_provider_macros",
255255
"ident_case",
256256
"indexmap",
257-
"instant",
258257
"intl-memoizer",
259258
"intl_pluralrules",
260259
"is-terminal",

0 commit comments

Comments
 (0)