Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jan 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 83 additions & 17 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ dependencies = [
"linkerd-tracing",
"linkerd-transport-header",
"linkerd-transport-metrics",
"parking_lot",
"parking_lot 0.12.0",
"pin-project",
"quickcheck",
"regex",
Expand Down Expand Up @@ -890,7 +890,7 @@ dependencies = [
"linkerd-tonic-watch",
"linkerd-tracing",
"linkerd2-proxy-api",
"parking_lot",
"parking_lot 0.12.0",
"thiserror",
"tokio",
"tokio-test",
Expand Down Expand Up @@ -947,7 +947,7 @@ dependencies = [
"linkerd-meshtls-rustls",
"linkerd-retry",
"linkerd-tracing",
"parking_lot",
"parking_lot 0.12.0",
"pin-project",
"thiserror",
"tokio",
Expand Down Expand Up @@ -986,7 +986,7 @@ dependencies = [
"linkerd-error",
"linkerd-stack",
"linkerd-tracing",
"parking_lot",
"parking_lot 0.12.0",
"tokio",
"tower",
"tracing",
Expand Down Expand Up @@ -1129,7 +1129,7 @@ dependencies = [
"linkerd-http-classify",
"linkerd-metrics",
"linkerd-stack",
"parking_lot",
"parking_lot 0.12.0",
"pin-project",
"tower",
"tracing",
Expand All @@ -1146,7 +1146,7 @@ dependencies = [
"hyper",
"linkerd-error",
"linkerd-tracing",
"parking_lot",
"parking_lot 0.12.0",
"thiserror",
"tokio",
"tracing",
Expand Down Expand Up @@ -1243,7 +1243,7 @@ dependencies = [
"http",
"hyper",
"linkerd-stack",
"parking_lot",
"parking_lot 0.12.0",
"quickcheck",
"tokio",
"tracing",
Expand Down Expand Up @@ -1369,7 +1369,7 @@ dependencies = [
"linkerd-metrics",
"linkerd-stack",
"linkerd2-proxy-api",
"parking_lot",
"parking_lot 0.12.0",
"pin-project",
"thiserror",
"tokio",
Expand Down Expand Up @@ -1406,7 +1406,7 @@ dependencies = [
"linkerd-stack",
"linkerd-tls",
"linkerd2-proxy-api",
"parking_lot",
"parking_lot 0.12.0",
"pin-project",
"prost-types",
"quickcheck",
Expand Down Expand Up @@ -1543,7 +1543,7 @@ name = "linkerd-stack-metrics"
version = "0.1.0"
dependencies = [
"linkerd-metrics",
"parking_lot",
"parking_lot 0.12.0",
"tokio",
"tower",
]
Expand Down Expand Up @@ -1667,7 +1667,7 @@ dependencies = [
"linkerd-io",
"linkerd-metrics",
"linkerd-stack",
"parking_lot",
"parking_lot 0.12.0",
"pin-project",
"tracing",
]
Expand Down Expand Up @@ -1705,9 +1705,9 @@ dependencies = [

[[package]]
name = "lock_api"
version = "0.4.5"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
dependencies = [
"scopeguard",
]
Expand Down Expand Up @@ -1871,7 +1871,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]]
Expand All @@ -1888,6 +1898,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 = "peeking_take_while"
version = "0.1.2"
Expand Down Expand Up @@ -2389,7 +2412,7 @@ dependencies = [
"mio",
"num_cpus",
"once_cell",
"parking_lot",
"parking_lot 0.11.2",
"pin-project-lite",
"signal-hook-registry",
"tokio-macros",
Expand Down Expand Up @@ -2641,7 +2664,7 @@ dependencies = [
"ansi_term",
"lazy_static",
"matchers",
"parking_lot",
"parking_lot 0.11.2",
"regex",
"serde",
"serde_json",
Expand Down Expand Up @@ -2691,7 +2714,7 @@ dependencies = [
"lazy_static",
"log",
"lru-cache",
"parking_lot",
"parking_lot 0.11.2",
"resolv-conf",
"smallvec",
"thiserror",
Expand Down Expand Up @@ -2884,6 +2907,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"
Expand Down
3 changes: 3 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,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]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/inbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ linkerd-http-access-log = { path = "../../http-access-log" }
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 }
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/outbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -37,6 +37,6 @@ linkerd-io = { path = "../../io", features = ["tokio-test"] }
linkerd-meshtls = { path = "../../meshtls", features = ["rustls"] }
linkerd-meshtls-rustls = { path = "../../meshtls/rustls", features = ["test-util"] }
linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
parking_lot = "0.11"
parking_lot = "0.12"
tokio = { version = "1", features = ["time", "macros"] }
tokio-test = "0.4"
2 changes: 1 addition & 1 deletion linkerd/cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http-metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion linkerd/http-retry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/identity-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ linkerd-error = { path = "../../error" }
linkerd-identity = { path = "../../identity" }
linkerd-metrics = { path = "../../metrics" }
linkerd-stack = { path = "../../stack" }
parking_lot = "0.11"
parking_lot = "0.12"
pin-project = "1"
thiserror = "1"
tokio = { version = "1", features = ["time", "sync"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/tap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}
Expand Down
2 changes: 1 addition & 1 deletion linkerd/stack/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion linkerd/transport-metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"