build(deps): bump parking_lot from 0.11.2 to 0.12.0 (#1452)

Bumps [parking_lot](https://github.com/Amanieu/parking_lot) from 0.11.2 to 0.12.0. - [Release notes](https://github.com/Amanieu/parking_lot/releases) - [Changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md) - [Commits](Amanieu/parking_lot@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] <support@github.com> Signed-off-by: Oliver Gould <ver@buoyant.io> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oliver Gould <ver@buoyant.io> (cherry picked from commit d9dbdec) Signed-off-by: Oliver Gould <ver@buoyant.io>
linkerd · Mar 30, 2022 · e36c8ba · e36c8ba
1 parent 874d5b7
commit e36c8ba
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -712,7 +712,7 @@ dependencies = [
  "linkerd-tracing",
  "linkerd-transport-header",
  "linkerd-transport-metrics",
- "parking_lot",
+ "parking_lot 0.12.0",
  "pin-project",
  "quickcheck",
  "regex",
@@ -760,7 +760,7 @@ dependencies = [
  "linkerd-tonic-watch",
  "linkerd-tracing",
  "linkerd2-proxy-api",
- "parking_lot",
+ "parking_lot 0.12.0",
  "thiserror",
  "tokio",
  "tokio-test",
@@ -814,7 +814,7 @@ dependencies = [
  "linkerd-io",
  "linkerd-retry",
  "linkerd-tracing",
- "parking_lot",
+ "parking_lot 0.12.0",
  "pin-project",
  "thiserror",
  "tokio",
@@ -853,7 +853,7 @@ dependencies = [
  "linkerd-error",
  "linkerd-stack",
  "linkerd-tracing",
- "parking_lot",
+ "parking_lot 0.12.0",
  "tokio",
  "tower",
  "tracing",
@@ -980,7 +980,7 @@ dependencies = [
  "linkerd-http-classify",
  "linkerd-metrics",
  "linkerd-stack",
- "parking_lot",
+ "parking_lot 0.12.0",
  "pin-project",
  "tower",
  "tracing",
@@ -997,7 +997,7 @@ dependencies = [
  "hyper",
  "linkerd-error",
  "linkerd-tracing",
- "parking_lot",
+ "parking_lot 0.12.0",
  "thiserror",
  "tokio",
  "tracing",
@@ -1040,7 +1040,7 @@ dependencies = [
  "http",
  "hyper",
  "linkerd-stack",
- "parking_lot",
+ "parking_lot 0.12.0",
  "quickcheck",
  "tokio",
  "tracing",
@@ -1203,7 +1203,7 @@ dependencies = [
  "linkerd-stack",
  "linkerd-tls",
  "linkerd2-proxy-api",
- "parking_lot",
+ "parking_lot 0.12.0",
  "pin-project",
  "prost-types",
  "quickcheck",
@@ -1340,7 +1340,7 @@ name = "linkerd-stack-metrics"
 version = "0.1.0"
 dependencies = [
  "linkerd-metrics",
- "parking_lot",
+ "parking_lot 0.12.0",
  "tokio",
  "tower",
 ]
@@ -1462,7 +1462,7 @@ dependencies = [
  "linkerd-io",
  "linkerd-metrics",
  "linkerd-stack",
- "parking_lot",
+ "parking_lot 0.12.0",
  "pin-project",
  "tracing",
 ]
@@ -1648,7 +1648,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.5",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.0",
 ]
 
 [[package]]
@@ -1665,6 +1675,19 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2f4f894f3865f6c0e02810fc597300f34dc2510f66400da262d8ae10e75767d"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
@@ -2140,7 +2163,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "once_cell",
- "parking_lot",
+ "parking_lot 0.11.2",
  "pin-project-lite",
  "signal-hook-registry",
  "tokio-macros",
@@ -2381,7 +2404,7 @@ dependencies = [
  "ansi_term",
  "lazy_static",
  "matchers",
- "parking_lot",
+ "parking_lot 0.11.2",
  "regex",
  "serde",
  "serde_json",
@@ -2431,7 +2454,7 @@ dependencies = [
  "lazy_static",
  "log",
  "lru-cache",
- "parking_lot",
+ "parking_lot 0.11.2",
  "resolv-conf",
  "smallvec",
  "thiserror",
@@ -2618,6 +2641,49 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ceb069ac8b2117d36924190469735767f0990833935ab430155e71a44bafe148"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561"
+
 [[package]]
 name = "winreg"
 version = "0.6.2"

diff --git a/deny.toml b/deny.toml
@@ -50,6 +50,9 @@ deny = [
 skip = [
     # Waiting on a hyper release that updates itoa to v1.
     { name = "itoa", version = "0.4" },
+    # Waiting on a tokio release that updates parking_lot to v0.12.
+    { name = "parking_lot", version = "0.11" },
+    { name = "parking_lot_core", version = "0.8" },
 ]
 skip-tree = [
     # Hasn't seen a new release since 2017. Pulls in an older version of nom.

diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -63,7 +63,7 @@ tokio = { version = "1", features = ["macros", "sync", "parking_lot"]}
 tokio-stream = { version = "0.1.8", features = ["time"] }
 tonic = { version = "0.6", default-features = false, features = ["prost"] }
 tracing = "0.1.29"
-parking_lot = "0.11"
+parking_lot = "0.12"
 pin-project = "1"
 
 [dependencies.tower]

diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -17,7 +17,7 @@ linkerd-app-core = { path = "../core" }
 linkerd-server-policy = { path = "../../server-policy" }
 linkerd-tonic-watch = { path = "../../tonic-watch" }
 linkerd2-proxy-api = { version = "0.3", features = ["client", "inbound"] }
-parking_lot = "0.11"
+parking_lot = "0.12"
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tonic = { version = "0.6", default-features = false }

diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -23,7 +23,7 @@ linkerd-http-classify = { path = "../../http-classify" }
 linkerd-http-retry = { path = "../../http-retry" }
 linkerd-identity = { path = "../../identity" }
 linkerd-retry = { path = "../../retry" }
-parking_lot = "0.11"
+parking_lot = "0.12"
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tower = { version = "0.4.11", features = ["util"] }
@@ -34,6 +34,7 @@ pin-project = "1"
 hyper = { version = "0.14.16", features = ["http1", "http2"] }
 linkerd-app-test = { path = "../test" }
 linkerd-io = { path = "../../io", features = ["tokio-test"] }
-tokio = { version = "1", features = ["full", "macros"] }
-tokio-test = "0.4"
 linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
+parking_lot = "0.12"
+tokio = { version = "1", features = ["time", "macros"] }
+tokio-test = "0.4"
diff --git a/linkerd/cache/Cargo.toml b/linkerd/cache/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
-parking_lot = "0.11"
+parking_lot = "0.12"
 tokio = { version = "1", default-features = false, features = ["macros", "rt", "sync", "time"] }
 tower = { version = "0.4.11", default-features = false, features = ["util"] }
 tracing = "0.1.29"

diff --git a/linkerd/http-metrics/Cargo.toml b/linkerd/http-metrics/Cargo.toml
@@ -16,7 +16,7 @@ linkerd-error = { path = "../error" }
 linkerd-http-classify = { path = "../http-classify" }
 linkerd-metrics = { path = "../metrics", features = ["linkerd-stack"] }
 linkerd-stack = { path = "../stack" }
-parking_lot = "0.11"
+parking_lot = "0.12"
 pin-project = "1"
 tower = "0.4.11"
 tracing = "0.1.29"
diff --git a/linkerd/http-retry/Cargo.toml b/linkerd/http-retry/Cargo.toml
@@ -12,7 +12,7 @@ futures = { version = "0.3", default-features = false }
 http-body = "0.4"
 http = "0.2"
 linkerd-error = { path = "../error" }
-parking_lot = "0.11"
+parking_lot = "0.12"
 tracing = "0.1.29"
 thiserror = "1"
 

diff --git a/linkerd/metrics/Cargo.toml b/linkerd/metrics/Cargo.toml
@@ -17,7 +17,7 @@ hdrhistogram = { version = "7.4", default-features = false, optional = true }
 http = "0.2"
 hyper = { version = "0.14.16", features = ["http1", "http2"] }
 linkerd-stack = { path = "../stack", optional = true }
-parking_lot = "0.11"
+parking_lot = "0.12"
 tokio = { version = "1", features = ["time"], optional = true }
 tracing = "0.1.29"
 

diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml
@@ -22,7 +22,7 @@ linkerd-io = { path = "../../io" }
 linkerd-proxy-http = { path = "../http" }
 linkerd-stack = { path = "../../stack" }
 linkerd-tls = { path = "../../tls" }
-parking_lot = "0.11"
+parking_lot = "0.12"
 rand = { version = "0.8" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["time"]}

diff --git a/linkerd/stack/metrics/Cargo.toml b/linkerd/stack/metrics/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 
 [dependencies]
 linkerd-metrics = { path = "../../metrics" }
-parking_lot = "0.11"
+parking_lot = "0.12"
 tower = { version = "0.4.11", default-features = false }
 tokio = { version = "1", features = ["time"] }
diff --git a/linkerd/transport-metrics/Cargo.toml b/linkerd/transport-metrics/Cargo.toml
@@ -13,6 +13,6 @@ linkerd-errno = { path = "../errno" }
 linkerd-io = { path = "../io" }
 linkerd-metrics = { path = "../metrics" }
 linkerd-stack = { path = "../stack" }
-parking_lot = "0.11"
+parking_lot = "0.12"
 pin-project = "1"
 tracing = "0.1.29"