feat: update deps

Author: dignifiedquire

Cargo.toml

@@ -22,15 +22,15 @@ is-it-maintained-open-issues = { repository = "async-email/async-imap" }
 default = []
 
 [dependencies]
-imap-proto = "0.14.3"
-nom = "6.0"
+imap-proto = "0.16.1"
+nom = "7.0"
 base64 = "0.13"
 chrono = "0.4"
-async-native-tls = { version = "0.3.3" }
+async-native-tls = { version = "0.3" }
 async-std = { version = "1.8.0", default-features = false, features = ["std"] }
 pin-utils = "0.1.0-alpha.4"
 futures = "0.3.15"
-ouroboros = "0.9"
+ouroboros = "0.15"
 stop-token = "0.7"
 byte-pool = "0.2.2"
 once_cell = "1.8.0"
@@ -39,10 +39,10 @@ thiserror = "1.0.9"
 
 [dev-dependencies]
 lettre_email = "0.9"
-pretty_assertions = "0.6.1"
-async-smtp = { version = "0.3.0" }
+pretty_assertions = "1.2"
+async-smtp = { version = "0.4" }
 async-std = { version = "1.8.0", default-features = false, features = ["std", "attributes"] }
-tokio = "0.2.6"
+tokio = { version = "1", features = ["rt-multi-thread"] }
 
 [[example]]
 name = "basic"

examples/tokio.rs

@@ -4,7 +4,7 @@ use std::env;
 use tokio::runtime::Runtime;
 
 fn main() -> Result<()> {
-    let mut rt = Runtime::new().expect("unable to create runtime");
+    let rt = Runtime::new().expect("unable to create runtime");
 
     rt.block_on(async {
         let args: Vec<String> = env::args().collect();

src/mock_stream.rs

@@ -4,7 +4,7 @@ use std::pin::Pin;
 use async_std::io::{Error, ErrorKind, Read, Result, Write};
 use futures::task::{Context, Poll};
 
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Default, Clone, Debug, Eq, PartialEq, Hash)]
 pub struct MockStream {
     read_buf: Vec<u8>,
     read_pos: usize,
@@ -14,19 +14,6 @@ pub struct MockStream {
     read_delay: usize,
 }
 
-impl Default for MockStream {
-    fn default() -> Self {
-        MockStream {
-            read_buf: Vec::new(),
-            read_pos: 0,
-            written_buf: Vec::new(),
-            err_on_read: false,
-            eof_on_read: false,
-            read_delay: 0,
-        }
-    }
-}
-
 impl MockStream {
     pub fn new(read_buf: Vec<u8>) -> MockStream {
         MockStream::default().with_buf(read_buf)

src/parse.rs

@@ -446,7 +446,7 @@ mod tests {
         assert_eq!(names.len(), 1);
         assert_eq!(
             names[0].attributes(),
-            &[NameAttribute::from("\\HasNoChildren")]
+            &[NameAttribute::Extension("\\HasNoChildren".into())]
         );
         assert_eq!(names[0].delimiter(), Some("."));
         assert_eq!(names[0].name(), "INBOX");
@@ -535,7 +535,7 @@ mod tests {
         assert_eq!(names.len(), 1);
         assert_eq!(
             names[0].attributes(),
-            &[NameAttribute::from("\\HasNoChildren")]
+            &[NameAttribute::Extension("\\HasNoChildren".into())]
         );
         assert_eq!(names[0].delimiter(), Some("."));
         assert_eq!(names[0].name(), "INBOX");

src/types/name.rs

@@ -1,5 +1,4 @@
-use std::borrow::Cow;
-
+pub use imap_proto::types::NameAttribute;
 use imap_proto::{MailboxDatum, Response};
 
 use crate::types::ResponseData;
@@ -21,74 +20,15 @@ pub struct InnerName<'a> {
     name: &'a str,
 }
 
-/// An attribute set for an IMAP name.
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub enum NameAttribute<'a> {
-    /// It is not possible for any child levels of hierarchy to exist
-    /// under this name; no child levels exist now and none can be
-    /// created in the future.
-    NoInferiors,
-
-    /// It is not possible to use this name as a selectable mailbox.
-    NoSelect,
-
-    /// The mailbox has been marked "interesting" by the server; the
-    /// mailbox probably contains messages that have been added since
-    /// the last time the mailbox was selected.
-    Marked,
-
-    /// The mailbox does not contain any additional messages since the
-    /// last time the mailbox was selected.
-    Unmarked,
-
-    /// A non-standard user- or server-defined name attribute.
-    Custom(Cow<'a, str>),
-}
-
-impl NameAttribute<'static> {
-    fn system(s: &str) -> Option<Self> {
-        match s {
-            "\\Noinferiors" => Some(NameAttribute::NoInferiors),
-            "\\Noselect" => Some(NameAttribute::NoSelect),
-            "\\Marked" => Some(NameAttribute::Marked),
-            "\\Unmarked" => Some(NameAttribute::Unmarked),
-            _ => None,
-        }
-    }
-}
-
-impl<'a> From<String> for NameAttribute<'a> {
-    fn from(s: String) -> Self {
-        if let Some(f) = NameAttribute::system(&s) {
-            f
-        } else {
-            NameAttribute::Custom(Cow::Owned(s))
-        }
-    }
-}
-
-impl<'a> From<&'a str> for NameAttribute<'a> {
-    fn from(s: &'a str) -> Self {
-        if let Some(f) = NameAttribute::system(s) {
-            f
-        } else {
-            NameAttribute::Custom(Cow::Borrowed(s))
-        }
-    }
-}
-
 impl Name {
     pub(crate) fn from_mailbox_data(resp: ResponseData) -> Self {
         Name::new(Box::new(resp), |response| match response.parsed() {
             Response::MailboxData(MailboxDatum::List {
-                flags,
+                name_attributes,
                 delimiter,
                 name,
             }) => InnerName {
-                attributes: flags
-                    .iter()
-                    .map(|s| NameAttribute::from(s.as_ref()))
-                    .collect(),
+                attributes: name_attributes.to_owned(),
                 delimiter: delimiter.as_deref(),
                 name,
             },

tests/imap_integration.rs

@@ -110,7 +110,7 @@ fn make_email(to: &str) -> async_smtp::SendableEmail {
             vec![to.parse().unwrap()],
         )
         .unwrap(),
-        message_id.to_string(),
+        message_id,
         format!("To: <{}>\r\nFrom: <sender@localhost>\r\nMessage-ID: <{}.msg@localhost>\r\nSubject: My first e-mail\r\n\r\nHello world from SMTP", to, message_id),
     )
 }