Merged develop onto 0.14 (which was tricky, and this might have introduced bugs?).

This commit is contained in:
Aaron Weiss 2018-09-17 17:50:53 -04:00
parent c69e944033
commit 53fb890a7e
No known key found for this signature in database
GPG key ID: 047D32DF25DC22EF
21 changed files with 425 additions and 367 deletions

View file

@ -14,10 +14,11 @@ travis-ci = { repository = "aatxe/irc" }
[features]
default = ["tokio"]
tokio = ["tokio-io", "bytes"]
tokio = ["tokio-codec", "tokio-io", "bytes"]
[dependencies]
bytes = { version = "0.4", optional = true }
encoding = "0.2"
failure = "0.1"
tokio-codec = { version = "0.1", optional = true }
tokio-io = { version = "0.1", optional = true }