style: make clippy happy

Watfaq · Apr 9, 2024 · 03d3926 · 03d3926
1 parent a55436d
commit 03d3926
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/clash_lib/src/proxy/http/inbound/connector.rs b/clash_lib/src/proxy/http/inbound/connector.rs
@@ -51,7 +51,6 @@ impl tower::Service<Uri> for Connector {
                 typ: Type::Http,
                 source: src,
                 destination: destination.ok_or(ProxyError::InvalidUrl(url.to_string()))?,
-                ..Default::default()
             };
 
             tokio::spawn(async move {

diff --git a/clash_lib/src/proxy/http/inbound/proxy.rs b/clash_lib/src/proxy/http/inbound/proxy.rs
@@ -65,8 +65,6 @@ async fn proxy(
                             typ: Type::HttpConnect,
                             source: src,
                             destination: addr,
-
-                            ..Default::default()
                         };
 
                         dispatcher.dispatch_stream(sess, upgraded).await

diff --git a/clash_lib/src/proxy/tun/inbound.rs b/clash_lib/src/proxy/tun/inbound.rs
@@ -26,7 +26,6 @@ async fn handle_inbound_stream(
         typ: Type::Tun,
         source: local_addr,
         destination: remote_addr.into(),
-        ..Default::default()
     };
 
     dispatcher.dispatch_stream(sess, stream).await;

diff --git a/clash_lib/src/proxy/utils/socket_helpers.rs b/clash_lib/src/proxy/utils/socket_helpers.rs
@@ -100,12 +100,12 @@ pub async fn new_tcp_stream<'a>(
     };
 
     let global_iface = get_iface();
-    if let Some(iface) = iface.or_else(|| global_iface.as_ref()) {
-        must_bind_socket_on_interface(&socket, &iface)?;
+    if let Some(iface) = iface.or(global_iface.as_ref()) {
+        must_bind_socket_on_interface(&socket, iface)?;
     }
 
     #[cfg(target_os = "linux")]
-    if let Some(packet_mark) = packet_mark.or_else(|| get_somark()) {
+    if let Some(packet_mark) = packet_mark.or_else(get_somark) {
         socket.set_mark(packet_mark)?;
     }
 
@@ -143,12 +143,12 @@ pub async fn new_udp_socket(
     }
 
     let global_iface = get_iface();
-    if let Some(iface) = iface.or_else(|| global_iface.as_ref()) {
-        must_bind_socket_on_interface(&socket, &iface)?;
+    if let Some(iface) = iface.or(global_iface.as_ref()) {
+        must_bind_socket_on_interface(&socket, iface)?;
     }
 
     #[cfg(target_os = "linux")]
-    if let Some(packet_mark) = packet_mark.or_else(|| get_somark()) {
+    if let Some(packet_mark) = packet_mark.or_else(get_somark) {
         socket.set_mark(packet_mark)?;
     }