refactor: reduce dependency on async-std

Author: dignifiedquire

examples/tokio.rs

@@ -1,6 +1,7 @@
-use async_imap::error::{Error, Result};
-use async_std::prelude::*;
 use std::env;
+
+use async_imap::error::{Error, Result};
+use futures::TryStreamExt;
 use tokio::runtime::Runtime;
 
 fn main() -> Result<()> {
@@ -39,7 +40,7 @@ async fn fetch_inbox_top(imap_server: &str, login: &str, password: &str) -> Resu
     // fetch message number 1 in this mailbox, along with its RFC822 field.
     // RFC 822 dictates the format of the body of e-mails
     let messages_stream = imap_session.fetch("1", "RFC822").await?;
-    let messages: Vec<_> = messages_stream.collect::<Result<_>>().await?;
+    let messages: Vec<_> = messages_stream.try_collect().await?;
     let message = if let Some(m) = messages.first() {
         m
     } else {

src/client.rs

@@ -6,10 +6,10 @@ use std::str;
 
 use async_native_tls::{TlsConnector, TlsStream};
 use async_std::channel;
-use async_std::io::{self, Read, Write};
 use async_std::net::{TcpStream, ToSocketAddrs};
-use async_std::prelude::*;
 use extensions::quota::parse_get_quota_root;
+use futures::io::{self, AsyncRead as Read, AsyncWrite as Write};
+use futures::prelude::*;
 use imap_proto::{RequestId, Response};
 
 use super::authenticator::Authenticator;

src/error.rs

@@ -1,13 +1,12 @@
 //! IMAP error types.
 
 use std::io::Error as IoError;
-use std::result;
 use std::str::Utf8Error;
 
 use base64::DecodeError;
 
 /// A convenience wrapper around `Result` for `imap::Error`.
-pub type Result<T> = result::Result<T, Error>;
+pub type Result<T> = std::result::Result<T, Error>;
 
 /// A set of errors that can occur in the IMAP client
 #[derive(thiserror::Error, Debug)]

src/extensions/idle.rs

@@ -4,9 +4,8 @@ use std::fmt;
 use std::pin::Pin;
 use std::time::Duration;
 
-use async_std::io::{self, Read, Write};
-use async_std::prelude::*;
-use async_std::stream::Stream;
+use futures::io::{self, AsyncRead as Read, AsyncWrite as Write};
+use futures::prelude::*;
 use futures::task::{Context, Poll};
 use imap_proto::{RequestId, Response, Status};
 use stop_token::prelude::*;

src/extensions/quota.rs

@@ -1,15 +1,14 @@
 //! Adds support for the GETQUOTA and GETQUOTAROOT commands specificed in [RFC2087](https://tools.ietf.org/html/rfc2087).
 
 use async_std::channel;
-use async_std::io;
-use async_std::prelude::*;
-use async_std::stream::Stream;
+use futures::io;
+use futures::prelude::*;
 use imap_proto::{self, RequestId, Response};
 
 use crate::types::*;
 use crate::{
     error::Result,
-    parse::{filter_sync, handle_unilateral},
+    parse::{filter, handle_unilateral},
 };
 use crate::{
     error::{Error, ParseError},
@@ -23,7 +22,7 @@ pub(crate) async fn parse_get_quota<T: Stream<Item = io::Result<ResponseData>> +
 ) -> Result<Quota> {
     let mut quota = None;
     while let Some(resp) = stream
-        .take_while(|res| filter_sync(res, &command_tag))
+        .take_while(|res| filter(res, &command_tag))
         .next()
         .await
     {
@@ -53,7 +52,7 @@ pub(crate) async fn parse_get_quota_root<T: Stream<Item = io::Result<ResponseDat
     let mut quotas: Vec<Quota> = Vec::new();
 
     while let Some(resp) = stream
-        .take_while(|res| filter_sync(res, &command_tag))
+        .take_while(|res| filter(res, &command_tag))
         .next()
         .await
     {

src/imap_stream.rs

@@ -1,12 +1,12 @@
 use std::fmt;
 use std::pin::Pin;
+use std::sync::Arc;
 
-use async_std::io::{self, Read, Write};
-use async_std::prelude::*;
-use async_std::stream::Stream;
-use async_std::sync::Arc;
 use byte_pool::{Block, BytePool};
+use futures::io::{self, AsyncRead as Read, AsyncWrite as Write};
+use futures::stream::Stream;
 use futures::task::{Context, Poll};
+use futures::AsyncWriteExt;
 use nom::Needed;
 use once_cell::sync::Lazy;
 

src/lib.rs

@@ -16,7 +16,7 @@
 //! Below is a basic client example. See the `examples/` directory for more.
 //!
 //! ```no_run
-//! use async_std::prelude::*;
+//! use futures::prelude::*;
 //! use async_imap::error::Result;
 //!
 //! async fn fetch_inbox_top() -> Result<Option<String>> {
@@ -40,7 +40,7 @@
 //!     // fetch message number 1 in this mailbox, along with its RFC822 field.
 //!     // RFC 822 dictates the format of the body of e-mails
 //!     let messages_stream = imap_session.fetch("1", "RFC822").await?;
-//!     let messages: Vec<_> = messages_stream.collect::<Result<_>>().await?;
+//!     let messages: Vec<_> = messages_stream.try_collect().await?;
 //!     let message = if let Some(m) = messages.first() {
 //!         m
 //!     } else {

src/mock_stream.rs

@@ -1,7 +1,7 @@
 use std::cmp::min;
 use std::pin::Pin;
 
-use async_std::io::{Error, ErrorKind, Read, Result, Write};
+use futures::io::{AsyncRead as Read, AsyncWrite as Write, Error, ErrorKind, Result};
 use futures::task::{Context, Poll};
 
 #[derive(Default, Clone, Debug, Eq, PartialEq, Hash)]

src/parse.rs

@@ -1,9 +1,9 @@
 use std::collections::HashSet;
 
 use async_std::channel;
-use async_std::io;
-use async_std::prelude::*;
-use async_std::stream::Stream;
+use futures::io;
+use futures::prelude::*;
+use futures::stream::Stream;
 use imap_proto::{self, MailboxDatum, RequestId, Response};
 
 use crate::error::{Error, Result};
@@ -41,7 +41,10 @@ pub(crate) fn parse_names<T: Stream<Item = io::Result<ResponseData>> + Unpin + S
     )
 }
 
-fn filter(res: &io::Result<ResponseData>, command_tag: &RequestId) -> impl Future<Output = bool> {
+pub(crate) fn filter(
+    res: &io::Result<ResponseData>,
+    command_tag: &RequestId,
+) -> impl Future<Output = bool> {
     let val = filter_sync(res, command_tag);
     futures::future::ready(val)
 }
@@ -121,7 +124,7 @@ pub(crate) async fn parse_capabilities<T: Stream<Item = io::Result<ResponseData>
     let mut caps: HashSet<Capability> = HashSet::new();
 
     while let Some(resp) = stream
-        .take_while(|res| filter_sync(res, &command_tag))
+        .take_while(|res| filter(res, &command_tag))
         .next()
         .await
     {
@@ -147,7 +150,7 @@ pub(crate) async fn parse_noop<T: Stream<Item = io::Result<ResponseData>> + Unpi
     command_tag: RequestId,
 ) -> Result<()> {
     while let Some(resp) = stream
-        .take_while(|res| filter_sync(res, &command_tag))
+        .take_while(|res| filter(res, &command_tag))
         .next()
         .await
     {
@@ -294,7 +297,7 @@ pub(crate) async fn parse_ids<T: Stream<Item = io::Result<ResponseData>> + Unpin
     let mut ids: HashSet<u32> = HashSet::new();
 
     while let Some(resp) = stream
-        .take_while(|res| filter_sync(res, &command_tag))
+        .take_while(|res| filter(res, &command_tag))
         .next()
         .await
     {
@@ -439,7 +442,7 @@ mod tests {
 
         let id = RequestId("A0001".into());
         let names: Vec<_> = parse_names(&mut stream, send, id)
-            .collect::<Result<Vec<Name>>>()
+            .try_collect::<Vec<Name>>()
             .await
             .unwrap();
         assert!(recv.is_empty());
@@ -460,7 +463,7 @@ mod tests {
         let id = RequestId("a".into());
 
         let fetches = parse_fetches(&mut stream, send, id)
-            .collect::<Result<Vec<_>>>()
+            .try_collect::<Vec<_>>()
             .await
             .unwrap();
         assert!(recv.is_empty());
@@ -478,7 +481,7 @@ mod tests {
         let id = RequestId("a".into());
 
         let fetches = parse_fetches(&mut stream, send, id)
-            .collect::<Result<Vec<_>>>()
+            .try_collect::<Vec<_>>()
             .await
             .unwrap();
         assert!(recv.is_empty());
@@ -505,7 +508,7 @@ mod tests {
         let id = RequestId("a".into());
 
         let fetches = parse_fetches(&mut stream, send, id)
-            .collect::<Result<Vec<_>>>()
+            .try_collect::<Vec<_>>()
             .await
             .unwrap();
         assert_eq!(recv.recv().await.unwrap(), UnsolicitedResponse::Recent(1));
@@ -526,7 +529,7 @@ mod tests {
 
         let id = RequestId("A0001".into());
         let names = parse_names(&mut stream, send, id)
-            .collect::<Result<Vec<_>>>()
+            .try_collect::<Vec<_>>()
             .await
             .unwrap();