make clippy happy

- allow clippy::collapsible_else_if, useful in separating feature blocks

Author: zonyitoo

.github/workflows/build-and-test.yml

@@ -47,6 +47,7 @@ jobs:
           name: clippy-${{ matrix.platform }}
           token: ${{ secrets.GITHUB_TOKEN }}
           args: |
-            --all-features --verbose -- -Z macro-backtrace
+            --verbose --features "local-redir local-dns dns-over-tls dns-over-https stream-cipher" -- -Z macro-backtrace
             -W clippy::absurd_extreme_comparisons
             -W clippy::erasing_op
+            -A clippy::collapsible_else_if

Cargo.lock

@@ -1477,26 +1477,22 @@ impl Config {
             }
         }
 
-        if self.config_type.is_server() {
-            if self.server.is_empty() {
-                let err = Error::new(
-                    ErrorKind::MissingField,
-                    "missing any valid servers in configuration",
-                    None,
-                );
-                return Err(err);
-            }
+        if self.config_type.is_server() && self.server.is_empty() {
+            let err = Error::new(
+                ErrorKind::MissingField,
+                "missing any valid servers in configuration",
+                None,
+            );
+            return Err(err);
         }
 
-        if self.config_type.is_manager() {
-            if self.manager.is_none() {
-                let err = Error::new(
-                    ErrorKind::MissingField,
-                    "missing `manager_addr` and `manager_port` in configuration",
-                    None,
-                );
-                return Err(err);
-            }
+        if self.config_type.is_manager() && self.manager.is_none() {
+            let err = Error::new(
+                ErrorKind::MissingField,
+                "missing `manager_addr` and `manager_port` in configuration",
+                None,
+            );
+            return Err(err);
         }
 
         for server in &self.server {

crates/shadowsocks-service/src/config.rs

@@ -186,7 +186,7 @@ impl From<Address> for socks5::Address {
 ///                 +----+----+----+----+----+----+----+----+----+----+....+----+
 ///                 | VN | CD | DSTPORT |      DSTIP        | USERID       |NULL|
 ///                 +----+----+----+----+----+----+----+----+----+----+....+----+
-///  # of bytes:	   1    1      2              4           variable       1
+///  # of bytes:      1    1      2              4           variable       1
 ///
 /// VN is the SOCKS protocol version number and should be 4. CD is the
 /// SOCKS command code and should be 1 for CONNECT request, 2 for BIND request. NULL is a byte
@@ -318,7 +318,7 @@ impl HandshakeRequest {
 ///             +----+----+----+----+----+----+----+----+
 ///             | VN | CD | DSTPORT |      DSTIP        |
 ///             +----+----+----+----+----+----+----+----+
-/// # of bytes:	   1    1      2              4
+/// # of bytes:   1    1      2              4
 /// ```
 #[derive(Debug, Clone)]
 pub struct HandshakeResponse {

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

@@ -14,6 +14,7 @@ use crate::{
 pub use self::server::Server;
 
 pub mod context;
+#[allow(clippy::module_inception)]
 pub mod server;
 mod tcprelay;
 mod udprelay;

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

@@ -145,6 +145,7 @@ impl Context {
     }
 
     /// Resolves DNS address to `SocketAddr`s
+    #[allow(clippy::needless_lifetimes)]
     pub async fn dns_resolve<'a>(&self, addr: &'a str, port: u16) -> io::Result<impl Iterator<Item = SocketAddr> + 'a> {
         self.dns_resolver.resolve(addr, port).await
     }

crates/shadowsocks/src/context.rs

@@ -33,6 +33,7 @@ pub struct TrustDnsSystemResolver {
 }
 
 /// Collections of DNS resolver
+#[allow(clippy::large_enum_variant)]
 pub enum DnsResolver {
     /// System Resolver, which is tokio's builtin resolver
     System,
@@ -42,8 +43,8 @@ pub enum DnsResolver {
         inner: Arc<TrustDnsSystemResolver>,
         abortable: AbortHandle,
     },
-    #[cfg(feature = "trust-dns")]
     /// Trust-DNS resolver
+    #[cfg(feature = "trust-dns")]
     TrustDns(TokioAsyncResolver),
     /// Customized Resolver
     Custom(Box<dyn DnsResolve + Send + Sync>),
@@ -217,6 +218,7 @@ impl DnsResolver {
     }
 
     /// Resolve address into `SocketAddr`s
+    #[allow(clippy::needless_lifetimes)]
     pub async fn resolve<'a>(&self, addr: &'a str, port: u16) -> io::Result<impl Iterator<Item = SocketAddr> + 'a> {
         struct ResolverLogger<'x, 'y> {
             resolver: &'x DnsResolver,

crates/shadowsocks/src/dns_resolver/resolver.rs

@@ -304,14 +304,14 @@ impl ManagerProtocol for ManagerRequest {
         let cmd = nsplit.next().expect("first element shouldn't be None");
         match str::from_utf8(cmd)?.trim() {
             "add" => match nsplit.next() {
-                None => return Err(Error::MissingParameter),
+                None => Err(Error::MissingParameter),
                 Some(param) => {
                     let req = serde_json::from_slice(param)?;
                     Ok(ManagerRequest::Add(req))
                 }
             },
             "remove" => match nsplit.next() {
-                None => return Err(Error::MissingParameter),
+                None => Err(Error::MissingParameter),
                 Some(param) => {
                     let req = serde_json::from_slice(param)?;
                     Ok(ManagerRequest::Remove(req))
@@ -330,7 +330,7 @@ impl ManagerProtocol for ManagerRequest {
                 Ok(ManagerRequest::Ping(PingRequest))
             }
             "stat" => match nsplit.next() {
-                None => return Err(Error::MissingParameter),
+                None => Err(Error::MissingParameter),
                 Some(param) => {
                     let req = serde_json::from_slice(param)?;
                     Ok(ManagerRequest::Stat(req))

crates/shadowsocks/src/manager/protocol.rs

@@ -118,9 +118,9 @@ impl From<TokioTcpStream> for TcpStream {
     }
 }
 
-impl Into<TokioTcpStream> for TcpStream {
-    fn into(self) -> TokioTcpStream {
-        self.0
+impl From<TcpStream> for TokioTcpStream {
+    fn from(s: TcpStream) -> TokioTcpStream {
+        s.0
     }
 }
 
@@ -233,9 +233,9 @@ impl DerefMut for TcpListener {
     }
 }
 
-impl Into<TokioTcpListener> for TcpListener {
-    fn into(self) -> TokioTcpListener {
-        self.inner
+impl From<TcpListener> for TokioTcpListener {
+    fn from(listener: TcpListener) -> TokioTcpListener {
+        listener.inner
     }
 }
 

crates/shadowsocks/src/net/tcp.rs

@@ -111,8 +111,8 @@ impl From<tokio::net::UdpSocket> for UdpSocket {
     }
 }
 
-impl Into<tokio::net::UdpSocket> for UdpSocket {
-    fn into(self) -> tokio::net::UdpSocket {
-        self.0
+impl From<UdpSocket> for tokio::net::UdpSocket {
+    fn from(s: UdpSocket) -> tokio::net::UdpSocket {
+        s.0
     }
 }