tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-09 00:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'core/master' into new-crate

Browse Source
This commit is contained in:
Carl Lerche
2018-01-26 14:50:41 -08:00
parent a41c0800f9 e140dabed2
commit fd37fb0f17
5 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+3 -3
View File
@@ -19,15 +19,15 @@ appveyor = { repository = "alexcrichton/tokio" }
[dependencies]
bytes = "0.4"
log = "0.4"
mio = "0.6.11"
mio = "0.6.12"
slab = "0.4"
iovec = "0.1"
tokio-io = "0.1"
futures = "0.1.15"
futures = "0.1.16"
[dev-dependencies]
env_logger = { version = "0.4", default-features = false }
flate2 = { version = "0.2", features = ["tokio"] }
flate2 = { version = "1", features = ["tokio"] }
futures-cpupool = "0.1"
http = "0.1"
httparse = "1.0"