Update tokio requirement from 0.2 to 0.3

CHANGELOG.md

@@ -23,6 +23,10 @@
 - [`parity-multiaddr` CHANGELOG](misc/multiaddr/CHANGELOG.md)
 - [`libp2p-core-derive` CHANGELOG](misc/core-derive/CHANGELOG.md)
 
+# Version 0.29.1 [unreleased]
+
+- Update `libp2p-mdns`, `libp2p-tcp` and `libp2p-uds`.
+
 # Version 0.29.0 [2020-10-16]
 
 - Update `libp2p-core`, `libp2p-floodsub`, `libp2p-gossipsub`, `libp2p-mplex`,

Cargo.toml

@@ -2,7 +2,7 @@
 name = "libp2p"
 edition = "2018"
 description = "Peer-to-peer networking library"
-version = "0.29.0"
+version = "0.29.1"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -75,7 +75,7 @@ libp2p-plaintext = { version = "0.23.0", path = "protocols/plaintext", optional
 libp2p-pnet = { version = "0.19.2", path = "protocols/pnet", optional = true }
 libp2p-request-response = { version = "0.4.0", path = "protocols/request-response", optional = true }
 libp2p-swarm = { version = "0.23.0", path = "swarm" }
-libp2p-uds = { version = "0.23.0", path = "transports/uds", optional = true }
+libp2p-uds = { version = "0.23.1", path = "transports/uds", optional = true }
 libp2p-wasm-ext = { version = "0.23.0", path = "transports/wasm-ext", optional = true }
 libp2p-yamux = { version = "0.26.0", path = "muxers/yamux", optional = true }
 multiaddr = { package = "parity-multiaddr", version = "0.9.3", path = "misc/multiaddr" }
@@ -88,14 +88,14 @@ wasm-timer = "0.2.4"
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 libp2p-deflate = { version = "0.23.0", path = "protocols/deflate", optional = true }
 libp2p-dns = { version = "0.23.0", path = "transports/dns", optional = true }
-libp2p-mdns = { version = "0.23.0", path = "protocols/mdns", optional = true }
-libp2p-tcp = { version = "0.23.0", path = "transports/tcp", optional = true }
+libp2p-mdns = { version = "0.23.1", path = "protocols/mdns", optional = true }
+libp2p-tcp = { version = "0.23.1", path = "transports/tcp", optional = true }
 libp2p-websocket = { version = "0.24.0", path = "transports/websocket", optional = true }
 
 [dev-dependencies]
 async-std = "1.6.2"
 env_logger = "0.8.1"
-tokio = { version = "0.2", features = ["io-util", "io-std", "stream", "macros"] }
+tokio = { version = "0.3", features = ["io-util", "io-std", "stream", "macros"] }
 
 [workspace]
 members = [

protocols/mdns/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.23.1 [unreleased]
+
+- Update dependencies.
+
 # 0.23.0 [2020-10-16]
 
 - Update `libp2p-swarm` and `libp2p-core`.

protocols/mdns/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "libp2p-mdns"
 edition = "2018"
-version = "0.23.0"
+version = "0.23.1"
 description = "Implementation of the libp2p mDNS discovery method"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
@@ -22,9 +22,10 @@ log = "0.4"
 net2 = "0.2"
 rand = "0.7"
 smallvec = "1.0"
-tokio = { version = "0.2", default-features = false, features = ["udp"], optional = true }
+tokio = { version = "0.3", default-features = false, features = ["net"], optional = true }
 void = "1.0"
 wasm-timer = "0.2.4"
 
 [dev-dependencies]
 if-addrs = "0.6.4"
+tokio = { version = "0.3", default-features = false, features = ["rt", "rt-multi-thread"] }

transports/tcp/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.23.1 [unreleased]
+
+- Update dependencies.
+
 # 0.23.0 [2020-10-16]
 
 - Update `libp2p-core`.

transports/tcp/Cargo.toml

@@ -2,7 +2,7 @@
 name = "libp2p-tcp"
 edition = "2018"
 description = "TCP/IP transport protocol for libp2p"
-version = "0.23.0"
+version = "0.23.1"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -18,7 +18,7 @@ ipnet = "2.0.0"
 libp2p-core = { version = "0.23.0", path = "../../core" }
 log = "0.4.1"
 socket2 = "0.3.12"
-tokio = { version = "0.2", default-features = false, features = ["tcp"], optional = true }
+tokio = { version = "0.3", default-features = false, features = ["net"], optional = true }
 
 [dev-dependencies]
 libp2p-tcp = { path = ".", features = ["async-std"] }

transports/tcp/src/lib.rs

@@ -353,7 +353,11 @@ impl AsyncWrite for TcpTransStream {
 #[cfg(feature = "tokio")]
 impl AsyncRead for TokioTcpTransStream {
     fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context, buf: &mut [u8]) -> Poll<Result<usize, io::Error>> {
-        tokio::io::AsyncRead::poll_read(Pin::new(&mut self.inner), cx, buf)
+        // Adapted from
+        // https://github.com/tokio-rs/tokio/blob/6d99e1c7dec4c6a37c4c7bf2801bc82cc210351d/tokio-util/src/compat.rs#L126.
+        let mut read_buf = tokio::io::ReadBuf::new(buf);
+        futures::ready!(tokio::io::AsyncRead::poll_read(Pin::new(&mut self.inner), cx, &mut read_buf))?;
+        Poll::Ready(Ok(read_buf.filled().len()))
     }
 }
 

transports/uds/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.23.1 [unreleased]
+
+- Update dependencies.
+
 # 0.23.0 [2020-10-16]
 
 - Update `libp2p-core` dependency.

transports/uds/Cargo.toml

@@ -2,7 +2,7 @@
 name = "libp2p-uds"
 edition = "2018"
 description = "Unix domain sockets transport for libp2p"
-version = "0.23.0"
+version = "0.23.1"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -14,7 +14,7 @@ async-std = { version = "1.6.2", optional = true }
 libp2p-core = { version = "0.23.0", path = "../../core" }
 log = "0.4.1"
 futures = "0.3.1"
-tokio = { version = "0.2", default-features = false, features = ["uds"], optional = true }
+tokio = { version = "0.3", default-features = false, features = ["net"], optional = true }
 
 [target.'cfg(all(unix, not(target_os = "emscripten")))'.dev-dependencies]
 tempfile = "3.0"