refactor: re-export imap-types

duesee · Jul 12, 2024 · 9e0098e · 9e0098e
1 parent d6b6c81
commit 9e0098e
Show file tree

Hide file tree

Showing 20 changed files with 84 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,6 @@ stream = ["dep:bytes", "dep:rustls", "dep:tokio", "dep:tokio-rustls"]
 [dependencies]
 bytes = { version = "1.6.0", optional = true }
 imap-codec = { version = "2.0.0-alpha.1", features = ["starttls", "quirk_crlf_relaxed", "ext_condstore_qresync", "ext_login_referrals", "ext_mailbox_referrals", "ext_id", "ext_sort_thread", "ext_binary", "ext_metadata", "ext_uidplus"], git = "https://github.com/duesee/imap-codec", rev = "6bd83aff18fc12bad2b45c9fc50506b0c26ae2f6" }
-imap-types = { version = "2.0.0-alpha.1", features = ["starttls", "ext_condstore_qresync", "ext_login_referrals", "ext_mailbox_referrals", "ext_id", "ext_sort_thread", "ext_binary", "ext_metadata", "ext_uidplus"], git = "https://github.com/duesee/imap-codec", rev = "6bd83aff18fc12bad2b45c9fc50506b0c26ae2f6" }
 rustls = { version = "0.23.11", optional = true }
 thiserror = "1.0.61"
 tokio = { version = "1.38.0", optional = true, features = ["io-util", "macros", "net"] }

diff --git a/README.md b/README.md
@@ -45,12 +45,12 @@ And it's sans I/O enabling the integration in any existing I/O runtime.
 use std::error::Error;
 use imap_next::{
     client::{Client, Event, Options},
+    imap_types::{
+        command::{Command, CommandBody},
+        core::Tag,
+    },
     stream::Stream,
 };
-use imap_types::{
-    command::{Command, CommandBody},
-    core::Tag,
-};
 use tokio::net::TcpStream;
 
 #[tokio::main]

diff --git a/examples/client.rs b/examples/client.rs
@@ -1,11 +1,11 @@
 use imap_next::{
     client::{Client, Event, Options},
+    imap_types::{
+        command::{Command, CommandBody},
+        core::Tag,
+    },
     stream::Stream,
 };
-use imap_types::{
-    command::{Command, CommandBody},
-    core::Tag,
-};
 use tokio::net::TcpStream;
 
 #[tokio::main(flavor = "current_thread")]

diff --git a/examples/client_authenticate.rs b/examples/client_authenticate.rs
@@ -2,12 +2,12 @@ use std::collections::VecDeque;
 
 use imap_next::{
     client::{Client, Event, Options},
+    imap_types::{
+        auth::{AuthMechanism, AuthenticateData},
+        command::{Command, CommandBody},
+    },
     stream::Stream,
 };
-use imap_types::{
-    auth::{AuthMechanism, AuthenticateData},
-    command::{Command, CommandBody},
-};
 use tag_generator::TagGenerator;
 use tokio::net::TcpStream;
 

diff --git a/examples/client_idle.rs b/examples/client_idle.rs
@@ -2,13 +2,13 @@ use std::io::BufRead;
 
 use imap_next::{
     client::{Client, Event, Options},
+    imap_types::{
+        command::{Command, CommandBody},
+        core::Tag,
+        response::{Status, Tagged},
+    },
     stream::Stream,
 };
-use imap_types::{
-    command::{Command, CommandBody},
-    core::Tag,
-    response::{Status, Tagged},
-};
 use tokio::{net::TcpStream, sync::mpsc::Receiver};
 
 #[tokio::main(flavor = "current_thread")]

diff --git a/examples/client_std.rs b/examples/client_std.rs
@@ -5,12 +5,12 @@ use std::{
 
 use imap_next::{
     client::{Client, Event, Options},
+    imap_types::{
+        command::{Command, CommandBody},
+        core::Tag,
+    },
     Interrupt, Io, State,
 };
-use imap_types::{
-    command::{Command, CommandBody},
-    core::Tag,
-};
 
 fn main() {
     let mut stream = TcpStream::connect("127.0.0.1:12345").unwrap();

diff --git a/examples/server.rs b/examples/server.rs
@@ -1,10 +1,10 @@
 use std::collections::VecDeque;
 
 use imap_next::{
+    imap_types::response::{Greeting, Status},
     server::{Event, Options, Server},
     stream::Stream,
 };
-use imap_types::response::{Greeting, Status};
 use tokio::net::TcpListener;
 
 #[tokio::main(flavor = "current_thread")]

diff --git a/examples/server_authenticate.rs b/examples/server_authenticate.rs
@@ -1,9 +1,9 @@
 use imap_next::{
+    imap_types::response::{CommandContinuationRequest, Greeting, Status},
     server::{Event, Options, Server},
     stream::Stream,
     types::CommandAuthenticate,
 };
-use imap_types::response::{CommandContinuationRequest, Greeting, Status};
 use tokio::net::TcpListener;
 
 #[tokio::main(flavor = "current_thread")]

diff --git a/examples/server_fragmentizer.rs b/examples/server_fragmentizer.rs
@@ -1,8 +1,10 @@
 use std::{io::Read, net::TcpListener};
 
 use imap_codec::{AuthenticateDataCodec, CommandCodec, IdleDoneCodec};
-use imap_next::fragmentizer::{Fragmentizer, MaxMessageSize};
-use imap_types::command::CommandBody;
+use imap_next::{
+    fragmentizer::{Fragmentizer, MaxMessageSize},
+    imap_types::command::CommandBody,
+};
 
 enum State {
     Command,

diff --git a/examples/server_idle.rs b/examples/server_idle.rs
@@ -1,15 +1,15 @@
 use std::{io::BufRead, num::NonZeroU32};
 
 use imap_next::{
+    imap_types::{
+        core::Text,
+        response::{
+            CommandContinuationRequest, Data, Greeting, Status, StatusBody, StatusKind, Tagged,
+        },
+    },
     server::{Event, Options, Server},
     stream::Stream,
 };
-use imap_types::{
-    core::Text,
-    response::{
-        CommandContinuationRequest, Data, Greeting, Status, StatusBody, StatusKind, Tagged,
-    },
-};
 use tokio::{net::TcpListener, sync::mpsc::Receiver};
 
 #[tokio::main(flavor = "current_thread")]

diff --git a/src/client.rs b/src/client.rs
@@ -1,14 +1,14 @@
 use std::fmt::{Debug, Formatter};
 
 use imap_codec::{
+    imap_types::{
+        auth::AuthenticateData,
+        command::Command,
+        response::{CommandContinuationRequest, Data, Greeting, Response, Status},
+        secret::Secret,
+    },
     AuthenticateDataCodec, CommandCodec, GreetingCodec, IdleDoneCodec, ResponseCodec,
 };
-use imap_types::{
-    auth::AuthenticateData,
-    command::Command,
-    response::{CommandContinuationRequest, Data, Greeting, Response, Status},
-    secret::Secret,
-};
 use thiserror::Error;
 
 use crate::{
@@ -299,7 +299,7 @@ pub enum Event {
         ///
         /// Note: [`Client`] already handled this [`Status`] but it might still have
         /// useful information that could be logged or displayed to the user
-        /// (e.g. [`Code::Alert`](imap_types::response::Code::Alert)).
+        /// (e.g. [`Code::Alert`](crate::imap_types::response::Code::Alert)).
         status: Status<'static>,
     },
     /// AUTHENTICATE sent.

diff --git a/src/client_send.rs b/src/client_send.rs
@@ -2,15 +2,15 @@ use std::{collections::VecDeque, convert::Infallible};
 
 use imap_codec::{
     encode::{Encoder, Fragment},
+    imap_types::{
+        auth::AuthenticateData,
+        command::{Command, CommandBody},
+        core::{LiteralMode, Tag},
+        extensions::idle::IdleDone,
+        response::{Status, StatusBody, StatusKind, Tagged},
+    },
     AuthenticateDataCodec, CommandCodec, IdleDoneCodec,
 };
-use imap_types::{
-    auth::AuthenticateData,
-    command::{Command, CommandBody},
-    core::{LiteralMode, Tag},
-    extensions::idle::IdleDone,
-    response::{Status, StatusBody, StatusKind, Tagged},
-};
 use tracing::warn;
 
 use crate::{client::CommandHandle, types::CommandAuthenticate, Interrupt, Io};

diff --git a/src/fragmentizer.rs b/src/fragmentizer.rs
@@ -2,10 +2,12 @@
 
 use std::{collections::VecDeque, ops::Range};
 
-use imap_codec::decode::Decoder;
-use imap_types::{
-    core::{LiteralMode, Tag},
-    secret::Secret,
+use imap_codec::{
+    decode::Decoder,
+    imap_types::{
+        core::{LiteralMode, Tag},
+        secret::Secret,
+    },
 };
 
 /// Limits the size of messages that can be decoded by [`Fragmentizer`].
@@ -548,11 +550,14 @@ mod tests {
     use core::panic;
     use std::collections::VecDeque;
 
-    use imap_codec::{decode::ResponseDecodeError, CommandCodec, ResponseCodec};
-    use imap_types::{
-        command::{Command, CommandBody},
-        core::{LiteralMode, Tag},
-        secret::Secret,
+    use imap_codec::{
+        decode::ResponseDecodeError,
+        imap_types::{
+            command::{Command, CommandBody},
+            core::{LiteralMode, Tag},
+            secret::Secret,
+        },
+        CommandCodec, ResponseCodec,
     };
 
     use super::{

diff --git a/src/receive.rs b/src/receive.rs
@@ -1,8 +1,10 @@
-use imap_codec::decode::Decoder;
-use imap_types::{
-    core::{LiteralMode, Tag},
-    secret::Secret,
-    IntoStatic,
+use imap_codec::{
+    decode::Decoder,
+    imap_types::{
+        core::{LiteralMode, Tag},
+        secret::Secret,
+        IntoStatic,
+    },
 };
 
 use crate::{

diff --git a/src/server.rs b/src/server.rs
@@ -1,19 +1,19 @@
 use std::fmt::{Debug, Formatter};
 
 use imap_codec::{
-    AuthenticateDataCodec, CommandCodec, GreetingCodec, IdleDoneCodec, ResponseCodec,
-};
-use imap_types::{
-    auth::AuthenticateData,
-    command::{Command, CommandBody},
-    core::{LiteralMode, Tag, Text},
-    extensions::idle::IdleDone,
-    response::{
-        CommandContinuationRequest, CommandContinuationRequestBasic, Data, Greeting, Response,
-        Status,
+    imap_types::{
+        auth::AuthenticateData,
+        command::{Command, CommandBody},
+        core::{LiteralMode, Tag, Text},
+        extensions::idle::IdleDone,
+        response::{
+            CommandContinuationRequest, CommandContinuationRequestBasic, Data, Greeting, Response,
+            Status,
+        },
+        secret::Secret,
+        ToStatic,
     },
-    secret::Secret,
-    ToStatic,
+    AuthenticateDataCodec, CommandCodec, GreetingCodec, IdleDoneCodec, ResponseCodec,
 };
 use thiserror::Error;
 

diff --git a/src/server_send.rs b/src/server_send.rs
@@ -2,9 +2,9 @@ use std::{collections::VecDeque, convert::Infallible};
 
 use imap_codec::{
     encode::{Encoded, Encoder, Fragment},
+    imap_types::response::{Greeting, Response},
     GreetingCodec, ResponseCodec,
 };
-use imap_types::response::{Greeting, Response};
 
 use crate::{server::ResponseHandle, Interrupt, Io};
 

diff --git a/src/stream.rs b/src/stream.rs
@@ -5,7 +5,7 @@ use std::{
 
 use bytes::{Buf, BufMut, BytesMut};
 #[cfg(debug_assertions)]
-use imap_types::utils::escape_byte_string;
+use imap_codec::imap_types::utils::escape_byte_string;
 use thiserror::Error;
 use tokio::{
     io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt},

diff --git a/src/tests.rs b/src/tests.rs
@@ -1,4 +1,4 @@
-use imap_types::{
+use imap_codec::imap_types::{
     auth::AuthMechanism,
     command::{Command, CommandBody},
     core::Tag,

diff --git a/src/types.rs b/src/types.rs
@@ -3,7 +3,7 @@
 
 use std::borrow::Cow;
 
-use imap_types::{
+use imap_codec::imap_types::{
     auth::AuthMechanism,
     command::{Command, CommandBody},
     core::Tag,