refactor: remove dead code

Author: Banyc

common/src/filter.rs

@@ -135,12 +135,13 @@ impl LeafMatcher {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(deny_unknown_fields)]
 #[serde(untagged)]
 enum AddrListMatcherBuilder {
     Many(Vec<AddrMatcherBuilder>),
     Single(AddrMatcherBuilder),
+    #[default]
     Any,
 }
 impl AddrListMatcherBuilder {
@@ -157,11 +158,6 @@ impl AddrListMatcherBuilder {
         })
     }
 }
-impl Default for AddrListMatcherBuilder {
-    fn default() -> Self {
-        Self::Any
-    }
-}
 
 #[derive(Debug, Clone)]
 enum AddrListMatcher {
@@ -233,12 +229,13 @@ impl AddrMatcher {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(deny_unknown_fields)]
 #[serde(untagged)]
 enum PortListMatcherBuilder {
     Many(Vec<PortMatcherBuilder>),
     Single(PortMatcherBuilder),
+    #[default]
     Any,
 }
 impl PortListMatcherBuilder {
@@ -255,11 +252,6 @@ impl PortListMatcherBuilder {
         }
     }
 }
-impl Default for PortListMatcherBuilder {
-    fn default() -> Self {
-        Self::Any
-    }
-}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]

common/src/notify.rs

@@ -14,6 +14,9 @@ pub struct Waiter {
     waiters: Arc<Mutex<Waiters>>,
 }
 impl Waiter {
+    pub fn has_notified(&self) -> bool {
+        !self.event.is_empty()
+    }
     pub async fn notified(&mut self) {
         self.event.recv().await.unwrap();
     }

common/src/proto/client/stream.rs

@@ -14,7 +14,7 @@ use crate::{
 use ae::anti_replay::ValidatorRef;
 use metrics::counter;
 use thiserror::Error;
-use tracing::{error, instrument, trace};
+use tracing::{instrument, trace};
 
 const IO_TIMEOUT: Duration = Duration::from_secs(60);
 

common/src/proto/client/udp.rs

@@ -29,7 +29,7 @@ use metrics::counter;
 use primitive::arena::obj_pool::ArcObjPool;
 use thiserror::Error;
 use tokio::net::UdpSocket;
-use tracing::{error, instrument, trace, warn};
+use tracing::{instrument, trace, warn};
 
 #[derive(Debug)]
 pub struct UdpProxyClient {

common/src/proto/conn_handler/stream.rs

@@ -17,7 +17,7 @@ use crate::{
 use async_speed_limit::Limiter;
 use serde::Deserialize;
 use thiserror::Error;
-use tracing::{error, info, instrument, warn};
+use tracing::{info, instrument, warn};
 
 const IO_TIMEOUT: Duration = Duration::from_secs(60);
 

common/src/proto/conn_handler/udp.rs

@@ -22,7 +22,7 @@ use crate::{
 use async_speed_limit::Limiter;
 use thiserror::Error;
 use tokio::net::{ToSocketAddrs, UdpSocket};
-use tracing::{error, instrument, trace, warn};
+use tracing::{instrument, trace, warn};
 use udp_listener::{Conn, ConnWrite};
 
 use super::ListenerBindError;

common/src/udp/mod.rs

@@ -1,7 +1,6 @@
 use std::time::Duration;
 
 use thiserror::Error;
-use tracing::error;
 
 pub mod respond;
 pub mod server;

protocol/src/socks5/server/tcp.rs

@@ -27,7 +27,7 @@ use common::{
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::io::AsyncReadExt;
-use tracing::{error, trace, warn};
+use tracing::{trace, warn};
 
 use crate::socks5::messages::{
     Command, MethodIdentifier, NegotiationRequest, NegotiationResponse, RelayRequest,

protocol/src/socks5/server/udp.rs

@@ -20,7 +20,7 @@ use common::{
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::net::{ToSocketAddrs, UdpSocket};
-use tracing::{error, warn};
+use tracing::warn;
 use udp_listener::Conn;
 
 use crate::socks5::messages::UdpRequestHeader;

protocol/src/stream/streams/http_tunnel/mod.rs

@@ -40,7 +40,7 @@ use monitor_table::table::RowOwnedGuard;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::io::{AsyncRead, AsyncWrite};
-use tracing::{error, info, instrument, trace, warn};
+use tracing::{info, instrument, trace, warn};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]