chore: imports_granularity set to default

- imports_granularity is still unstable since 2021:
  https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#imports_granularity

crates/shadowsocks-service/src/config.rs

@@ -70,14 +70,7 @@ use serde::{Deserialize, Serialize};
 use shadowsocks::relay::socks5::Address;
 use shadowsocks::{
     config::{
-        ManagerAddr,
+        ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerSource, ServerUser, ServerUserManager,
-        Mode,
-        ReplayAttackPolicy,
-        ServerAddr,
-        ServerConfig,
-        ServerSource,
-        ServerUser,
-        ServerUserManager,
         ServerWeight,
     },
     crypto::CipherKind,

crates/shadowsocks-service/src/local/fake_dns/processor.rs

@@ -6,10 +6,7 @@ use hickory_resolver::proto::{
     op::{header::MessageType, response_code::ResponseCode, Header, Message, OpCode},
     rr::{
         rdata::{A, AAAA},
-        DNSClass,
+        DNSClass, RData, Record, RecordType,
-        RData,
-        Record,
-        RecordType,
     },
 };
 use log::{debug, trace};

crates/shadowsocks-service/src/local/http/http_client.rs

@@ -16,8 +16,7 @@ use hyper::{
     client::conn::{http1, http2},
     http::uri::Scheme,
     rt::{Sleep, Timer},
-    Request,
+    Request, Response,
-    Response,
 };
 use log::{error, trace};
 use lru_time_cache::LruCache;

crates/shadowsocks-service/src/local/http/http_service.rs

@@ -8,13 +8,7 @@ use hyper::{
     body,
     header::{self, HeaderValue},
     http::uri::{Authority, Scheme},
-    HeaderMap,
+    HeaderMap, Method, Request, Response, StatusCode, Uri, Version,
-    Method,
-    Request,
-    Response,
-    StatusCode,
-    Uri,
-    Version,
 };
 use log::{debug, error, trace};
 use shadowsocks::relay::Address;

crates/shadowsocks-service/src/local/http/server.rs

@@ -13,9 +13,7 @@ use tokio::{
 };
 
 use crate::local::{
-    context::ServiceContext,
+    context::ServiceContext, loadbalancing::PingBalancer, net::tcp::listener::create_standard_tcp_listener,
-    loadbalancing::PingBalancer,
-    net::tcp::listener::create_standard_tcp_listener,
 };
 
 use super::{http_client::HttpClient, http_service::HttpService, tokio_rt::TokioIo};

crates/shadowsocks-service/src/local/http/utils.rs

@@ -9,9 +9,7 @@ use std::{
 use hyper::{
     header::{self, HeaderValue},
     http::uri::Authority,
-    HeaderMap,
+    HeaderMap, Uri, Version,
-    Uri,
-    Version,
 };
 use log::error;
 use shadowsocks::relay::socks5::Address;

crates/shadowsocks-service/src/local/net/udp/association.rs

@@ -29,9 +29,7 @@ use shadowsocks::{
 use crate::{
     local::{context::ServiceContext, loadbalancing::PingBalancer},
     net::{
-        packet_window::PacketWindowFilter,
+        packet_window::PacketWindowFilter, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
-        MonProxySocket,
-        UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
         UDP_ASSOCIATION_SEND_CHANNEL_SIZE,
     },
 };

crates/shadowsocks-service/src/local/socks/client/socks5/tcp_client.rs

@@ -9,15 +9,7 @@ use std::{
 use log::trace;
 use pin_project::pin_project;
 use shadowsocks::relay::socks5::{
-    self,
+    self, Address, Command, Error, HandshakeRequest, HandshakeResponse, Reply, TcpRequestHeader, TcpResponseHeader,
-    Address,
-    Command,
-    Error,
-    HandshakeRequest,
-    HandshakeResponse,
-    Reply,
-    TcpRequestHeader,
-    TcpResponseHeader,
 };
 use tokio::{
     io::{AsyncRead, AsyncWrite, ReadBuf},

crates/shadowsocks-service/src/local/socks/server/server.rs

@@ -7,9 +7,7 @@ use tokio::{net::TcpStream, time};
 #[cfg(feature = "local-http")]
 use crate::local::http::HttpConnectionHandler;
 use crate::local::{
-    context::ServiceContext,
+    context::ServiceContext, loadbalancing::PingBalancer, net::tcp::listener::create_standard_tcp_listener,
-    loadbalancing::PingBalancer,
-    net::tcp::listener::create_standard_tcp_listener,
     socks::config::Socks5AuthConfig,
 };
 

crates/shadowsocks-service/src/local/socks/server/socks4/tcprelay.rs

@@ -21,12 +21,7 @@ use crate::local::{
 };
 
 use crate::local::socks::socks4::{
-    Address,
+    Address, Command, Error as Socks4Error, HandshakeRequest, HandshakeResponse, ResultCode,
-    Command,
-    Error as Socks4Error,
-    HandshakeRequest,
-    HandshakeResponse,
-    ResultCode,
 };
 
 pub struct Socks4TcpHandler {

crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs

@@ -11,17 +11,8 @@ use log::{debug, error, trace, warn};
 use shadowsocks::{
     config::Mode,
     relay::socks5::{
-        self,
+        self, Address, Command, Error as Socks5Error, HandshakeRequest, HandshakeResponse, PasswdAuthRequest,
-        Address,
+        PasswdAuthResponse, Reply, TcpRequestHeader, TcpResponseHeader,
-        Command,
-        Error as Socks5Error,
-        HandshakeRequest,
-        HandshakeResponse,
-        PasswdAuthRequest,
-        PasswdAuthResponse,
-        Reply,
-        TcpRequestHeader,
-        TcpResponseHeader,
     },
     ServerAddr,
 };

crates/shadowsocks-service/src/manager/server.rs

@@ -13,23 +13,13 @@ use shadowsocks::{
     manager::{
         datagram::ManagerSocketAddr,
         protocol::{
-            self,
+            self, AddRequest, AddResponse, ErrorResponse, ListResponse, ManagerRequest, PingResponse, RemoveRequest,
-            AddRequest,
+            RemoveResponse, ServerUserConfig, StatRequest,
-            AddResponse,
-            ErrorResponse,
-            ListResponse,
-            ManagerRequest,
-            PingResponse,
-            RemoveRequest,
-            RemoveResponse,
-            ServerUserConfig,
-            StatRequest,
         },
     },
     net::{AcceptOpts, ConnectOpts},
     plugin::PluginConfig,
-    ManagerListener,
+    ManagerListener, ServerAddr,
-    ServerAddr,
 };
 use tokio::{sync::Mutex, task::JoinHandle};
 

crates/shadowsocks-service/src/server/tcprelay.rs

@@ -13,8 +13,7 @@ use shadowsocks::{
     crypto::CipherKind,
     net::{AcceptOpts, TcpStream as OutboundTcpStream},
     relay::tcprelay::{utils::copy_encrypted_bidirectional, ProxyServerStream},
-    ProxyListener,
+    ProxyListener, ServerConfig,
-    ServerConfig,
 };
 use tokio::{
     io::{AsyncReadExt, AsyncWriteExt},

crates/shadowsocks-service/src/server/udprelay.rs

@@ -29,10 +29,7 @@ use tokio::{runtime::Handle, sync::mpsc, task::JoinHandle, time};
 use windows_sys::Win32::Networking::WinSock::WSAEAFNOSUPPORT;
 
 use crate::net::{
-    packet_window::PacketWindowFilter,
+    packet_window::PacketWindowFilter, utils::to_ipv4_mapped, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
-    utils::to_ipv4_mapped,
-    MonProxySocket,
-    UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
     UDP_ASSOCIATION_SEND_CHANNEL_SIZE,
 };
 

crates/shadowsocks/src/dns_resolver/hickory_dns_resolver.rs

@@ -20,8 +20,7 @@ use hickory_resolver::{
         udp::{DnsUdpSocket, QuicLocalAddr},
         TokioTime,
     },
-    AsyncResolver,
+    AsyncResolver, TokioHandle,
-    TokioHandle,
 };
 use log::trace;
 use tokio::{io::ReadBuf, net::UdpSocket};

crates/shadowsocks/src/manager/client.rs

@@ -8,16 +8,8 @@ use super::{
     datagram::ManagerDatagram,
     error::Error,
     protocol::{
-        AddRequest,
+        AddRequest, AddResponse, ListRequest, ListResponse, ManagerProtocol, PingRequest, PingResponse, RemoveRequest,
-        AddResponse,
+        RemoveResponse, StatRequest,
-        ListRequest,
-        ListResponse,
-        ManagerProtocol,
-        PingRequest,
-        PingResponse,
-        RemoveRequest,
-        RemoveResponse,
-        StatRequest,
     },
 };
 

crates/shadowsocks/src/net/sys/unix/bsd/freebsd.rs

@@ -1,6 +1,5 @@
 use std::{
-    io,
+    io, mem,
-    mem,
     net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
     os::unix::io::{AsRawFd, RawFd},
     pin::Pin,
@@ -21,9 +20,7 @@ use tokio_tfo::TfoStream;
 use crate::net::{
     sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
     udp::{BatchRecvMessage, BatchSendMessage},
-    AcceptOpts,
+    AcceptOpts, AddrFamily, ConnectOpts,
-    AddrFamily,
-    ConnectOpts,
 };
 
 /// A `TcpStream` that supports TFO (TCP Fast Open)

crates/shadowsocks/src/net/sys/unix/bsd/macos.rs

@@ -24,9 +24,7 @@ use tokio_tfo::TfoStream;
 use crate::net::{
     sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
     udp::{BatchRecvMessage, BatchSendMessage},
-    AcceptOpts,
+    AcceptOpts, AddrFamily, ConnectOpts,
-    AddrFamily,
-    ConnectOpts,
 };
 
 /// A `TcpStream` that supports TFO (TCP Fast Open)

crates/shadowsocks/src/net/sys/unix/linux/mod.rs

@@ -1,6 +1,5 @@
 use std::{
-    io,
+    io, mem,
-    mem,
     net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
     os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
     pin::Pin,
@@ -22,9 +21,7 @@ use tokio_tfo::TfoStream;
 use crate::net::{
     sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
     udp::{BatchRecvMessage, BatchSendMessage},
-    AcceptOpts,
+    AcceptOpts, AddrFamily, ConnectOpts,
-    AddrFamily,
-    ConnectOpts,
 };
 
 /// A `TcpStream` that supports TFO (TCP Fast Open)

crates/shadowsocks/src/net/sys/unix/others.rs

@@ -15,9 +15,7 @@ use tokio::{
 
 use crate::net::{
     sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, ErrorKind},
-    AcceptOpts,
+    AcceptOpts, AddrFamily, ConnectOpts,
-    AddrFamily,
-    ConnectOpts,
 };
 
 /// A wrapper of `TcpStream`

crates/shadowsocks/src/net/sys/windows/mod.rs

@@ -10,8 +10,7 @@ use std::{
         io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket},
     },
     pin::Pin,
-    ptr,
+    ptr, slice,
-    slice,
     task::{self, Poll},
     time::{Duration, Instant},
 };
@@ -30,32 +29,13 @@ use windows_sys::{
     Win32::{
         Foundation::{BOOL, ERROR_BUFFER_OVERFLOW, ERROR_NO_DATA, ERROR_SUCCESS},
         NetworkManagement::IpHelper::{
-            if_nametoindex,
+            if_nametoindex, GetAdaptersAddresses, GAA_FLAG_SKIP_ANYCAST, GAA_FLAG_SKIP_DNS_SERVER,
-            GetAdaptersAddresses,
+            GAA_FLAG_SKIP_MULTICAST, GAA_FLAG_SKIP_UNICAST, IP_ADAPTER_ADDRESSES_LH,
-            GAA_FLAG_SKIP_ANYCAST,
-            GAA_FLAG_SKIP_DNS_SERVER,
-            GAA_FLAG_SKIP_MULTICAST,
-            GAA_FLAG_SKIP_UNICAST,
-            IP_ADAPTER_ADDRESSES_LH,
         },
         Networking::WinSock::{
-            htonl,
+            htonl, setsockopt, WSAGetLastError, WSAIoctl, AF_UNSPEC, IPPROTO_IP, IPPROTO_IPV6, IPPROTO_TCP,
-            setsockopt,
+            IPV6_MTU_DISCOVER, IPV6_UNICAST_IF, IP_MTU_DISCOVER, IP_PMTUDISC_DO, IP_UNICAST_IF, SIO_UDP_CONNRESET,
-            WSAGetLastError,
+            SOCKET, SOCKET_ERROR, TCP_FASTOPEN,
-            WSAIoctl,
-            AF_UNSPEC,
-            IPPROTO_IP,
-            IPPROTO_IPV6,
-            IPPROTO_TCP,
-            IPV6_MTU_DISCOVER,
-            IPV6_UNICAST_IF,
-            IP_MTU_DISCOVER,
-            IP_PMTUDISC_DO,
-            IP_UNICAST_IF,
-            SIO_UDP_CONNRESET,
-            SOCKET,
-            SOCKET_ERROR,
-            TCP_FASTOPEN,
         },
     },
 };
@@ -66,9 +46,7 @@ const FALSE: BOOL = 0;
 use crate::net::{
     is_dual_stack_addr,
     sys::{set_common_sockopt_for_connect, socket_bind_dual_stack},
-    AcceptOpts,
+    AcceptOpts, AddrFamily, ConnectOpts,
-    AddrFamily,
-    ConnectOpts,
 };
 
 /// A `TcpStream` that supports TFO (TCP Fast Open)

crates/shadowsocks/src/net/tcp.rs

@@ -24,14 +24,10 @@ use crate::{context::Context, relay::socks5::Address, ServerAddr};
 use super::{
     is_dual_stack_addr,
     sys::{
-        create_inbound_tcp_socket,
+        create_inbound_tcp_socket, set_common_sockopt_after_accept, set_tcp_fastopen, socket_bind_dual_stack,
-        set_common_sockopt_after_accept,
-        set_tcp_fastopen,
-        socket_bind_dual_stack,
         TcpStream as SysTcpStream,
     },
-    AcceptOpts,
+    AcceptOpts, ConnectOpts,
-    ConnectOpts,
 };
 
 /// TcpStream for outbound connections

crates/shadowsocks/src/net/udp.rs

@@ -39,9 +39,7 @@ use crate::{context::Context, relay::socks5::Address, ServerAddr};
 
 use super::{
     sys::{bind_outbound_udp_socket, create_inbound_udp_socket, create_outbound_udp_socket},
-    AcceptOpts,
+    AcceptOpts, AddrFamily, ConnectOpts,
-    AddrFamily,
-    ConnectOpts,
 };
 
 /// Message struct for `batch_send`

crates/shadowsocks/src/relay/socks5.rs

@@ -16,10 +16,7 @@ use bytes::{Buf, BufMut, BytesMut};
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 
 pub use self::consts::{
-    SOCKS5_AUTH_METHOD_GSSAPI,
+    SOCKS5_AUTH_METHOD_GSSAPI, SOCKS5_AUTH_METHOD_NONE, SOCKS5_AUTH_METHOD_NOT_ACCEPTABLE, SOCKS5_AUTH_METHOD_PASSWORD,
-    SOCKS5_AUTH_METHOD_NONE,
-    SOCKS5_AUTH_METHOD_NOT_ACCEPTABLE,
-    SOCKS5_AUTH_METHOD_PASSWORD,
 };
 
 #[rustfmt::skip]

crates/shadowsocks/src/relay/tcprelay/aead_2022.rs

@@ -55,9 +55,7 @@ use std::{
 
 use aes::{
     cipher::{BlockDecrypt, BlockEncrypt, KeyInit},
-    Aes128,
+    Aes128, Aes256, Block,
-    Aes256,
-    Block,
 };
 use byte_string::ByteStr;
 use bytes::{Buf, BufMut, Bytes, BytesMut};

crates/shadowsocks/src/relay/udprelay/aead_2022.rs

@@ -58,9 +58,7 @@ use std::{
 
 use aes::{
     cipher::{BlockDecrypt, BlockEncrypt, KeyInit},
-    Aes128,
+    Aes128, Aes256, Block,
-    Aes256,
-    Block,
 };
 use byte_string::ByteStr;
 use bytes::{Buf, BufMut, Bytes, BytesMut};

crates/shadowsocks/src/relay/udprelay/crypto_io.rs

@@ -32,9 +32,7 @@ use crate::{
 
 #[cfg(feature = "aead-cipher-2022")]
 use super::aead_2022::{
-    decrypt_client_payload_aead_2022,
+    decrypt_client_payload_aead_2022, decrypt_server_payload_aead_2022, encrypt_client_payload_aead_2022,
-    decrypt_server_payload_aead_2022,
-    encrypt_client_payload_aead_2022,
     encrypt_server_payload_aead_2022,
 };
 #[cfg(feature = "stream-cipher")]

crates/shadowsocks/src/relay/udprelay/proxy_socket.rs

@@ -23,11 +23,7 @@ use crate::{
 };
 
 use super::crypto_io::{
-    decrypt_client_payload,
+    decrypt_client_payload, decrypt_server_payload, encrypt_client_payload, encrypt_server_payload, ProtocolError,
-    decrypt_server_payload,
-    encrypt_client_payload,
-    encrypt_server_payload,
-    ProtocolError,
     ProtocolResult,
 };
 

crates/shadowsocks/tests/tcp.rs

@@ -24,8 +24,7 @@ use shadowsocks::{
             utils::{copy_from_encrypted, copy_to_encrypted},
         },
     },
-    ProxyClientStream,
+    ProxyClientStream, ProxyListener,
-    ProxyListener,
 };
 
 async fn handle_tcp_tunnel_server_client(

crates/shadowsocks/tests/tcp_tfo.rs

@@ -21,9 +21,7 @@ use shadowsocks::{
         socks5::Address,
         tcprelay::utils::{copy_from_encrypted, copy_to_encrypted},
     },
-    ProxyClientStream,
+    ProxyClientStream, ProxyListener, ServerConfig,
-    ProxyListener,
-    ServerConfig,
 };
 use tokio::{
     io::{AsyncBufReadExt, AsyncWriteExt, BufReader},

rustfmt.toml

@@ -15,4 +15,4 @@ use_try_shorthand = true
 reorder_impl_items = true
 #use_small_heuristics = "Max"
 imports_layout = "HorizontalVertical"
-imports_granularity = "Crate"
+#imports_granularity = "Crate"

src/service/local.rs

@@ -24,12 +24,7 @@ use shadowsocks_service::shadowsocks::relay::socks5::Address;
 use shadowsocks_service::{
     acl::AccessControl,
     config::{
-        read_variable_field_value,
+        read_variable_field_value, Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType,
-        Config,
-        ConfigType,
-        LocalConfig,
-        LocalInstanceConfig,
-        ProtocolType,
         ServerInstanceConfig,
     },
     local::{loadbalancing::PingBalancer, Server},
@@ -44,8 +39,7 @@ use shadowsocks_service::{
 use crate::logging;
 use crate::{
     config::{Config as ServiceConfig, RuntimeMode},
-    monitor,
+    monitor, vparser,
-    vparser,
 };
 
 #[cfg(feature = "local-dns")]

src/service/manager.rs

@@ -27,8 +27,7 @@ use shadowsocks_service::{
 use crate::logging;
 use crate::{
     config::{Config as ServiceConfig, RuntimeMode},
-    monitor,
+    monitor, vparser,
-    vparser,
 };
 
 /// Defines command line options

src/service/server.rs

@@ -25,8 +25,7 @@ use shadowsocks_service::{
 use crate::logging;
 use crate::{
     config::{Config as ServiceConfig, RuntimeMode},
-    monitor,
+    monitor, vparser,
-    vparser,
 };
 
 /// Defines command line options

tests/dns.rs

@@ -11,8 +11,7 @@ use tokio::{
 
 use shadowsocks_service::{
     config::{Config, ConfigType},
-    run_local,
+    run_local, run_server,
-    run_server,
 };
 
 #[tokio::test]

tests/http.rs

@@ -10,8 +10,7 @@ use tokio::{
 
 use shadowsocks_service::{
     config::{Config, ConfigType},
-    run_local,
+    run_local, run_server,
-    run_server,
 };
 
 #[tokio::test]

tests/socks4.rs

@@ -13,8 +13,7 @@ use tokio::{
 use shadowsocks_service::{
     config::{Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType, ServerInstanceConfig},
     local::socks::client::Socks4TcpClient,
-    run_local,
+    run_local, run_server,
-    run_server,
     shadowsocks::{
         config::{ServerAddr, ServerConfig},
         crypto::CipherKind,

tests/socks5.rs

@@ -13,8 +13,7 @@ use tokio::{
 use shadowsocks_service::{
     config::{Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType, ServerInstanceConfig},
     local::socks::client::socks5::Socks5TcpClient,
-    run_local,
+    run_local, run_server,
-    run_server,
     shadowsocks::{
         config::{Mode, ServerAddr, ServerConfig},
         crypto::CipherKind,

tests/tunnel.rs

@@ -11,8 +11,7 @@ use tokio::{
 
 use shadowsocks_service::{
     config::{Config, ConfigType},
-    run_local,
+    run_local, run_server,
-    run_server,
 };
 
 fn random_local_tcp_port() -> u16 {

tests/udp.rs

@@ -9,8 +9,7 @@ use tokio::time::{self, Duration};
 use shadowsocks_service::{
     config::{Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType, ServerInstanceConfig},
     local::socks::client::socks5::Socks5UdpClient,
-    run_local,
+    run_local, run_server,
-    run_server,
     shadowsocks::{config::Mode, crypto::CipherKind, relay::socks5::Address, ServerConfig},
 };