simplify stats cast

bytedance · Aug 16, 2023 · 245eee3 · 245eee3
1 parent 22c1085
commit 245eee3
Show file tree

Hide file tree

Showing 65 changed files with 127 additions and 337 deletions.
diff --git a/g3bench/src/target/h1/task.rs b/g3bench/src/target/h1/task.rs
@@ -25,7 +25,7 @@ use tokio::time::Instant;
 
 use g3_http::client::HttpForwardRemoteResponse;
 use g3_http::HttpBodyReader;
-use g3_io_ext::{ArcLimitedReaderStats, ArcLimitedWriterStats, LimitedReader, LimitedWriter};
+use g3_io_ext::{LimitedReader, LimitedWriter};
 
 use super::{
     BenchHttpArgs, BenchTaskContext, HttpHistogramRecorder, HttpRuntimeStats, ProcArgs,
@@ -103,13 +103,13 @@ impl HttpTaskContext {
             r,
             self.proc_args.tcp_sock_speed_limit.shift_millis,
             self.proc_args.tcp_sock_speed_limit.max_south,
-            self.runtime_stats.clone() as ArcLimitedReaderStats,
+            self.runtime_stats.clone() as _,
         );
         let w = LimitedWriter::new(
             w,
             self.proc_args.tcp_sock_speed_limit.shift_millis,
             self.proc_args.tcp_sock_speed_limit.max_north,
-            self.runtime_stats.clone() as ArcLimitedWriterStats,
+            self.runtime_stats.clone() as _,
         );
         Ok(SavedHttpForwardConnection::new(BufReader::new(r), w))
     }

diff --git a/g3proxy/src/escape/direct_fixed/ftp_connect/stats.rs b/g3proxy/src/escape/direct_fixed/ftp_connect/stats.rs
@@ -45,16 +45,13 @@ impl FtpControlRemoteStats {
 
     pub(super) fn push_user_io_stats(&mut self, all: Vec<Arc<UserUpstreamTrafficStats>>) {
         for s in all {
-            self.others.push(s as ArcFtpTaskRemoteControlStats);
+            self.others.push(s as _);
         }
     }
 
     pub(super) fn into_pair(self) -> (ArcLimitedReaderStats, ArcLimitedWriterStats) {
         let s = Arc::new(self);
-        (
-            Arc::clone(&s) as ArcLimitedReaderStats,
-            s as ArcLimitedWriterStats,
-        )
+        (Arc::clone(&s) as _, s as _)
     }
 }
 
@@ -101,16 +98,13 @@ impl FtpTransferRemoteStats {
 
     pub(super) fn push_user_io_stats(&mut self, all: Vec<Arc<UserUpstreamTrafficStats>>) {
         for s in all {
-            self.others.push(s as ArcFtpTaskRemoteTransferStats);
+            self.others.push(s as _);
         }
     }
 
     pub(super) fn into_pair(self) -> (ArcLimitedReaderStats, ArcLimitedWriterStats) {
         let s = Arc::new(self);
-        (
-            Arc::clone(&s) as ArcLimitedReaderStats,
-            s as ArcLimitedWriterStats,
-        )
+        (Arc::clone(&s) as _, s as _)
     }
 }
 

diff --git a/g3proxy/src/escape/direct_fixed/http_forward/mod.rs b/g3proxy/src/escape/direct_fixed/http_forward/mod.rs
@@ -58,7 +58,7 @@ impl DirectFixedEscaper {
             ups_r,
             limit_config.shift_millis,
             limit_config.max_south,
-            self.stats.for_limited_reader(),
+            self.stats.clone() as _,
             r_wrapper_stats.into_reader(),
         );
         let ups_w = LimitedWriter::new(

diff --git a/g3proxy/src/escape/direct_fixed/http_forward/stats.rs b/g3proxy/src/escape/direct_fixed/http_forward/stats.rs
@@ -43,13 +43,13 @@ impl DirectHttpMixedRemoteStats {
 
     pub(super) fn push_user_io_stats_by_ref(&mut self, all: &[Arc<UserUpstreamTrafficStats>]) {
         for s in all {
-            self.others.push(s.clone() as ArcHttpForwardTaskRemoteStats);
+            self.others.push(s.clone() as _);
         }
     }
 
     pub(super) fn push_user_io_stats(&mut self, all: Vec<Arc<UserUpstreamTrafficStats>>) {
         for s in all {
-            self.others.push(s as ArcHttpForwardTaskRemoteStats);
+            self.others.push(s as _);
         }
     }
 

diff --git a/g3proxy/src/escape/direct_fixed/mod.rs b/g3proxy/src/escape/direct_fixed/mod.rs
@@ -32,9 +32,7 @@ use g3_types::net::{Host, OpensslTlsClientConfig, UpstreamAddr};
 use g3_types::resolve::{ResolveRedirection, ResolveStrategy};
 use g3_types::route::EgressPathSelection;
 
-use super::{
-    ArcEscaper, ArcEscaperInternalStats, ArcEscaperStats, Escaper, EscaperInternal, EscaperStats,
-};
+use super::{ArcEscaper, ArcEscaperStats, Escaper, EscaperInternal, EscaperStats};
 use crate::auth::UserUpstreamTrafficStats;
 use crate::config::escaper::direct_fixed::DirectFixedEscaperConfig;
 use crate::config::escaper::{AnyEscaperConfig, EscaperConfig};
@@ -271,7 +269,7 @@ impl Escaper for DirectFixedEscaper {
     }
 
     fn get_escape_stats(&self) -> Option<ArcEscaperStats> {
-        Some(Arc::clone(&self.stats) as ArcEscaperStats)
+        Some(Arc::clone(&self.stats) as _)
     }
 
     async fn publish(&self, _data: String) -> anyhow::Result<()> {
@@ -328,10 +326,7 @@ impl Escaper for DirectFixedEscaper {
     }
 
     fn new_http_forward_context(&self, escaper: ArcEscaper) -> BoxHttpForwardContext {
-        let ctx = DirectHttpForwardContext::new(
-            Arc::clone(&self.stats) as ArcEscaperInternalStats,
-            escaper,
-        );
+        let ctx = DirectHttpForwardContext::new(Arc::clone(&self.stats) as _, escaper);
         Box::new(ctx)
     }
 

diff --git a/g3proxy/src/escape/direct_fixed/stats.rs b/g3proxy/src/escape/direct_fixed/stats.rs
@@ -18,9 +18,7 @@ use std::sync::Arc;
 
 use arc_swap::ArcSwapOption;
 
-use g3_io_ext::{
-    ArcLimitedReaderStats, ArcLimitedWriterStats, LimitedReaderStats, LimitedWriterStats,
-};
+use g3_io_ext::{LimitedReaderStats, LimitedWriterStats};
 use g3_types::metrics::{MetricsName, StaticMetricsTags};
 use g3_types::stats::{StatId, TcpIoSnapshot, UdpIoSnapshot};
 
@@ -52,16 +50,6 @@ impl DirectFixedEscaperStats {
         }
     }
 
-    #[inline]
-    pub(crate) fn for_limited_reader(self: &Arc<Self>) -> ArcLimitedReaderStats {
-        Arc::clone(self) as ArcLimitedReaderStats
-    }
-
-    #[inline]
-    pub(crate) fn for_limited_writer(self: &Arc<Self>) -> ArcLimitedWriterStats {
-        Arc::clone(self) as ArcLimitedWriterStats
-    }
-
     pub(super) fn set_extra_tags(&self, tags: Option<Arc<StaticMetricsTags>>) {
         self.extra_metrics_tags.store(tags);
     }

diff --git a/g3proxy/src/escape/direct_fixed/tcp_connect/stats.rs b/g3proxy/src/escape/direct_fixed/tcp_connect/stats.rs
@@ -45,16 +45,13 @@ impl DirectTcpMixedRemoteStats {
 
     pub(super) fn push_user_io_stats(&mut self, all: Vec<Arc<UserUpstreamTrafficStats>>) {
         for s in all {
-            self.others.push(s as ArcTcpConnectionTaskRemoteStats);
+            self.others.push(s as _);
         }
     }
 
     pub(super) fn into_pair(self) -> (ArcLimitedReaderStats, ArcLimitedWriterStats) {
         let s = Arc::new(self);
-        (
-            Arc::clone(&s) as ArcLimitedReaderStats,
-            s as ArcLimitedWriterStats,
-        )
+        (Arc::clone(&s) as _, s as _)
     }
 }
 

diff --git a/g3proxy/src/escape/direct_fixed/tls_connect/mod.rs b/g3proxy/src/escape/direct_fixed/tls_connect/mod.rs
@@ -54,13 +54,13 @@ impl DirectFixedEscaper {
             ups_r,
             limit_config.shift_millis,
             limit_config.max_south,
-            self.stats.for_limited_reader(),
+            self.stats.clone() as _,
         );
         let ups_w = LimitedWriter::new(
             ups_w,
             limit_config.shift_millis,
             limit_config.max_north,
-            self.stats.for_limited_writer(),
+            self.stats.clone() as _,
         );
 
         let ssl = tls_config

diff --git a/g3proxy/src/escape/direct_fixed/udp_connect/stats.rs b/g3proxy/src/escape/direct_fixed/udp_connect/stats.rs
@@ -43,16 +43,13 @@ impl DirectUdpConnectRemoteStats {
 
     pub(super) fn push_user_io_stats(&mut self, all: Vec<Arc<UserUpstreamTrafficStats>>) {
         for s in all {
-            self.others.push(s as ArcUdpConnectTaskRemoteStats);
+            self.others.push(s as _);
         }
     }
 
     pub(super) fn into_pair(self) -> (ArcLimitedRecvStats, ArcLimitedSendStats) {
         let s = Arc::new(self);
-        (
-            Arc::clone(&s) as ArcLimitedRecvStats,
-            s as ArcLimitedSendStats,
-        )
+        (Arc::clone(&s) as _, s as _)
     }
 }
 

diff --git a/g3proxy/src/escape/direct_fixed/udp_relay/stats.rs b/g3proxy/src/escape/direct_fixed/udp_relay/stats.rs
@@ -43,16 +43,16 @@ impl DirectUdpRelayRemoteStats {
 
     pub(super) fn push_user_io_stats(&mut self, all: Vec<Arc<UserUpstreamTrafficStats>>) {
         for s in all {
-            self.others.push(s as ArcUdpRelayTaskRemoteStats);
+            self.others.push(s as _);
         }
     }
 
     pub(super) fn for_recv(self: &Arc<Self>) -> ArcLimitedRecvStats {
-        Arc::clone(self) as ArcLimitedRecvStats
+        Arc::clone(self) as _
     }
 
     pub(super) fn for_send(self: &Arc<Self>) -> ArcLimitedSendStats {
-        Arc::clone(self) as ArcLimitedSendStats
+        Arc::clone(self) as _
     }
 }
 

diff --git a/g3proxy/src/escape/direct_float/ftp_connect/stats.rs b/g3proxy/src/escape/direct_float/ftp_connect/stats.rs
@@ -45,16 +45,13 @@ impl FtpControlRemoteStats {
 
     pub(super) fn push_user_io_stats(&mut self, all: Vec<Arc<UserUpstreamTrafficStats>>) {
         for s in all {
-            self.others.push(s as ArcFtpTaskRemoteControlStats);
+            self.others.push(s as _);
         }
     }
 
     pub(super) fn into_pair(self) -> (ArcLimitedReaderStats, ArcLimitedWriterStats) {
         let s = Arc::new(self);
-        (
-            Arc::clone(&s) as ArcLimitedReaderStats,
-            s as ArcLimitedWriterStats,
-        )
+        (Arc::clone(&s) as _, s as _)
     }
 }
 

diff --git a/g3proxy/src/escape/direct_float/http_forward/mod.rs b/g3proxy/src/escape/direct_float/http_forward/mod.rs
@@ -58,7 +58,7 @@ impl DirectFloatEscaper {
             ups_r,
             limit_config.shift_millis,
             limit_config.max_south,
-            self.stats.for_limited_reader(),
+            self.stats.clone() as _,
             r_wrapper_stats.into_reader(),
         );
         let ups_w = LimitedWriter::new(

diff --git a/g3proxy/src/escape/direct_float/stats.rs b/g3proxy/src/escape/direct_float/stats.rs
@@ -18,9 +18,7 @@ use std::sync::Arc;
 
 use arc_swap::ArcSwapOption;
 
-use g3_io_ext::{
-    ArcLimitedReaderStats, ArcLimitedWriterStats, LimitedReaderStats, LimitedWriterStats,
-};
+use g3_io_ext::{LimitedReaderStats, LimitedWriterStats};
 use g3_types::metrics::{MetricsName, StaticMetricsTags};
 use g3_types::stats::{StatId, TcpIoSnapshot, UdpIoSnapshot};
 
@@ -52,16 +50,6 @@ impl DirectFloatEscaperStats {
         }
     }
 
-    #[inline]
-    pub(crate) fn for_limited_reader(self: &Arc<Self>) -> ArcLimitedReaderStats {
-        Arc::clone(self) as ArcLimitedReaderStats
-    }
-
-    #[inline]
-    pub(crate) fn for_limited_writer(self: &Arc<Self>) -> ArcLimitedWriterStats {
-        Arc::clone(self) as ArcLimitedWriterStats
-    }
-
     pub(super) fn set_extra_tags(&self, tags: Option<Arc<StaticMetricsTags>>) {
         self.extra_metrics_tags.store(tags);
     }

diff --git a/g3proxy/src/escape/direct_float/tcp_connect/stats.rs b/g3proxy/src/escape/direct_float/tcp_connect/stats.rs
@@ -45,16 +45,13 @@ impl DirectTcpMixedRemoteStats {
 
     pub(super) fn push_user_io_stats(&mut self, all: Vec<Arc<UserUpstreamTrafficStats>>) {
         for s in all {
-            self.others.push(s as ArcTcpConnectionTaskRemoteStats);
+            self.others.push(s as _);
         }
     }
 
     pub(super) fn into_pair(self) -> (ArcLimitedReaderStats, ArcLimitedWriterStats) {
         let s = Arc::new(self);
-        (
-            Arc::clone(&s) as ArcLimitedReaderStats,
-            s as ArcLimitedWriterStats,
-        )
+        (Arc::clone(&s) as _, s as _)
     }
 }
 

diff --git a/g3proxy/src/escape/direct_float/tls_connect/mod.rs b/g3proxy/src/escape/direct_float/tls_connect/mod.rs
@@ -57,13 +57,13 @@ impl DirectFloatEscaper {
             ups_r,
             limit_config.shift_millis,
             limit_config.max_south,
-            self.stats.for_limited_reader(),
+            self.stats.clone() as _,
         );
         let ups_w = LimitedWriter::new(
             ups_w,
             limit_config.shift_millis,
             limit_config.max_north,
-            self.stats.for_limited_writer(),
+            self.stats.clone() as _,
         );
 
         let ssl = tls_config

diff --git a/g3proxy/src/escape/dummy_deny/mod.rs b/g3proxy/src/escape/dummy_deny/mod.rs
@@ -24,7 +24,7 @@ use g3_daemon::stat::remote::ArcTcpConnectionTaskRemoteStats;
 use g3_types::metrics::MetricsName;
 use g3_types::net::{OpensslTlsClientConfig, UpstreamAddr};
 
-use super::{ArcEscaper, ArcEscaperInternalStats, ArcEscaperStats, Escaper, EscaperInternal};
+use super::{ArcEscaper, ArcEscaperStats, Escaper, EscaperInternal};
 use crate::config::escaper::dummy_deny::DummyDenyEscaperConfig;
 use crate::config::escaper::{AnyEscaperConfig, EscaperConfig};
 use crate::module::ftp_over_http::{
@@ -99,7 +99,7 @@ impl Escaper for DummyDenyEscaper {
     }
 
     fn get_escape_stats(&self) -> Option<ArcEscaperStats> {
-        Some(Arc::clone(&self.stats) as ArcEscaperStats)
+        Some(Arc::clone(&self.stats) as _)
     }
 
     async fn publish(&self, _data: String) -> anyhow::Result<()> {
@@ -153,10 +153,7 @@ impl Escaper for DummyDenyEscaper {
     }
 
     fn new_http_forward_context(&self, escaper: ArcEscaper) -> BoxHttpForwardContext {
-        let ctx = DirectHttpForwardContext::new(
-            Arc::clone(&self.stats) as ArcEscaperInternalStats,
-            escaper,
-        );
+        let ctx = DirectHttpForwardContext::new(Arc::clone(&self.stats) as _, escaper);
         Box::new(ctx)
     }
 

diff --git a/g3proxy/src/escape/proxy_float/mod.rs b/g3proxy/src/escape/proxy_float/mod.rs
@@ -30,7 +30,7 @@ use g3_daemon::stat::remote::ArcTcpConnectionTaskRemoteStats;
 use g3_types::metrics::MetricsName;
 use g3_types::net::{OpensslTlsClientConfig, UpstreamAddr};
 
-use super::{ArcEscaper, ArcEscaperInternalStats, ArcEscaperStats, Escaper, EscaperInternal};
+use super::{ArcEscaper, ArcEscaperStats, Escaper, EscaperInternal};
 use crate::config::escaper::proxy_float::ProxyFloatEscaperConfig;
 use crate::config::escaper::{AnyEscaperConfig, EscaperConfig};
 use crate::module::ftp_over_http::{
@@ -190,7 +190,7 @@ impl Escaper for ProxyFloatEscaper {
     }
 
     fn get_escape_stats(&self) -> Option<ArcEscaperStats> {
-        Some(Arc::clone(&self.stats) as ArcEscaperStats)
+        Some(Arc::clone(&self.stats) as _)
     }
 
     async fn publish(&self, data: String) -> anyhow::Result<()> {
@@ -272,10 +272,7 @@ impl Escaper for ProxyFloatEscaper {
     }
 
     fn new_http_forward_context(&self, escaper: ArcEscaper) -> BoxHttpForwardContext {
-        let ctx = DirectHttpForwardContext::new(
-            Arc::clone(&self.stats) as ArcEscaperInternalStats,
-            escaper,
-        );
+        let ctx = DirectHttpForwardContext::new(Arc::clone(&self.stats) as _, escaper);
         Box::new(ctx)
     }
 

diff --git a/g3proxy/src/escape/proxy_float/peer/http/tcp_connect/mod.rs b/g3proxy/src/escape/proxy_float/peer/http/tcp_connect/mod.rs
@@ -120,13 +120,13 @@ impl ProxyFloatHttpPeer {
             r,
             limit_config.shift_millis,
             limit_config.max_south,
-            self.escaper_stats.for_limited_reader(),
+            self.escaper_stats.clone() as _,
         );
         let w = LimitedWriter::new(
             w,
             limit_config.shift_millis,
             limit_config.max_north,
-            self.escaper_stats.for_limited_writer(),
+            self.escaper_stats.clone() as _,
         );
 
         Ok((r, w))