cargo fmt

Author: lazytiger

src/proxy/idle_pool.rs

@@ -4,10 +4,10 @@ use mio::{event::Event, net::TcpStream, Poll, Token};
 use rustls::{ClientConfig, ClientSession};
 use webpki::DNSName;
 
-use crate::resolver::EventedResolver;
 use crate::{
     config::Opts,
     proxy::{next_index, CHANNEL_CNT, CHANNEL_IDLE, MIN_INDEX, RESOLVER},
+    resolver::EventedResolver,
     sys,
     tls_conn::TlsConn,
 };

src/proxy/mod.rs

@@ -13,12 +13,12 @@ use rustls::ClientConfig;
 use socket2::{Domain, Protocol, SockAddr, Socket, Type};
 use webpki::DNSNameRef;
 
-use crate::resolver::EventedResolver;
 use crate::{
     config::Opts,
     proxy::{
         idle_pool::IdlePool, tcp_server::TcpServer, udp_cache::UdpSvrCache, udp_server::UdpServer,
     },
+    resolver::EventedResolver,
     sys,
 };
 

src/proxy/tcp_server.rs

@@ -13,11 +13,11 @@ use mio::{
 };
 use rustls::ClientSession;
 
-use crate::resolver::EventedResolver;
 use crate::{
     config::Opts,
     proto::{TrojanRequest, CONNECT, MAX_BUFFER_SIZE, MAX_PACKET_SIZE},
     proxy::{idle_pool::IdlePool, next_index, CHANNEL_CLIENT, CHANNEL_CNT, CHANNEL_TCP, MIN_INDEX},
+    resolver::EventedResolver,
     sys, tcp_util,
     tls_conn::{ConnStatus, TlsConn},
 };

src/proxy/udp_server.rs

@@ -4,7 +4,6 @@ use bytes::BytesMut;
 use mio::{event::Event, net::UdpSocket, Poll, Token};
 use rustls::ClientSession;
 
-use crate::resolver::EventedResolver;
 use crate::{
     config::Opts,
     proto::{
@@ -15,6 +14,7 @@ use crate::{
         idle_pool::IdlePool, next_index, udp_cache::UdpSvrCache, CHANNEL_CNT, CHANNEL_UDP,
         MIN_INDEX,
     },
+    resolver::EventedResolver,
     sys,
     tls_conn::{ConnStatus, TlsConn},
 };

src/server/connection.rs

@@ -7,10 +7,10 @@ use mio::{
 };
 use rustls::ServerSession;
 
-use crate::resolver::EventedResolver;
 use crate::{
     config::Opts,
     proto::{Sock5Address, TrojanRequest, CONNECT},
+    resolver::EventedResolver,
     server::{
         tcp_backend::TcpBackend, tls_server::Backend, udp_backend::UdpBackend, CHANNEL_BACKEND,
         CHANNEL_CNT, CHANNEL_PROXY,

src/server/mod.rs

@@ -13,8 +13,7 @@ use rustls::{
 
 pub use tls_server::TlsServer;
 
-use crate::config::Opts;
-use crate::resolver::EventedResolver;
+use crate::{config::Opts, resolver::EventedResolver};
 
 mod connection;
 mod tcp_backend;

src/server/tls_server.rs

@@ -7,9 +7,9 @@ use std::{
 use mio::{event::Event, net::TcpListener, Poll, Token};
 use rustls::{ServerConfig, ServerSession};
 
-use crate::resolver::EventedResolver;
 use crate::{
     config::Opts,
+    resolver::EventedResolver,
     server::{connection::Connection, CHANNEL_CNT, CHANNEL_PROXY, MAX_INDEX, MIN_INDEX},
     sys,
     tls_conn::{ConnStatus, TlsConn},