From 9fa8d7fc5abb98efc7f0e36f9a4a8c5fc87d92f2 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Mon, 11 Oct 2021 05:12:57 +0100
Subject: [PATCH] avoid dependency on older tokios

---
 .cargo/config.toml       | 1 -
 actix-codec/Cargo.toml   | 2 +-
 actix-rt/Cargo.toml      | 7 +++----
 actix-server/Cargo.toml  | 8 ++++----
 local-channel/Cargo.toml | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 0e5de486..03a995c7 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,4 @@
 [alias]
-chk = "check --workspace --all-features --tests --examples --bins"
 lint = "clippy --workspace --all-features --tests --examples --bins -- -Dclippy::todo"
 
 ci-doctest = "test --workspace --all-features --doc --no-fail-fast -- --nocapture"
diff --git a/actix-codec/Cargo.toml b/actix-codec/Cargo.toml
index 815f1039..7bf1c941 100644
--- a/actix-codec/Cargo.toml
+++ b/actix-codec/Cargo.toml
@@ -20,5 +20,5 @@ futures-core = { version = "0.3.7", default-features = false }
 futures-sink = { version = "0.3.7", default-features = false }
 log = "0.4"
 pin-project-lite = "0.2"
-tokio = "1"
+tokio = "1.5.1"
 tokio-util = { version = "0.6", features = ["codec", "io"] }
diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml
index b466bb76..4b649252 100644
--- a/actix-rt/Cargo.toml
+++ b/actix-rt/Cargo.toml
@@ -8,8 +8,7 @@ authors = [
 description = "Tokio-based single-threaded async runtime for the Actix ecosystem"
 keywords = ["async", "futures", "io", "runtime"]
 homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-net"
-documentation = "https://docs.rs/actix-rt"
+repository = "https://github.com/actix/actix-net.git"
 categories = ["network-programming", "asynchronous"]
 license = "MIT OR Apache-2.0"
 edition = "2018"
@@ -27,11 +26,11 @@ io-uring = ["tokio-uring"]
 actix-macros = { version = "0.2.0", optional = true }
 
 futures-core = { version = "0.3", default-features = false }
-tokio = { version = "1.3", features = ["rt", "net", "parking_lot", "signal", "sync", "time"] }
+tokio = { version = "1.5.1", features = ["rt", "net", "parking_lot", "signal", "sync", "time"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 tokio-uring = { version = "0.1", optional = true }
 
 [dev-dependencies]
-tokio = { version = "1.2", features = ["full"] }
+tokio = { version = "1.5.1", features = ["full"] }
 hyper = { version = "0.14", default-features = false, features = ["server", "tcp", "http1"] }
diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml
index 89e1d4e2..92d5a25b 100755
--- a/actix-server/Cargo.toml
+++ b/actix-server/Cargo.toml
@@ -7,7 +7,7 @@ authors = [
 ]
 description = "General purpose TCP server built for the Actix ecosystem"
 keywords = ["network", "framework", "async", "futures"]
-repository = "https://github.com/actix/actix-net"
+repository = "https://github.com/actix/actix-net.git"
 categories = ["network-programming", "asynchronous"]
 license = "MIT OR Apache-2.0"
 edition = "2018"
@@ -29,13 +29,13 @@ futures-core = { version = "0.3.7", default-features = false, features = ["alloc
 log = "0.4"
 mio = { version = "0.7.6", features = ["os-poll", "net"] }
 num_cpus = "1.13"
-tokio = { version = "1.2", features = ["sync"] }
+tokio = { version = "1.5.1", features = ["sync"] }
 
 [dev-dependencies]
 actix-codec = "0.4.0-beta.1"
 actix-rt = "2.0.0"
 
 bytes = "1"
-env_logger = "0.8"
+env_logger = "0.9"
 futures-util = { version = "0.3.7", default-features = false, features = ["sink"] }
-tokio = { version = "1", features = ["io-util"] }
+tokio = { version = "1.5.1", features = ["io-util"] }
diff --git a/local-channel/Cargo.toml b/local-channel/Cargo.toml
index 0ffd3597..1c20b941 100644
--- a/local-channel/Cargo.toml
+++ b/local-channel/Cargo.toml
@@ -18,4 +18,4 @@ futures-util = { version = "0.3.7", default-features = false }
 local-waker = "0.1"
 
 [dev-dependencies]
-tokio = { version = "1", features = ["rt", "macros"] }
+tokio = { version = "1.5.1", features = ["rt", "macros"] }