switch to use pin-project-lite

bytedance · May 8, 2024 · e288973 · e288973
1 parent 72b65db
commit e288973
Show file tree

Hide file tree

Showing 23 changed files with 183 additions and 183 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -142,7 +142,7 @@ futures-util = "0.3"
 atomic-waker = "1.1"
 async-trait = "0.1"
 async-recursion = "1.1"
-pin-project = "1.1"
+pin-project-lite = "0.2"
 #
 rustls = "0.21.12"
 tokio-rustls = "0.24"

diff --git a/g3proxy/Cargo.toml b/g3proxy/Cargo.toml
@@ -43,7 +43,7 @@ ip_network.workspace = true
 ip_network_table.workspace = true
 radix_trie.workspace = true
 base64.workspace = true
-pin-project.workspace = true
+pin-project-lite.workspace = true
 memchr.workspace = true
 arc-swap.workspace = true
 capnp-rpc.workspace = true

diff --git a/g3proxy/src/escape/direct_fixed/http_forward/reader.rs b/g3proxy/src/escape/direct_fixed/http_forward/reader.rs
@@ -21,7 +21,7 @@ use std::task::{Context, Poll};
 
 use async_trait::async_trait;
 use http::Method;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::{AsyncBufRead, AsyncRead, ReadBuf};
 
 use g3_http::client::{HttpForwardRemoteResponse, HttpResponseParseError};
@@ -33,10 +33,11 @@ use crate::module::http_forward::{
     HttpForwardTaskRemoteWrapperStats,
 };
 
-#[pin_project]
-pub(crate) struct DirectHttpForwardReader<R: AsyncRead> {
-    #[pin]
-    inner: LimitedBufReader<R>,
+pin_project! {
+    pub(crate) struct DirectHttpForwardReader<R: AsyncRead> {
+        #[pin]
+        inner: LimitedBufReader<R>,
+    }
 }
 
 impl<R> DirectHttpForwardReader<R>

diff --git a/g3proxy/src/escape/direct_fixed/http_forward/writer.rs b/g3proxy/src/escape/direct_fixed/http_forward/writer.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use async_trait::async_trait;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::AsyncWrite;
 
 use g3_http::server::HttpProxyClientRequest;
@@ -34,11 +34,12 @@ use crate::module::http_forward::{
 };
 use crate::serve::ServerTaskNotes;
 
-#[pin_project]
-pub(crate) struct DirectHttpForwardWriter<W: AsyncWrite, S: HttpForwardTaskRemoteStats> {
-    #[pin]
-    inner: W,
-    escaper_stats: Option<Arc<S>>,
+pin_project! {
+    pub(crate) struct DirectHttpForwardWriter<W: AsyncWrite, S: HttpForwardTaskRemoteStats> {
+        #[pin]
+        inner: W,
+        escaper_stats: Option<Arc<S>>,
+    }
 }
 
 impl<W, S> DirectHttpForwardWriter<W, S>

diff --git a/g3proxy/src/escape/direct_float/http_forward/writer.rs b/g3proxy/src/escape/direct_float/http_forward/writer.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use async_trait::async_trait;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::AsyncWrite;
 
 use g3_http::server::HttpProxyClientRequest;
@@ -36,12 +36,13 @@ use crate::module::http_forward::{
 };
 use crate::serve::ServerTaskNotes;
 
-#[pin_project]
-pub(super) struct DirectFloatHttpForwardWriter<W: AsyncWrite> {
-    bind: DirectFloatBindIp,
-    #[pin]
-    inner: W,
-    escaper_stats: Option<Arc<DirectFixedEscaperStats>>,
+pin_project! {
+    pub(super) struct DirectFloatHttpForwardWriter<W: AsyncWrite> {
+        bind: DirectFloatBindIp,
+        #[pin]
+        inner: W,
+        escaper_stats: Option<Arc<DirectFixedEscaperStats>>,
+    }
 }
 
 impl<W> DirectFloatHttpForwardWriter<W>

diff --git a/g3proxy/src/escape/proxy_float/peer/http/http_forward/reader.rs b/g3proxy/src/escape/proxy_float/peer/http/http_forward/reader.rs
@@ -21,7 +21,7 @@ use std::task::{Context, Poll};
 
 use async_trait::async_trait;
 use http::Method;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::{AsyncBufRead, AsyncRead, ReadBuf};
 
 use g3_http::client::{HttpForwardRemoteResponse, HttpResponseParseError};
@@ -33,10 +33,11 @@ use crate::module::http_forward::{
     HttpForwardTaskRemoteWrapperStats,
 };
 
-#[pin_project]
-pub(super) struct HttpPeerHttpForwardReader<R: AsyncRead> {
-    #[pin]
-    inner: LimitedBufReader<R>,
+pin_project! {
+    pub(super) struct HttpPeerHttpForwardReader<R: AsyncRead> {
+        #[pin]
+        inner: LimitedBufReader<R>,
+    }
 }
 
 impl<R> HttpPeerHttpForwardReader<R>

diff --git a/g3proxy/src/escape/proxy_float/peer/http/http_forward/writer.rs b/g3proxy/src/escape/proxy_float/peer/http/http_forward/writer.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use async_trait::async_trait;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::AsyncWrite;
 use tokio::time::Instant;
 
@@ -36,13 +36,14 @@ use crate::module::http_forward::{
 };
 use crate::serve::ServerTaskNotes;
 
-#[pin_project]
-pub(super) struct HttpPeerHttpForwardWriter<W: AsyncWrite> {
-    config: Arc<ProxyFloatHttpPeerSharedConfig>,
-    #[pin]
-    inner: W,
-    upstream: UpstreamAddr,
-    escaper_stats: Option<Arc<ProxyFloatEscaperStats>>,
+pin_project! {
+    pub(super) struct HttpPeerHttpForwardWriter<W: AsyncWrite> {
+        config: Arc<ProxyFloatHttpPeerSharedConfig>,
+        #[pin]
+        inner: W,
+        upstream: UpstreamAddr,
+        escaper_stats: Option<Arc<ProxyFloatEscaperStats>>,
+    }
 }
 
 impl<W> HttpPeerHttpForwardWriter<W>
@@ -134,12 +135,13 @@ where
     }
 }
 
-#[pin_project]
-pub(super) struct HttpPeerHttpRequestWriter<W: AsyncWrite> {
-    config: Arc<ProxyFloatHttpPeerSharedConfig>,
-    #[pin]
-    inner: W,
-    escaper_stats: Option<Arc<ProxyFloatEscaperStats>>,
+pin_project! {
+    pub(super) struct HttpPeerHttpRequestWriter<W: AsyncWrite> {
+        config: Arc<ProxyFloatHttpPeerSharedConfig>,
+        #[pin]
+        inner: W,
+        escaper_stats: Option<Arc<ProxyFloatEscaperStats>>,
+    }
 }
 
 impl<W> HttpPeerHttpRequestWriter<W>

diff --git a/g3proxy/src/escape/proxy_float/peer/https/http_forward/reader.rs b/g3proxy/src/escape/proxy_float/peer/https/http_forward/reader.rs
@@ -21,7 +21,7 @@ use std::task::{Context, Poll};
 
 use async_trait::async_trait;
 use http::Method;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::{AsyncBufRead, AsyncRead, ReadBuf};
 
 use g3_http::client::{HttpForwardRemoteResponse, HttpResponseParseError};
@@ -33,10 +33,11 @@ use crate::module::http_forward::{
     HttpForwardTaskRemoteWrapperStats,
 };
 
-#[pin_project]
-pub(super) struct HttpsPeerHttpForwardReader<R: AsyncRead> {
-    #[pin]
-    inner: LimitedBufReader<R>,
+pin_project! {
+    pub(super) struct HttpsPeerHttpForwardReader<R: AsyncRead> {
+        #[pin]
+        inner: LimitedBufReader<R>,
+    }
 }
 
 impl<R> HttpsPeerHttpForwardReader<R>

diff --git a/g3proxy/src/escape/proxy_float/peer/https/http_forward/writer.rs b/g3proxy/src/escape/proxy_float/peer/https/http_forward/writer.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use async_trait::async_trait;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::AsyncWrite;
 use tokio::time::Instant;
 
@@ -36,12 +36,13 @@ use crate::module::http_forward::{
 };
 use crate::serve::ServerTaskNotes;
 
-#[pin_project]
-pub(super) struct HttpsPeerHttpForwardWriter<W: AsyncWrite> {
-    config: Arc<ProxyFloatHttpsPeerSharedConfig>,
-    #[pin]
-    inner: W,
-    upstream: UpstreamAddr,
+pin_project! {
+    pub(super) struct HttpsPeerHttpForwardWriter<W: AsyncWrite> {
+        config: Arc<ProxyFloatHttpsPeerSharedConfig>,
+        #[pin]
+        inner: W,
+        upstream: UpstreamAddr,
+    }
 }
 
 impl<W> HttpsPeerHttpForwardWriter<W>
@@ -125,11 +126,12 @@ where
     }
 }
 
-#[pin_project]
-pub(super) struct HttpsPeerHttpRequestWriter<W: AsyncWrite> {
-    config: Arc<ProxyFloatHttpsPeerSharedConfig>,
-    #[pin]
-    inner: W,
+pin_project! {
+    pub(super) struct HttpsPeerHttpRequestWriter<W: AsyncWrite> {
+        config: Arc<ProxyFloatHttpsPeerSharedConfig>,
+        #[pin]
+        inner: W,
+    }
 }
 
 impl<W> HttpsPeerHttpRequestWriter<W>

diff --git a/g3proxy/src/escape/proxy_float/peer/socks5/http_forward/writer.rs b/g3proxy/src/escape/proxy_float/peer/socks5/http_forward/writer.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use async_trait::async_trait;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::AsyncWrite;
 use tokio::time::Instant;
 
@@ -36,12 +36,13 @@ use crate::module::http_forward::{
 };
 use crate::serve::ServerTaskNotes;
 
-#[pin_project]
-pub(super) struct Socks5PeerHttpForwardWriter<W: AsyncWrite> {
-    config: Arc<ProxyFloatSocks5PeerSharedConfig>,
-    #[pin]
-    inner: W,
-    escaper_stats: Option<Arc<ProxyFloatEscaperStats>>,
+pin_project! {
+    pub(super) struct Socks5PeerHttpForwardWriter<W: AsyncWrite> {
+        config: Arc<ProxyFloatSocks5PeerSharedConfig>,
+        #[pin]
+        inner: W,
+        escaper_stats: Option<Arc<ProxyFloatEscaperStats>>,
+    }
 }
 
 impl<W> Socks5PeerHttpForwardWriter<W>

diff --git a/g3proxy/src/escape/proxy_http/http_forward/reader.rs b/g3proxy/src/escape/proxy_http/http_forward/reader.rs
@@ -21,7 +21,7 @@ use std::task::{Context, Poll};
 
 use async_trait::async_trait;
 use http::Method;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::{AsyncBufRead, AsyncRead, ReadBuf};
 
 use g3_http::client::{HttpForwardRemoteResponse, HttpResponseParseError};
@@ -33,10 +33,11 @@ use crate::module::http_forward::{
     HttpForwardTaskRemoteWrapperStats,
 };
 
-#[pin_project]
-pub(super) struct ProxyHttpHttpForwardReader<R: AsyncRead> {
-    #[pin]
-    inner: LimitedBufReader<R>,
+pin_project! {
+    pub(super) struct ProxyHttpHttpForwardReader<R: AsyncRead> {
+        #[pin]
+        inner: LimitedBufReader<R>,
+    }
 }
 
 impl<R> ProxyHttpHttpForwardReader<R>

diff --git a/g3proxy/src/escape/proxy_http/http_forward/writer.rs b/g3proxy/src/escape/proxy_http/http_forward/writer.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use async_trait::async_trait;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::AsyncWrite;
 
 use g3_http::server::HttpProxyClientRequest;
@@ -35,14 +35,15 @@ use crate::module::http_forward::{
 };
 use crate::serve::ServerTaskNotes;
 
-#[pin_project]
-pub(super) struct ProxyHttpHttpForwardWriter<W: AsyncWrite> {
-    config: Arc<ProxyHttpEscaperConfig>,
-    #[pin]
-    inner: W,
-    escaper_stats: Option<Arc<ProxyHttpEscaperStats>>,
-    upstream: UpstreamAddr,
-    pass_userid: Option<String>,
+pin_project! {
+    pub(super) struct ProxyHttpHttpForwardWriter<W: AsyncWrite> {
+        config: Arc<ProxyHttpEscaperConfig>,
+        #[pin]
+        inner: W,
+        escaper_stats: Option<Arc<ProxyHttpEscaperStats>>,
+        upstream: UpstreamAddr,
+        pass_userid: Option<String>,
+    }
 }
 
 impl<W> ProxyHttpHttpForwardWriter<W>
@@ -131,12 +132,13 @@ where
     }
 }
 
-#[pin_project]
-pub(super) struct ProxyHttpHttpRequestWriter<W: AsyncWrite> {
-    config: Arc<ProxyHttpEscaperConfig>,
-    #[pin]
-    inner: W,
-    escaper_stats: Option<Arc<ProxyHttpEscaperStats>>,
+pin_project! {
+    pub(super) struct ProxyHttpHttpRequestWriter<W: AsyncWrite> {
+        config: Arc<ProxyHttpEscaperConfig>,
+        #[pin]
+        inner: W,
+        escaper_stats: Option<Arc<ProxyHttpEscaperStats>>,
+    }
 }
 
 impl<W> ProxyHttpHttpRequestWriter<W>