chore: clippy fix (#1706)

* chore: clippy fix * clippy fix for bsd
shadowsocks · Oct 5, 2024 · e44cc27 · e44cc27
1 parent f4c7aa1
commit e44cc27
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 34 deletions.
diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/freebsd.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/freebsd.rs
@@ -55,16 +55,8 @@ impl UdpRedirSocket {
         socket.set_reuse_address(true)?;
         if reuse_port {
             if let Err(err) = socket.set_reuse_port(true) {
-                if let Some(errno) = err.raw_os_error() {
-                    match errno {
-                        libc::ENOPROTOOPT => {
-                            trace!("failed to set SO_REUSEPORT, error: {}", err);
-                        }
-                        _ => {
-                            error!("failed to set SO_REUSEPORT, error: {}", err);
-                            return Err(err);
-                        }
-                    }
+                if let Some(libc::ENOPROTOOPT) = err.raw_os_error() {
+                    trace!("failed to set SO_REUSEPORT, error: {}", err);
                 } else {
                     error!("failed to set SO_REUSEPORT, error: {}", err);
                     return Err(err);

diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs
@@ -54,16 +54,8 @@ impl UdpRedirSocket {
         socket.set_reuse_address(true)?;
         if reuse_port {
             if let Err(err) = socket.set_reuse_port(true) {
-                if let Some(errno) = err.raw_os_error() {
-                    match errno {
-                        libc::ENOPROTOOPT => {
-                            trace!("failed to set SO_REUSEPORT, error: {}", err);
-                        }
-                        _ => {
-                            error!("failed to set SO_REUSEPORT, error: {}", err);
-                            return Err(err);
-                        }
-                    }
+                if let Some(libc::ENOPROTOOPT) = err.raw_os_error() {
+                    trace!("failed to set SO_REUSEPORT, error: {}", err);
                 } else {
                     error!("failed to set SO_REUSEPORT, error: {}", err);
                     return Err(err);

diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/openbsd.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/openbsd.rs
@@ -57,16 +57,8 @@ impl UdpRedirSocket {
         socket.set_reuse_address(true)?;
         if reuse_port {
             if let Err(err) = socket.set_reuse_port(true) {
-                if let Some(errno) = err.raw_os_error() {
-                    match errno {
-                        libc::ENOPROTOOPT => {
-                            trace!("failed to set SO_REUSEPORT, error: {}", err);
-                        }
-                        _ => {
-                            error!("failed to set SO_REUSEPORT, error: {}", err);
-                            return Err(err);
-                        }
-                    }
+                if let Some(libc::ENOPROTOOPT) = err.raw_os_error() {
+                    trace!("failed to set SO_REUSEPORT, error: {}", err);
                 } else {
                     error!("failed to set SO_REUSEPORT, error: {}", err);
                     return Err(err);

diff --git a/crates/shadowsocks/src/relay/udprelay/compat.rs b/crates/shadowsocks/src/relay/udprelay/compat.rs
@@ -181,8 +181,7 @@ pub trait DatagramReceiveExt: DatagramReceive {
     }
 
     /// Async method for `poll_recv_ready`
-    #[allow(clippy::needless_lifetimes)]
-    fn recv_ready<'a>(&'a self) -> RecvReadyFut<'a, Self> {
+    fn recv_ready(&self) -> RecvReadyFut<'_, Self> {
         RecvReadyFut { io: self }
     }
 }
@@ -202,8 +201,7 @@ pub trait DatagramSendExt: DatagramSend {
     }
 
     /// Async method for `poll_send_ready`
-    #[allow(clippy::needless_lifetimes)]
-    fn send_ready<'a>(&'a self) -> SendReadyFut<'a, Self> {
+    fn send_ready(&self) -> SendReadyFut<'_, Self> {
         SendReadyFut { io: self }
     }
 }