diff --git a/Cargo.lock b/Cargo.lock index 584f0baf70..eabf85a8c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -833,7 +833,7 @@ dependencies = [ "linkerd-tracing", "linkerd-transport-header", "linkerd-transport-metrics", - "parking_lot 0.12.0", + "parking_lot", "pin-project", "quickcheck", "regex", @@ -884,7 +884,7 @@ dependencies = [ "linkerd-tonic-watch", "linkerd-tracing", "linkerd2-proxy-api", - "parking_lot 0.12.0", + "parking_lot", "thiserror", "tokio", "tokio-test", @@ -911,7 +911,7 @@ dependencies = [ "linkerd-metrics", "linkerd-tracing", "linkerd2-proxy-api", - "parking_lot 0.12.0", + "parking_lot", "regex", "rustls-pemfile", "socket2", @@ -942,7 +942,7 @@ dependencies = [ "linkerd-meshtls-rustls", "linkerd-retry", "linkerd-tracing", - "parking_lot 0.12.0", + "parking_lot", "pin-project", "thiserror", "tokio", @@ -963,7 +963,7 @@ dependencies = [ "linkerd-app-core", "linkerd-identity", "linkerd-io", - "parking_lot 0.12.0", + "parking_lot", "regex", "thiserror", "tokio", @@ -982,7 +982,7 @@ dependencies = [ "linkerd-error", "linkerd-stack", "linkerd-tracing", - "parking_lot 0.12.0", + "parking_lot", "tokio", "tower", "tracing", @@ -1126,7 +1126,7 @@ dependencies = [ "linkerd-http-classify", "linkerd-metrics", "linkerd-stack", - "parking_lot 0.12.0", + "parking_lot", "pin-project", "tokio", "tower", @@ -1144,7 +1144,7 @@ dependencies = [ "hyper", "linkerd-error", "linkerd-tracing", - "parking_lot 0.12.0", + "parking_lot", "thiserror", "tokio", "tracing", @@ -1241,7 +1241,7 @@ dependencies = [ "http", "hyper", "linkerd-stack", - "parking_lot 0.12.0", + "parking_lot", "quickcheck", "tokio", "tracing", @@ -1367,7 +1367,7 @@ dependencies = [ "linkerd-metrics", "linkerd-stack", "linkerd2-proxy-api", - "parking_lot 0.12.0", + "parking_lot", "pin-project", "thiserror", "tokio", @@ -1404,7 +1404,7 @@ dependencies = [ "linkerd-stack", "linkerd-tls", "linkerd2-proxy-api", - "parking_lot 0.12.0", + "parking_lot", "pin-project", "prost-types", "quickcheck", @@ -1527,7 +1527,7 @@ dependencies = [ "futures", "linkerd-error", "linkerd-tracing", - "parking_lot 0.12.0", + "parking_lot", "pin-project", "thiserror", "tokio", @@ -1542,7 +1542,7 @@ name = "linkerd-stack-metrics" version = "0.1.0" dependencies = [ "linkerd-metrics", - "parking_lot 0.12.0", + "parking_lot", "tokio", "tower", ] @@ -1666,7 +1666,7 @@ dependencies = [ "linkerd-io", "linkerd-metrics", "linkerd-stack", - "parking_lot 0.12.0", + "parking_lot", "pin-project", "tokio", "tracing", @@ -1863,17 +1863,6 @@ dependencies = [ "tonic-build", ] -[[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.5", -] - [[package]] name = "parking_lot" version = "0.12.0" @@ -1881,21 +1870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core 0.9.0", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -2391,7 +2366,7 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot 0.12.0", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -2651,14 +2626,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa" +checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" dependencies = [ "ansi_term", "lazy_static", "matchers", - "parking_lot 0.11.2", + "parking_lot", "regex", "serde", "serde_json", @@ -2708,7 +2683,7 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "parking_lot 0.12.0", + "parking_lot", "resolv-conf", "smallvec", "thiserror",