DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature-proxy

Browse source
This commit is contained in:
Aaron Weiss 2020-03-06 19:56:36 -05:00 committed by GitHub
commit aa329c019a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -43,8 +43,8 @@ log = "0.4"
native-tls = "0.2"
serde = { version = "1.0", features = ["derive"], optional = true }
serde_derive = { version = "1.0", optional = true }
tokio = { version = "0.2.4", features = ["time", "net", "stream", "macros", "stream"] }
tokio-util = { version = "0.2.0", features = ["codec"] }
tokio = { version = "0.2.4", features = ["time", "net", "stream", "macros"] }
tokio-util = { version = "0.3.0", features = ["codec"] }
tokio-socks = { version = "0.2.0", optional = true }
tokio-tls = "0.3.0"
serde_json = { version = "1.0", optional = true }

11
irc-proto/Cargo.toml
View file

@ -14,11 +14,12 @@ edition = "2018"
travis-ci = { repository = "aatxe/irc" }
[features]
default = ["tokio", "tokio-util", "bytes"]
default = ["bytes", "tokio", "tokio-util"]
[dependencies]
bytes = { version = "0.5", optional = true }
encoding = "0.2"
thiserror = "1.0.2"
tokio-util = { version = "0.2.0", features = ["codec"], optional = true }
encoding = "0.2.0"
thiserror = "1.0.0"
bytes = { version = "0.5.0", optional = true }
tokio = { version = "0.2.0", optional = true }
tokio-util = { version = "0.3.0", features = ["codec"], optional = true }

3
irc-proto/src/irc.rs
View file

@ -44,8 +44,7 @@ impl Decoder for IrcCodec {
}
}
impl Encoder for IrcCodec {
type Item = Message;
impl Encoder<Message> for IrcCodec {
type Error = error::ProtocolError;
fn encode(&mut self, msg: Message, dst: &mut BytesMut) -> error::Result<()> {

3
irc-proto/src/line.rs
View file

@ -63,8 +63,7 @@ impl Decoder for LineCodec {
}
}
impl Encoder for LineCodec {
type Item = String;
impl Encoder<String> for LineCodec {
type Error = error::ProtocolError;
fn encode(&mut self, msg: String, dst: &mut BytesMut) -> error::Result<()> {