From 3ab60ce76f97028c460ff628b4273b3bead92d96 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Tue, 14 Sep 2021 10:29:52 +0300
Subject: [PATCH] Unify tokio deps and bump cargo resolver version

---
 Cargo.lock              | 5 ++---
 pageserver/Cargo.toml   | 2 +-
 proxy/Cargo.toml        | 2 +-
 walkeeper/Cargo.toml    | 2 +-
 zenith_utils/Cargo.toml | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ca6ae469d8..749dcf43d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2096,9 +2096,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.8.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985"
+checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce"
 dependencies = [
  "autocfg",
  "bytes",
@@ -2107,7 +2107,6 @@ dependencies = [
  "mio",
  "num_cpus",
  "once_cell",
- "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "tokio-macros",
diff --git a/pageserver/Cargo.toml b/pageserver/Cargo.toml
index 936c41ff24..edc9d7c4f6 100644
--- a/pageserver/Cargo.toml
+++ b/pageserver/Cargo.toml
@@ -19,7 +19,7 @@ lazy_static = "1.4.0"
 log = "0.4.14"
 clap = "2.33.0"
 daemonize = "0.4.1"
-tokio = { version = "1.5.0", features = ["full"] }
+tokio = { version = "1.11", features = ["process", "macros"] }
 postgres-types = { git = "https://github.com/zenithdb/rust-postgres.git", rev="9eb0dbfbeb6a6c1b79099b9f7ae4a8c021877858" }
 postgres-protocol = { git = "https://github.com/zenithdb/rust-postgres.git", rev="9eb0dbfbeb6a6c1b79099b9f7ae4a8c021877858" }
 postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="9eb0dbfbeb6a6c1b79099b9f7ae4a8c021877858" }
diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml
index c91a00e76f..078c3d18c7 100644
--- a/proxy/Cargo.toml
+++ b/proxy/Cargo.toml
@@ -14,7 +14,7 @@ rand = "0.8.3"
 hex = "0.4.3"
 serde = "1"
 serde_json = "1"
-tokio = { version = "1.7.1", features = ["full"] }
+tokio = "1.11"
 tokio-postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="9eb0dbfbeb6a6c1b79099b9f7ae4a8c021877858" }
 clap = "2.33.0"
 rustls = "0.19.1"
diff --git a/walkeeper/Cargo.toml b/walkeeper/Cargo.toml
index 20f967ec1b..b28f392e35 100644
--- a/walkeeper/Cargo.toml
+++ b/walkeeper/Cargo.toml
@@ -17,7 +17,7 @@ log = "0.4.14"
 clap = "2.33.0"
 daemonize = "0.4.1"
 rust-s3 = { version = "0.27.0-rc4", features = ["no-verify-ssl"] }
-tokio = { version = "1.3.0", features = ["full"] }
+tokio = "1.11"
 tokio-stream = { version = "0.1.4" }
 postgres-protocol = { git = "https://github.com/zenithdb/rust-postgres.git", rev="9eb0dbfbeb6a6c1b79099b9f7ae4a8c021877858" }
 postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="9eb0dbfbeb6a6c1b79099b9f7ae4a8c021877858" }
diff --git a/zenith_utils/Cargo.toml b/zenith_utils/Cargo.toml
index f6f2dfbc98..f315a473af 100644
--- a/zenith_utils/Cargo.toml
+++ b/zenith_utils/Cargo.toml
@@ -17,7 +17,7 @@ routerify = "2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
 thiserror = "1.0"
-tokio = { version = "1.5.0", features = ["full"] }
+tokio = "1.11"
 
 slog-async = "2.6.0"
 slog-stdlog = "4.1.0"