Update to Tokio 0.3

Author: dani-garcia

Cargo.toml

@@ -26,10 +26,11 @@ lazy_static = "1.4.0"
 regex = "1.3.9"
 chrono = "0.4.11"
 
-tokio = { version = "0.2.21", features = ["tcp", "dns", "io-util"] }
-tokio-rustls = { version = "0.13.1", optional = true }
-pin-project = "0.4.17"
+tokio = { version = "0.3.1", features = ["net", "io-util"] }
+tokio-rustls = { version = "0.20.0", optional = true }
+pin-project = "1.0.0"
+
+[dev-dependencies]
+tokio = { version = "0.3.1", features = ["macros", "stream", "rt"] }
+tokio-util = { version = "0.4.0", features = ["io"] }
 
-[dev-dependencies.tokio]
-version = "0.2.21"
-features = [ "macros", "stream", "io-util" ]

examples/connecting.rs

@@ -26,7 +26,7 @@ async fn test_ftp(addr: &str, user: &str, pass: &str) -> Result<(), FtpError> {
 fn main() {
     let future = test_ftp("172.25.82.139", "anonymous", "[email protected]");
 
-    tokio::runtime::Builder::new()
+    tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap()

src/data_stream.rs

@@ -1,7 +1,7 @@
 use std::io;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio::net::TcpStream;
 #[cfg(feature = "secure")]
 use tokio_rustls::client::TlsStream;
@@ -47,8 +47,8 @@ impl AsyncRead for DataStream {
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         match self.project() {
             DataStreamProj::Tcp(stream) => stream.poll_read(cx, buf),
             #[cfg(feature = "secure")]

src/ftp.rs

@@ -617,11 +617,12 @@ impl FtpStream {
 #[cfg(test)]
 mod tests {
     use super::FtpStream;
-    use tokio::{io::stream_reader, stream};
+    use tokio::{stream};
+    use tokio_util::io::StreamReader;
 
     #[tokio::test]
     async fn list_command_dos_newlines() {
-        let data_stream = stream_reader(stream::once(Ok(
+        let data_stream = StreamReader::new(stream::once(Ok::<_, std::io::Error>(
             b"Hello\r\nWorld\r\n\r\nBe\r\nHappy\r\n" as &[u8]
         )));
 
@@ -636,7 +637,7 @@ mod tests {
 
     #[tokio::test]
     async fn list_command_unix_newlines() {
-        let data_stream = stream_reader(stream::once(Ok(b"Hello\nWorld\n\nBe\nHappy\n" as &[u8])));
+        let data_stream =  StreamReader::new(stream::once(Ok::<_, std::io::Error>(b"Hello\nWorld\n\nBe\nHappy\n" as &[u8])));
 
         assert_eq!(
             FtpStream::get_lines_from_stream(data_stream).await.unwrap(),

tests/lib.rs

@@ -36,7 +36,7 @@ fn test_ftp() {
         Ok(())
     };
 
-    let result: Result<(), FtpError> = tokio::runtime::Builder::new()
+    let result: Result<(), FtpError> = tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap()