Change from pin-project-lite to pin-project.

For PinnedDrop support.

Author: jeff-davis

tokio-postgres/Cargo.toml

@@ -45,7 +45,7 @@ futures = "0.3"
 log = "0.4"
 parking_lot = "0.11"
 percent-encoding = "2.0"
-pin-project-lite = "0.2"
+pin-project = "1.0"
 phf = "0.8"
 postgres-protocol = { version = "0.5.0", path = "../postgres-protocol" }
 postgres-types = { version = "0.1.2", path = "../postgres-types" }

tokio-postgres/src/binary_copy.rs

@@ -5,7 +5,7 @@ use crate::{slice_iter, CopyInSink, CopyOutStream, Error};
 use byteorder::{BigEndian, ByteOrder};
 use bytes::{Buf, BufMut, Bytes, BytesMut};
 use futures::{ready, SinkExt, Stream};
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use postgres_types::BorrowToSql;
 use std::convert::TryFrom;
 use std::io;
@@ -18,16 +18,15 @@ use std::task::{Context, Poll};
 const MAGIC: &[u8] = b"PGCOPY\n\xff\r\n\0";
 const HEADER_LEN: usize = MAGIC.len() + 4 + 4;
 
-pin_project! {
-    /// A type which serializes rows into the PostgreSQL binary copy format.
-    ///
-    /// The copy *must* be explicitly completed via the `finish` method. If it is not, the copy will be aborted.
-    pub struct BinaryCopyInWriter {
-        #[pin]
-        sink: CopyInSink<Bytes>,
-        types: Vec<Type>,
-        buf: BytesMut,
-    }
+/// A type which serializes rows into the PostgreSQL binary copy format.
+///
+/// The copy *must* be explicitly completed via the `finish` method. If it is not, the copy will be aborted.
+#[pin_project]
+pub struct BinaryCopyInWriter {
+    #[pin]
+    sink: CopyInSink<Bytes>,
+    types: Vec<Type>,
+    buf: BytesMut,
 }
 
 impl BinaryCopyInWriter {
@@ -115,14 +114,13 @@ struct Header {
     has_oids: bool,
 }
 
-pin_project! {
-    /// A stream of rows deserialized from the PostgreSQL binary copy format.
-    pub struct BinaryCopyOutStream {
-        #[pin]
-        stream: CopyOutStream,
-        types: Arc<Vec<Type>>,
-        header: Option<Header>,
-    }
+/// A stream of rows deserialized from the PostgreSQL binary copy format.
+#[pin_project]
+pub struct BinaryCopyOutStream {
+    #[pin]
+    stream: CopyOutStream,
+    types: Arc<Vec<Type>>,
+    header: Option<Header>,
 }
 
 impl BinaryCopyOutStream {

tokio-postgres/src/copy_in.rs

@@ -8,7 +8,7 @@ use futures::channel::mpsc;
 use futures::future;
 use futures::{ready, Sink, SinkExt, Stream, StreamExt};
 use log::debug;
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use postgres_protocol::message::backend::Message;
 use postgres_protocol::message::frontend;
 use postgres_protocol::message::frontend::CopyData;
@@ -69,21 +69,20 @@ enum SinkState {
     Reading,
 }
 
-pin_project! {
-    /// A sink for `COPY ... FROM STDIN` query data.
-    ///
-    /// The copy *must* be explicitly completed via the `Sink::close` or `finish` methods. If it is
-    /// not, the copy will be aborted.
-    pub struct CopyInSink<T> {
-        #[pin]
-        sender: mpsc::Sender<CopyInMessage>,
-        responses: Responses,
-        buf: BytesMut,
-        state: SinkState,
-        #[pin]
-        _p: PhantomPinned,
-        _p2: PhantomData<T>,
-    }
+/// A sink for `COPY ... FROM STDIN` query data.
+///
+/// The copy *must* be explicitly completed via the `Sink::close` or `finish` methods. If it is
+/// not, the copy will be aborted.
+#[pin_project]
+pub struct CopyInSink<T> {
+    #[pin]
+    sender: mpsc::Sender<CopyInMessage>,
+    responses: Responses,
+    buf: BytesMut,
+    state: SinkState,
+    #[pin]
+    _p: PhantomPinned,
+    _p2: PhantomData<T>,
 }
 
 impl<T> CopyInSink<T>

tokio-postgres/src/copy_out.rs

@@ -5,7 +5,7 @@ use crate::{query, slice_iter, Error, Statement};
 use bytes::Bytes;
 use futures::{ready, Stream};
 use log::debug;
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use postgres_protocol::message::backend::Message;
 use std::marker::PhantomPinned;
 use std::pin::Pin;
@@ -38,13 +38,12 @@ async fn start(client: &InnerClient, buf: Bytes) -> Result<Responses, Error> {
     Ok(responses)
 }
 
-pin_project! {
-    /// A stream of `COPY ... TO STDOUT` query data.
-    pub struct CopyOutStream {
-        responses: Responses,
-        #[pin]
-        _p: PhantomPinned,
-    }
+/// A stream of `COPY ... TO STDOUT` query data.
+#[pin_project]
+pub struct CopyOutStream {
+    responses: Responses,
+    #[pin]
+    _p: PhantomPinned,
 }
 
 impl Stream for CopyOutStream {

tokio-postgres/src/query.rs

@@ -6,7 +6,7 @@ use crate::{Error, Portal, Row, Statement};
 use bytes::{Bytes, BytesMut};
 use futures::{ready, Stream};
 use log::{debug, log_enabled, Level};
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use postgres_protocol::message::backend::Message;
 use postgres_protocol::message::frontend;
 use std::fmt;
@@ -188,14 +188,13 @@ where
     }
 }
 
-pin_project! {
-    /// A stream of table rows.
-    pub struct RowStream {
-        statement: Statement,
-        responses: Responses,
-        #[pin]
-        _p: PhantomPinned,
-    }
+/// A stream of table rows.
+#[pin_project]
+pub struct RowStream {
+    statement: Statement,
+    responses: Responses,
+    #[pin]
+    _p: PhantomPinned,
 }
 
 impl Stream for RowStream {

tokio-postgres/src/simple_query.rs

@@ -6,7 +6,7 @@ use bytes::Bytes;
 use fallible_iterator::FallibleIterator;
 use futures::{ready, Stream};
 use log::debug;
-use pin_project_lite::pin_project;
+use pin_project::pin_project;
 use postgres_protocol::message::backend::Message;
 use postgres_protocol::message::frontend;
 use std::marker::PhantomPinned;
@@ -52,14 +52,13 @@ fn encode(client: &InnerClient, query: &str) -> Result<Bytes, Error> {
     })
 }
 
-pin_project! {
-    /// A stream of simple query results.
-    pub struct SimpleQueryStream {
-        responses: Responses,
-        columns: Option<Arc<[String]>>,
-        #[pin]
-        _p: PhantomPinned,
-    }
+/// A stream of simple query results.
+#[pin_project]
+pub struct SimpleQueryStream {
+    responses: Responses,
+    columns: Option<Arc<[String]>>,
+    #[pin]
+    _p: PhantomPinned,
 }
 
 impl Stream for SimpleQueryStream {