remove override for tokio and h2

Cargo.toml

@@ -30,6 +30,5 @@ actix-utils = { path = "actix-utils" }
 actix-router = { path = "router" }
 bytestring = { path = "string" }
 
-# FIXME: remove these overrides
-tokio = { git = "https://github.com/tokio-rs/tokio.git" }
-tokio-util = { git = "https://github.com/tokio-rs/tokio.git" }
+#FIXME: remove override
+http = { git = "https://github.com/fakeshadow/http.git" }

actix-connect/Cargo.toml

@@ -39,8 +39,8 @@ actix-rt = "1.1.1"
 derive_more = "0.99.2"
 either = "1.5.3"
 futures-util = { version = "0.3.4", default-features = false }
-# FIXME: Use release version
-http = { git = "https://github.com/fakeshadow/http.git", optional = true }
+# FIXME: update to 0.3
+http = { version = "0.2.2", optional = true }
 log = "0.4"
 # FIXME: Use release version
 trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns", branch = "main", default-features = false, features = ["tokio-runtime"] }

actix-rt/CHANGES.md

@@ -7,7 +7,7 @@
 * Add `System::attach_to_tokio` method. [#173]
 
 ### Changed
-* Update `tokio` dependency to 0.3.1
+* Update `tokio` dependency to `1`
 * Rename `time` module `delay_for` to `sleep`, `delay_until` to `sleep_until`, `Delay` to `Sleep` to keep inline with tokio.
 * Remove `'static` lifetime requirement for `Runtime::block_on` and `SystemRunner::block_on`. These methods would accept a &Self when calling.
 * Remove `'static` lifetime requirement for `System::run`

actix-utils/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased - 2020-xx-xx
 * Upgrade `pin-project` to `1.0`.
-* Update `bytes` dependency to 0.6.
+* Update `bytes` dependency to `1`.
 
 ## 2.0.0 - 2020-08-23
 * No changes from beta 1.

router/Cargo.toml

@@ -22,8 +22,8 @@ regex = "1.3.1"
 serde = "1.0.104"
 bytestring = "0.1.2"
 log = "0.4.8"
-http = { version = "0.2.0", optional = true }
+http = { version = "0.2.2", optional = true }
 
 [dev-dependencies]
-http = "0.2.0"
+http = "0.2.2"
 serde_derive = "1.0"