f

Watfaq · Sep 23, 2024 · 02c0f09 · 02c0f09
1 parent 43f6108
commit 02c0f09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/clash_lib/src/proxy/shadowsocks/datagram.rs b/clash_lib/src/proxy/shadowsocks/datagram.rs
@@ -237,9 +237,9 @@ impl DatagramSend for ShadowsocksUdpIo {
         match w.poll_flush_unpin(cx) {
             Poll::Ready(Ok(())) => Poll::Ready(Ok(buf.len())),
             Poll::Ready(Err(e)) => {
-                return Poll::Ready(Err(new_io_error(e.to_string())))
+                Poll::Ready(Err(new_io_error(e.to_string())))
             }
-            Poll::Pending => return Poll::Pending,
+            Poll::Pending => Poll::Pending,
         }
     }
 
@@ -275,8 +275,8 @@ impl DatagramReceive for ShadowsocksUdpIo {
                     }
                     Poll::Ready(Ok(()))
                 }
-                Poll::Pending => return Poll::Pending,
-                Poll::Ready(None) => return Poll::Ready(Ok(())),
+                Poll::Pending => Poll::Pending,
+                Poll::Ready(None) => Poll::Ready(Ok(())),
             }
         }
     }

diff --git a/clash_lib/src/proxy/tun/mod.rs b/clash_lib/src/proxy/tun/mod.rs
@@ -87,7 +87,7 @@ mod tests {
         let log_path = cwd + "/" + &log_file + "." + &today.to_string();
 
         let logs = std::fs::read_to_string(&log_path)
-            .expect(format!("failed to read log file: {}", log_path).as_str());
+            .unwrap_or_else(|_| panic!("failed to read log file: {}", log_path));
 
         assert!(logs.contains("1.1.1.1:53 to MATCH"));
 
@@ -161,7 +161,7 @@ mod tests {
         let log_path = cwd + "/" + &log_file + "." + &today.to_string();
 
         let logs = std::fs::read_to_string(&log_path)
-            .expect(format!("failed to read log file: {}", log_path).as_str());
+            .unwrap_or_else(|_| panic!("failed to read log file: {}", log_path));
 
         assert!(logs.contains("route_all is enabled"));
         assert!(logs.contains(format!("{} to MATCH", echo_addr).as_str()));