Skip to content

Commit

Permalink
Upgrade tokio_core dependency to use tokio 0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus Westerlind committed Apr 20, 2018
1 parent 9a0d8fa commit f2ad0e0
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 187 deletions.
9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tokio-uds"
version = "0.1.7"
version = "0.2.0"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT/Apache-2.0"
repository = "https://github.com/tokio-rs/tokio-uds"
Expand All @@ -17,11 +17,12 @@ appveyor = { repository = "alexcrichton/tokio-uds" }

[dependencies]
bytes = "0.4"
futures = "0.1.11"
futures = "0.1"
iovec = "0.1"
libc = "0.2"
log = "0.4"
mio = "0.6.5"
mio = "0.6.14"
mio-uds = "0.6.4"
tokio-core = "0.1"
tokio-reactor = "0.1.1"
tokio-io = "0.1"

4 changes: 2 additions & 2 deletions src/frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ impl<C: UnixDatagramCodec> Stream for UnixDatagramFramed<C> {
type Error = io::Error;

fn poll(&mut self) -> Poll<Option<C::In>, io::Error> {
let (n, addr) = try_nb!(self.socket.recv_from(&mut self.rd));
let (n, addr) = try_ready!(self.socket.recv_from(&mut self.rd));
trace!("received {} bytes, decoding", n);
let frame = try!(self.codec.decode(&addr, &self.rd[..n]));
trace!("frame decoded from buffer");
Expand Down Expand Up @@ -104,7 +104,7 @@ impl<C: UnixDatagramCodec> Sink for UnixDatagramFramed<C> {
}

trace!("writing; remaining={}", self.wr.len());
let n = try_nb!(self.socket.send_to(&self.wr, &self.out_addr));
let n = try_ready!(self.socket.send_to(&self.wr, &self.out_addr));
trace!("written {}", n);
let wrote_all = n == self.wr.len();
self.wr.clear();
Expand Down
Loading

0 comments on commit f2ad0e0

Please sign in to comment.