From 9c310b6d4ed2d0424cafeaf8e012d2bc537a8e4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 08:19:13 -0400 Subject: [PATCH] build(deps): bump parking_lot from 0.11.2 to 0.12.0 (#30199) * build(deps): bump parking_lot from 0.11.2 to 0.12.0 Bumps [parking_lot](https://github.com/Amanieu/parking_lot) from 0.11.2 to 0.12.0. - [Changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md) - [Commits](https://github.com/Amanieu/parking_lot/compare/0.11.2...0.12.0) --- updated-dependencies: - dependency-name: parking_lot dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Upgrade parking-log in style and layout_thread* as well --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martin Robinson --- Cargo.lock | 53 +++++++----------------- Cargo.toml | 2 +- components/layout_thread/Cargo.toml | 2 +- components/layout_thread_2020/Cargo.toml | 2 +- components/style/Cargo.toml | 2 +- servo-tidy.toml | 2 - 6 files changed, 18 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df1e2e55877..876215a9010 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,7 +185,7 @@ dependencies = [ "objc-foundation", "objc_id", "once_cell", - "parking_lot 0.12.0", + "parking_lot", "thiserror", "winapi", "x11rb", @@ -1661,7 +1661,7 @@ dependencies = [ "emath", "log", "nohash-hasher", - "parking_lot 0.12.0", + "parking_lot", ] [[package]] @@ -3086,7 +3086,7 @@ dependencies = [ "msg", "net_traits", "num-traits", - "parking_lot 0.11.2", + "parking_lot", "profile_traits", "range", "rayon", @@ -3132,7 +3132,7 @@ dependencies = [ "mitochondria", "msg", "net_traits", - "parking_lot 0.11.2", + "parking_lot", "quickcheck", "range", "rayon", @@ -3174,7 +3174,7 @@ dependencies = [ "metrics", "msg", "net_traits", - "parking_lot 0.11.2", + "parking_lot", "profile_traits", "range", "rayon", @@ -3218,7 +3218,7 @@ dependencies = [ "metrics", "msg", "net_traits", - "parking_lot 0.11.2", + "parking_lot", "profile_traits", "range", "script", @@ -3804,7 +3804,7 @@ dependencies = [ "lazy_static", "malloc_size_of", "malloc_size_of_derive", - "parking_lot 0.11.2", + "parking_lot", "serde", "size_of_test", "webrender_api", @@ -4272,17 +4272,6 @@ dependencies = [ "stable_deref_trait", ] -[[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.0" @@ -4290,21 +4279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.13", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -5022,7 +4997,7 @@ dependencies = [ "msg", "net_traits", "num-traits", - "parking_lot 0.11.2", + "parking_lot", "percent-encoding", "phf", "phf_codegen", @@ -5086,7 +5061,7 @@ dependencies = [ "metrics", "msg", "net_traits", - "parking_lot 0.11.2", + "parking_lot", "profile_traits", "range", "script_traits", @@ -5881,7 +5856,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.0", + "parking_lot", "phf_shared", "precomputed-hash", "serde", @@ -5936,7 +5911,7 @@ dependencies = [ "num-traits", "num_cpus", "owning_ref", - "parking_lot 0.11.2", + "parking_lot", "precomputed-hash", "rayon", "regex", @@ -7080,7 +7055,7 @@ dependencies = [ "codespan-reporting", "log", "naga", - "parking_lot 0.12.0", + "parking_lot", "profiling", "ron 0.8.0", "rustc-hash", @@ -7116,7 +7091,7 @@ dependencies = [ "metal 0.26.0", "naga", "objc", - "parking_lot 0.12.0", + "parking_lot", "profiling", "range-alloc", "raw-window-handle", diff --git a/Cargo.toml b/Cargo.toml index 6fb51ece961..4bf050387a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ mime_guess = "2.0.3" mitochondria = "1.1.2" mozangle = "0.3" num-traits = "0.2" -parking_lot = "0.11" +parking_lot = "0.12" percent-encoding = "2.0" proc-macro2 = "1" quote = "1" diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 52a5f7919ef..459e871c4a2 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -32,7 +32,7 @@ malloc_size_of = { path = "../malloc_size_of" } metrics = { path = "../metrics" } msg = { path = "../msg" } net_traits = { path = "../net_traits" } -parking_lot = { version = "0.11" } +parking_lot = { workspace = true } profile_traits = { path = "../profile_traits" } range = { path = "../range" } rayon = { workspace = true } diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml index e88a258858c..b437b0dbbff 100644 --- a/components/layout_thread_2020/Cargo.toml +++ b/components/layout_thread_2020/Cargo.toml @@ -31,7 +31,7 @@ malloc_size_of = { path = "../malloc_size_of" } metrics = { path = "../metrics" } msg = { path = "../msg" } net_traits = { path = "../net_traits" } -parking_lot = { version = "0.11" } +parking_lot = { workspace = true } profile_traits = { path = "../profile_traits" } range = { path = "../range" } script = { path = "../script" } diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 483027736ef..e5b9640b430 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -61,7 +61,7 @@ num-integer = "0.1" num-traits = "0.2" num_cpus = { version = "1.1.0", optional = true } owning_ref = "0.4" -parking_lot = "0.11" +parking_lot = "0.12" precomputed-hash = "0.1.1" rayon = "1" selectors = { path = "../selectors", features = ["shmem"] } diff --git a/servo-tidy.toml b/servo-tidy.toml index eab2152824d..84ee23504f1 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -27,8 +27,6 @@ packages = [ "itoa", "libloading", "num-rational", - "parking_lot", - "parking_lot_core", "redox_syscall", "ron", "time",