Revert "refactor(lib): Switch from pin-project to pin-project-lite"

This reverts commit 43412a9.

Author: seanmonstar

Cargo.toml

@@ -34,7 +34,7 @@ httparse = "1.0"
 h2 = { version = "0.3", optional = true }
 itoa = "0.4.1"
 tracing = { version = "0.1", default-features = false, features = ["std"] }
-pin-project-lite = "0.2.4"
+pin-project = "1.0"
 tower-service = "0.3"
 tokio = { version = "1", features = ["sync"] }
 want = "0.3"

src/client/conn.rs

@@ -56,7 +56,7 @@ use std::time::Duration;
 
 use bytes::Bytes;
 use futures_util::future::{self, Either, FutureExt as _};
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use tokio::io::{AsyncRead, AsyncWrite};
 use tower_service::Service;
 
@@ -75,23 +75,15 @@ use crate::{Body, Request, Response};
 #[cfg(feature = "http1")]
 type Http1Dispatcher<T, B, R> = proto::dispatch::Dispatcher<proto::dispatch::Client<B>, B, T, R>;
 
-pin_project! {
-    #[project = ProtoClientProj]
-    enum ProtoClient<T, B>
-    where
-        B: HttpBody,
-    {
-        #[cfg(feature = "http1")]
-        H1 {
-            #[pin]
-            h1: Http1Dispatcher<T, B, proto::h1::ClientTransaction>,
-        },
-        #[cfg(feature = "http2")]
-        H2 {
-            #[pin]
-            h2: proto::h2::ClientTask<B>, _phantom: PhantomData<fn(T)>,
-        },
-    }
+#[pin_project(project = ProtoClientProj)]
+enum ProtoClient<T, B>
+where
+    B: HttpBody,
+{
+    #[cfg(feature = "http1")]
+    H1(#[pin] Http1Dispatcher<T, B, proto::h1::ClientTransaction>),
+    #[cfg(feature = "http2")]
+    H2(#[pin] proto::h2::ClientTask<B>, PhantomData<fn(T)>),
 }
 
 /// Returns a handshake future over some IO.
@@ -408,7 +400,7 @@ where
     pub fn into_parts(self) -> Parts<T> {
         match self.inner.expect("already upgraded") {
             #[cfg(feature = "http1")]
-            ProtoClient::H1 { h1 } => {
+            ProtoClient::H1(h1) => {
                 let (io, read_buf, _) = h1.into_inner();
                 Parts {
                     io,
@@ -417,7 +409,7 @@ where
                 }
             }
             #[cfg(feature = "http2")]
-            ProtoClient::H2 { .. } => {
+            ProtoClient::H2(..) => {
                 panic!("http2 cannot into_inner");
             }
         }
@@ -437,9 +429,9 @@ where
     pub fn poll_without_shutdown(&mut self, cx: &mut task::Context<'_>) -> Poll<crate::Result<()>> {
         match *self.inner.as_mut().expect("already upgraded") {
             #[cfg(feature = "http1")]
-            ProtoClient::H1 { ref mut h1 } => h1.poll_without_shutdown(cx),
+            ProtoClient::H1(ref mut h1) => h1.poll_without_shutdown(cx),
             #[cfg(feature = "http2")]
-            ProtoClient::H2 { ref mut h2, .. } => Pin::new(h2).poll(cx).map_ok(|_| ()),
+            ProtoClient::H2(ref mut h2, _) => Pin::new(h2).poll(cx).map_ok(|_| ()),
         }
     }
 
@@ -468,7 +460,7 @@ where
             proto::Dispatched::Shutdown => Poll::Ready(Ok(())),
             #[cfg(feature = "http1")]
             proto::Dispatched::Upgrade(pending) => match self.inner.take() {
-                Some(ProtoClient::H1 { h1 }) => {
+                Some(ProtoClient::H1(h1)) => {
                     let (io, buf, _) = h1.into_inner();
                     pending.fulfill(Upgraded::new(io, buf));
                     Poll::Ready(Ok(()))
@@ -715,17 +707,14 @@ impl Builder {
                     }
                     let cd = proto::h1::dispatch::Client::new(rx);
                     let dispatch = proto::h1::Dispatcher::new(cd, conn);
-                    ProtoClient::H1 { h1: dispatch }
+                    ProtoClient::H1(dispatch)
                 }
                 #[cfg(feature = "http2")]
                 Proto::Http2 => {
                     let h2 =
                         proto::h2::client::handshake(io, rx, &opts.h2_builder, opts.exec.clone())
                             .await?;
-                    ProtoClient::H2 {
-                        h2,
-                        _phantom: PhantomData,
-                    }
+                    ProtoClient::H2(h2, PhantomData)
                 }
             };
 
@@ -779,9 +768,9 @@ where
     fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
         match self.project() {
             #[cfg(feature = "http1")]
-            ProtoClientProj::H1 { h1 } => h1.poll(cx),
+            ProtoClientProj::H1(c) => c.poll(cx),
             #[cfg(feature = "http2")]
-            ProtoClientProj::H2 { h2, .. } => h2.poll(cx),
+            ProtoClientProj::H2(c, _) => c.poll(cx),
         }
     }
 }

src/client/connect/http.rs

@@ -11,7 +11,7 @@ use std::time::Duration;
 
 use futures_util::future::Either;
 use http::uri::{Scheme, Uri};
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use tokio::net::{TcpSocket, TcpStream};
 use tokio::time::Sleep;
 
@@ -373,19 +373,18 @@ impl HttpInfo {
     }
 }
 
-pin_project! {
-    // Not publicly exported (so missing_docs doesn't trigger).
-    //
-    // We return this `Future` instead of the `Pin<Box<dyn Future>>` directly
-    // so that users don't rely on it fitting in a `Pin<Box<dyn Future>>` slot
-    // (and thus we can change the type in the future).
-    #[must_use = "futures do nothing unless polled"]
-    #[allow(missing_debug_implementations)]
-    pub struct HttpConnecting<R> {
-        #[pin]
-        fut: BoxConnecting,
-        _marker: PhantomData<R>,
-    }
+// Not publicly exported (so missing_docs doesn't trigger).
+//
+// We return this `Future` instead of the `Pin<Box<dyn Future>>` directly
+// so that users don't rely on it fitting in a `Pin<Box<dyn Future>>` slot
+// (and thus we can change the type in the future).
+#[must_use = "futures do nothing unless polled"]
+#[pin_project]
+#[allow(missing_debug_implementations)]
+pub struct HttpConnecting<R> {
+    #[pin]
+    fut: BoxConnecting,
+    _marker: PhantomData<R>,
 }
 
 type ConnectResult = Result<TcpStream, ConnectError>;

src/client/pool.rs

@@ -11,7 +11,7 @@ use futures_channel::oneshot;
 use tokio::time::{Duration, Instant, Interval};
 
 use super::client::Ver;
-use crate::common::{exec::Exec, task, Future, Pin, Poll, Unpin};
+use crate::common::{task, exec::Exec, Future, Pin, Poll, Unpin};
 
 // FIXME: allow() required due to `impl Trait` leaking types to this lint
 #[allow(missing_debug_implementations)]
@@ -714,17 +714,16 @@ impl Expiration {
 }
 
 #[cfg(feature = "runtime")]
-pin_project_lite::pin_project! {
-    struct IdleTask<T> {
-        #[pin]
-        interval: Interval,
-        pool: WeakOpt<Mutex<PoolInner<T>>>,
-        // This allows the IdleTask to be notified as soon as the entire
-        // Pool is fully dropped, and shutdown. This channel is never sent on,
-        // but Err(Canceled) will be received when the Pool is dropped.
-        #[pin]
-        pool_drop_notifier: oneshot::Receiver<crate::common::Never>,
-    }
+#[pin_project::pin_project]
+struct IdleTask<T> {
+    #[pin]
+    interval: Interval,
+    pool: WeakOpt<Mutex<PoolInner<T>>>,
+    // This allows the IdleTask to be notified as soon as the entire
+    // Pool is fully dropped, and shutdown. This channel is never sent on,
+    // but Err(Canceled) will be received when the Pool is dropped.
+    #[pin]
+    pool_drop_notifier: oneshot::Receiver<crate::common::Never>,
 }
 
 #[cfg(feature = "runtime")]
@@ -777,7 +776,7 @@ mod tests {
     use std::time::Duration;
 
     use super::{Connecting, Key, Pool, Poolable, Reservation, WeakOpt};
-    use crate::common::{exec::Exec, task, Future, Pin};
+    use crate::common::{task, exec::Exec, Future, Pin};
 
     /// Test unique reservations.
     #[derive(Debug, PartialEq, Eq)]

src/common/drain.rs

@@ -1,6 +1,6 @@
 use std::mem;
 
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use tokio::sync::watch;
 
 use super::{task, Future, Pin, Poll};
@@ -21,15 +21,14 @@ pub(crate) struct Watch {
     rx: watch::Receiver<()>,
 }
 
-pin_project! {
-    #[allow(missing_debug_implementations)]
-    pub struct Watching<F, FN> {
-        #[pin]
-        future: F,
-        state: State<FN>,
-        watch: Pin<Box<dyn Future<Output = ()> + Send + Sync>>,
-        _rx: watch::Receiver<()>,
-    }
+#[allow(missing_debug_implementations)]
+#[pin_project]
+pub struct Watching<F, FN> {
+    #[pin]
+    future: F,
+    state: State<FN>,
+    watch: Pin<Box<dyn Future<Output = ()> + Send + Sync>>,
+    _rx: watch::Receiver<()>,
 }
 
 enum State<F> {

src/proto/h1/dispatch.rs

@@ -44,13 +44,10 @@ cfg_server! {
 }
 
 cfg_client! {
-    pin_project_lite::pin_project! {
-        pub(crate) struct Client<B> {
-            callback: Option<crate::client::dispatch::Callback<Request<B>, http::Response<Body>>>,
-            #[pin]
-            rx: ClientRx<B>,
-            rx_closed: bool,
-        }
+    pub(crate) struct Client<B> {
+        callback: Option<crate::client::dispatch::Callback<Request<B>, http::Response<Body>>>,
+        rx: ClientRx<B>,
+        rx_closed: bool,
     }
 
     type ClientRx<B> = crate::client::dispatch::Receiver<Request<B>, http::Response<Body>>;

src/proto/h2/mod.rs

@@ -5,7 +5,7 @@ use http::header::{
     TRANSFER_ENCODING, UPGRADE,
 };
 use http::HeaderMap;
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use std::error::Error as StdError;
 use std::io::IoSlice;
 
@@ -94,16 +94,15 @@ fn decode_content_length(headers: &HeaderMap) -> DecodedLength {
 
 // body adapters used by both Client and Server
 
-pin_project! {
-    struct PipeToSendStream<S>
-    where
-        S: HttpBody,
-    {
-        body_tx: SendStream<SendBuf<S::Data>>,
-        data_done: bool,
-        #[pin]
-        stream: S,
-    }
+#[pin_project]
+struct PipeToSendStream<S>
+where
+    S: HttpBody,
+{
+    body_tx: SendStream<SendBuf<S::Data>>,
+    data_done: bool,
+    #[pin]
+    stream: S,
 }
 
 impl<S> PipeToSendStream<S>