rust edition 2024

Author: ssrlive

Cargo.toml

@@ -5,13 +5,13 @@ authors = ["ssrlive <[email protected]>"]
 description = "Fundamental abstractions and async read / write functions for SOCKS5 protocol and Relatively low-level asynchronized SOCKS5 server implementation based on tokio"
 categories = ["network-programming", "asynchronous"]
 keywords = ["socks5", "socks", "proxy", "async", "network"]
-edition = "2021"
+edition = "2024"
 readme = "README.md"
 license = "GPL-3.0-or-later"
 repository = "https://github.com/ssrlive/socks5-impl"
 
 [features]
-# default = ["serde", "client", "server", "tokio"]
+default = ["serde", "client", "server", "tokio"]
 client = ["tokio"]
 serde = ["dep:serde"]
 server = ["tokio"]

examples/demo-client.rs

@@ -1,4 +1,4 @@
-use socks5_impl::{client, Result};
+use socks5_impl::{Result, client};
 use tokio::io::{AsyncReadExt, AsyncWriteExt, BufStream};
 use tokio::net::TcpStream;
 

examples/demo-server.rs

@@ -1,4 +1,4 @@
-use socks5_impl::protocol::{handshake, Address, AsyncStreamOperation, AuthMethod, Reply, Request, Response};
+use socks5_impl::protocol::{Address, AsyncStreamOperation, AuthMethod, Reply, Request, Response, handshake};
 use std::io;
 use tokio::{io::AsyncWriteExt, net::TcpListener};
 

examples/dns-query.rs

@@ -1,7 +1,7 @@
 mod util;
 
 use hickory_proto::rr::record_type::RecordType;
-use socks5_impl::{client, protocol::UserKey, Result};
+use socks5_impl::{Result, client, protocol::UserKey};
 use std::{net::SocketAddr, time::Duration};
 use tokio::{
     io::{AsyncReadExt, AsyncWriteExt},

examples/s5-server.rs

@@ -1,11 +1,11 @@
 use socks5_impl::{
-    protocol::{Address, Reply, UdpHeader},
-    server::{auth, connection::associate, AssociatedUdpSocket, ClientConnection, IncomingConnection, Server, UdpAssociate},
     Error, Result,
+    protocol::{Address, Reply, UdpHeader},
+    server::{AssociatedUdpSocket, ClientConnection, IncomingConnection, Server, UdpAssociate, auth, connection::associate},
 };
 use std::{
     net::{SocketAddr, ToSocketAddrs},
-    sync::{atomic::AtomicBool, Arc},
+    sync::{Arc, atomic::AtomicBool},
 };
 use tokio::{
     io,

examples/udp-client.rs

@@ -1,4 +1,4 @@
-use socks5_impl::{client::UdpClientImpl, protocol::UserKey, Result};
+use socks5_impl::{Result, client::UdpClientImpl, protocol::UserKey};
 use std::{
     net::{SocketAddr, ToSocketAddrs},
     time::Duration,

examples/util/dns.rs

@@ -1,8 +1,8 @@
 #![allow(dead_code)]
 
 use hickory_proto::{
-    op::{header::MessageType, op_code::OpCode, query::Query, Message, ResponseCode},
-    rr::{record_type::RecordType, Name, RData},
+    op::{Message, ResponseCode, header::MessageType, op_code::OpCode, query::Query},
+    rr::{Name, RData, record_type::RecordType},
 };
 use std::{net::IpAddr, str::FromStr};
 

src/client/mod.rs

@@ -490,9 +490,9 @@ impl UdpClientImpl<SocksUdpClient> {
 #[cfg(test)]
 mod tests {
     use crate::{
+        Error, Result,
         client::{self, SocksListener, SocksUdpClient, UdpClientTrait},
         protocol::{Address, UserKey},
-        Error, Result,
     };
     use async_trait::async_trait;
     use std::{

src/protocol/handshake/password_method/mod.rs

@@ -18,7 +18,7 @@ pub struct UserKey {
 
 impl std::fmt::Display for UserKey {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
+        use percent_encoding::{NON_ALPHANUMERIC, percent_encode};
         match (self.username.is_empty(), self.password.is_empty()) {
             (true, true) => write!(f, ""),
             (true, false) => write!(f, ":{}", percent_encode(self.password.as_bytes(), NON_ALPHANUMERIC)),

src/protocol/mod.rs

@@ -10,8 +10,8 @@ pub use self::{
     address::{Address, AddressType},
     command::Command,
     handshake::{
-        password_method::{self, UserKey},
         AuthMethod,
+        password_method::{self, UserKey},
     },
     reply::Reply,
     request::Request,