Skip to content

Commit

Permalink
Unrolled build for rust-lang#118943
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#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 🙏)
  • Loading branch information
rust-timer authored Dec 15, 2023
2 parents de686cb + 05b64a8 commit 78342cd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 35 deletions.
43 changes: 9 additions & 34 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ dependencies = [
"futures",
"if_chain",
"itertools",
"parking_lot 0.12.1",
"parking_lot",
"quote",
"regex",
"rustc_tools_util",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -2780,39 +2780,14 @@ 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"
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]]
Expand Down Expand Up @@ -3682,7 +3657,7 @@ dependencies = [
"libc",
"measureme",
"memmap2",
"parking_lot 0.12.1",
"parking_lot",
"portable-atomic",
"rustc-hash",
"rustc-rayon",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -5134,7 +5109,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
dependencies = [
"new_debug_unreachable",
"once_cell",
"parking_lot 0.12.1",
"parking_lot",
"phf_shared",
"precomputed-hash",
"serde",
Expand Down Expand Up @@ -5659,7 +5634,7 @@ dependencies = [
"matchers",
"nu-ansi-term",
"once_cell",
"parking_lot 0.12.1",
"parking_lot",
"regex",
"sharded-slab",
"smallvec",
Expand Down
1 change: 0 additions & 1 deletion src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"icu_provider_macros",
"ident_case",
"indexmap",
"instant",
"intl-memoizer",
"intl_pluralrules",
"is-terminal",
Expand Down

0 comments on commit 78342cd

Please sign in to comment.