berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

remove override for tokio and h2

This commit is contained in:
fakeshadow 2020-12-24 02:58:18 +08:00
parent e1d24dd60d
commit 0b2d2df3c7
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

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

4
actix-connect/Cargo.toml
View File

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

2
actix-rt/CHANGES.md
View File

@ -7,7 +7,7 @@
* Add `System::attach_to_tokio` method. [#173] * Add `System::attach_to_tokio` method. [#173]
### Changed ### 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. * 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 `Runtime::block_on` and `SystemRunner::block_on`. These methods would accept a &Self when calling.
* Remove `'static` lifetime requirement for `System::run` * Remove `'static` lifetime requirement for `System::run`

2
actix-utils/CHANGES.md
View File

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

4
router/Cargo.toml
View File

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