Merged develop onto 0.14 (which was tricky, and this might have introduced bugs?).
This commit is contained in:
parent
c69e944033
commit
53fb890a7e
21 changed files with 425 additions and 367 deletions
|
@ -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 }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue