rust edition 2024

Author: ssrlive

.github/workflows/auto-merge.yml

@@ -16,6 +16,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: dtolnay/rust-toolchain@stable
       - name: Auto approve pull request, then squash and merge
         uses: ahmadnassri/action-dependabot-auto-merge@v2
         with:

.github/workflows/release.yml

@@ -41,6 +41,7 @@ jobs:
     runs-on: ${{ matrix.host_os }}
     steps:
       - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
 
       - name: Prepare
         shell: bash

.github/workflows/rust.yml

@@ -22,6 +22,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
     - name: rustfmt
       run: cargo fmt --all -- --check
     - name: check

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};