make async-trait as optional

Author: ssrlive

Cargo.toml

@@ -15,10 +15,10 @@ repository = "https://github.com/ssrlive/socks5-impl"
 client = ["tokio"]
 serde = ["dep:serde"]
 server = ["tokio"]
-tokio = ["dep:tokio"]
+tokio = ["dep:tokio", "async-trait"]
 
 [dependencies]
-async-trait = "0.1"
+async-trait = { version = "0.1", optional = true }
 bytes = "1"
 percent-encoding = "2"
 serde = { version = "1", features = ["derive"], optional = true }

src/client/mod.rs

@@ -2,7 +2,6 @@ use crate::{
     error::{Error, Result},
     protocol::{Address, AddressType, AsyncStreamOperation, AuthMethod, Command, Reply, StreamOperation, UserKey, Version},
 };
-use async_trait::async_trait;
 use std::{
     fmt::Debug,
     io::Cursor,
@@ -14,7 +13,7 @@ use tokio::{
     net::{TcpStream, UdpSocket},
 };
 
-#[async_trait]
+#[async_trait::async_trait]
 pub trait Socks5Reader: AsyncReadExt + Unpin {
     async fn read_version(&mut self) -> Result<()> {
         let value = Version::try_from(self.read_u8().await?)?;
@@ -109,10 +108,10 @@ pub trait Socks5Reader: AsyncReadExt + Unpin {
     }
 }
 
-#[async_trait]
+#[async_trait::async_trait]
 impl<T: AsyncReadExt + Unpin> Socks5Reader for T {}
 
-#[async_trait]
+#[async_trait::async_trait]
 pub trait Socks5Writer: AsyncWriteExt + Unpin {
     async fn write_version(&mut self) -> Result<()> {
         self.write_u8(0x05).await?;
@@ -189,7 +188,7 @@ pub trait Socks5Writer: AsyncWriteExt + Unpin {
     }
 }
 
-#[async_trait]
+#[async_trait::async_trait]
 impl<T: AsyncWriteExt + Unpin> Socks5Writer for T {}
 
 async fn username_password_auth<S>(stream: &mut S, auth: &UserKey) -> Result<()>
@@ -426,7 +425,7 @@ where
 pub type GuardTcpStream = BufStream<TcpStream>;
 pub type SocksUdpClient = SocksDatagram<GuardTcpStream>;
 
-#[async_trait]
+#[async_trait::async_trait]
 pub trait UdpClientTrait {
     async fn send_to<A>(&mut self, buf: &[u8], addr: A) -> Result<usize>
     where
@@ -435,7 +434,7 @@ pub trait UdpClientTrait {
     async fn recv_from(&mut self, timeout: Duration, buf: &mut Vec<u8>) -> Result<(usize, Address)>;
 }
 
-#[async_trait]
+#[async_trait::async_trait]
 impl UdpClientTrait for SocksUdpClient {
     async fn send_to<A>(&mut self, buf: &[u8], addr: A) -> Result<usize, Error>
     where
@@ -494,7 +493,6 @@ mod tests {
         client::{self, SocksListener, SocksUdpClient, UdpClientTrait},
         protocol::{Address, UserKey},
     };
-    use async_trait::async_trait;
     use std::{
         net::{SocketAddr, ToSocketAddrs},
         sync::Arc,
@@ -563,7 +561,7 @@ mod tests {
 
     type TestHalves = (Arc<SocksUdpClient>, Arc<SocksUdpClient>);
 
-    #[async_trait]
+    #[async_trait::async_trait]
     impl UdpClientTrait for TestHalves {
         async fn send_to<A>(&mut self, buf: &[u8], addr: A) -> Result<usize, Error>
         where

src/protocol/address.rs

@@ -1,8 +1,6 @@
 #[cfg(feature = "tokio")]
 use crate::protocol::AsyncStreamOperation;
 use crate::protocol::StreamOperation;
-#[cfg(feature = "tokio")]
-use async_trait::async_trait;
 use bytes::BufMut;
 use std::{
     io::Cursor,
@@ -164,7 +162,7 @@ impl StreamOperation for Address {
 }
 
 #[cfg(feature = "tokio")]
-#[async_trait]
+#[async_trait::async_trait]
 impl AsyncStreamOperation for Address {
     async fn retrieve_from_async_stream<R>(stream: &mut R) -> std::io::Result<Self>
     where

src/protocol/handshake/password_method/request.rs

@@ -2,8 +2,6 @@
 use crate::protocol::AsyncStreamOperation;
 use crate::protocol::{StreamOperation, UserKey};
 #[cfg(feature = "tokio")]
-use async_trait::async_trait;
-#[cfg(feature = "tokio")]
 use tokio::io::{AsyncRead, AsyncReadExt};
 
 /// SOCKS5 password handshake request
@@ -75,7 +73,7 @@ impl StreamOperation for Request {
 }
 
 #[cfg(feature = "tokio")]
-#[async_trait]
+#[async_trait::async_trait]
 impl AsyncStreamOperation for Request {
     async fn retrieve_from_async_stream<R>(r: &mut R) -> std::io::Result<Self>
     where

src/protocol/handshake/password_method/response.rs

@@ -2,8 +2,6 @@
 use crate::protocol::AsyncStreamOperation;
 use crate::protocol::StreamOperation;
 #[cfg(feature = "tokio")]
-use async_trait::async_trait;
-#[cfg(feature = "tokio")]
 use tokio::io::{AsyncRead, AsyncReadExt};
 
 #[repr(u8)]
@@ -90,7 +88,7 @@ impl StreamOperation for Response {
 }
 
 #[cfg(feature = "tokio")]
-#[async_trait]
+#[async_trait::async_trait]
 impl AsyncStreamOperation for Response {
     async fn retrieve_from_async_stream<R>(r: &mut R) -> std::io::Result<Self>
     where

src/protocol/handshake/request.rs

@@ -2,8 +2,6 @@
 use crate::protocol::AsyncStreamOperation;
 use crate::protocol::{AuthMethod, StreamOperation, Version};
 #[cfg(feature = "tokio")]
-use async_trait::async_trait;
-#[cfg(feature = "tokio")]
 use tokio::io::{AsyncRead, AsyncReadExt};
 
 /// SOCKS5 handshake request
@@ -67,7 +65,7 @@ impl StreamOperation for Request {
 }
 
 #[cfg(feature = "tokio")]
-#[async_trait]
+#[async_trait::async_trait]
 impl AsyncStreamOperation for Request {
     async fn retrieve_from_async_stream<R>(r: &mut R) -> std::io::Result<Self>
     where

src/protocol/handshake/response.rs

@@ -2,8 +2,6 @@
 use crate::protocol::AsyncStreamOperation;
 use crate::protocol::{AuthMethod, StreamOperation, Version};
 #[cfg(feature = "tokio")]
-use async_trait::async_trait;
-#[cfg(feature = "tokio")]
 use tokio::io::{AsyncRead, AsyncReadExt};
 
 /// SOCKS5 handshake response
@@ -55,7 +53,7 @@ impl StreamOperation for Response {
 }
 
 #[cfg(feature = "tokio")]
-#[async_trait]
+#[async_trait::async_trait]
 impl AsyncStreamOperation for Response {
     async fn retrieve_from_async_stream<R>(r: &mut R) -> std::io::Result<Self>
     where

src/protocol/mod.rs

@@ -20,8 +20,6 @@ pub use self::{
 };
 pub use bytes::BufMut;
 
-#[cfg(feature = "tokio")]
-use async_trait::async_trait;
 #[cfg(feature = "tokio")]
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
 
@@ -81,7 +79,7 @@ pub trait StreamOperation {
 }
 
 #[cfg(feature = "tokio")]
-#[async_trait]
+#[async_trait::async_trait]
 pub trait AsyncStreamOperation: StreamOperation {
     async fn retrieve_from_async_stream<R>(r: &mut R) -> std::io::Result<Self>
     where

src/protocol/request.rs

@@ -2,8 +2,6 @@
 use crate::protocol::AsyncStreamOperation;
 use crate::protocol::{Address, Command, StreamOperation, Version};
 #[cfg(feature = "tokio")]
-use async_trait::async_trait;
-#[cfg(feature = "tokio")]
 use tokio::io::{AsyncRead, AsyncReadExt};
 
 /// SOCKS5 request
@@ -60,7 +58,7 @@ impl StreamOperation for Request {
 }
 
 #[cfg(feature = "tokio")]
-#[async_trait]
+#[async_trait::async_trait]
 impl AsyncStreamOperation for Request {
     async fn retrieve_from_async_stream<R>(r: &mut R) -> std::io::Result<Self>
     where

src/protocol/response.rs

@@ -2,8 +2,6 @@
 use crate::protocol::AsyncStreamOperation;
 use crate::protocol::{Address, Reply, StreamOperation, Version};
 #[cfg(feature = "tokio")]
-use async_trait::async_trait;
-#[cfg(feature = "tokio")]
 use tokio::io::{AsyncRead, AsyncReadExt};
 
 /// Response
@@ -60,7 +58,7 @@ impl StreamOperation for Response {
 }
 
 #[cfg(feature = "tokio")]
-#[async_trait]
+#[async_trait::async_trait]
 impl AsyncStreamOperation for Response {
     async fn retrieve_from_async_stream<R>(r: &mut R) -> std::io::Result<Self>
     where