Upgrade to tokio 0.2/futures 0.3

Author: sfackler

postgres-native-tls/Cargo.toml

@@ -16,12 +16,13 @@ default = ["runtime"]
 runtime = ["tokio-postgres/runtime"]
 
 [dependencies]
+bytes = "0.5"
 futures-preview = "=0.3.0-alpha.19"
 native-tls = "0.2"
-tokio-io = "=0.2.0-alpha.6"
-tokio-tls = "=0.3.0-alpha.6"
+tokio = "0.2"
+tokio-tls = "0.3"
 tokio-postgres = { version = "=0.5.0-alpha.1", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
-tokio = "=0.2.0-alpha.6"
+tokio = { version = "0.2", features = ["full"] }
 postgres = { version = "=0.17.0-alpha.1", path = "../postgres" }

postgres-native-tls/src/lib.rs

@@ -48,16 +48,17 @@
 #![doc(html_root_url = "https://docs.rs/postgres-native-tls/0.3")]
 #![warn(rust_2018_idioms, clippy::all, missing_docs)]
 
-use futures::task::Context;
-use futures::Poll;
+use std::task::{Context, Poll};
 use std::future::Future;
 use std::io;
 use std::pin::Pin;
-use tokio_io::{AsyncRead, AsyncWrite, Buf, BufMut};
+use tokio::io::{AsyncRead, AsyncWrite};
+use bytes::{Buf, BufMut};
 use tokio_postgres::tls;
 #[cfg(feature = "runtime")]
 use tokio_postgres::tls::MakeTlsConnect;
 use tokio_postgres::tls::{ChannelBinding, TlsConnect};
+use std::mem::MaybeUninit;
 
 #[cfg(test)]
 mod test;
@@ -134,7 +135,7 @@ impl<S> AsyncRead for TlsStream<S>
 where
     S: AsyncRead + AsyncWrite + Unpin,
 {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [u8]) -> bool {
+    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
         self.0.prepare_uninitialized_buffer(buf)
     }
 

postgres-openssl/Cargo.toml

@@ -16,12 +16,13 @@ default = ["runtime"]
 runtime = ["tokio-postgres/runtime"]
 
 [dependencies]
-futures-preview = "=0.3.0-alpha.19"
+bytes = "0.5"
+futures = "0.3"
 openssl = "0.10"
-tokio-io = "=0.2.0-alpha.6"
-tokio-openssl = "=0.4.0-alpha.6"
+tokio = "0.2"
+tokio-openssl = "0.4"
 tokio-postgres = { version = "=0.5.0-alpha.1", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
-tokio = "=0.2.0-alpha.6"
+tokio = { version = "0.2", features = ["full"] }
 postgres = { version = "=0.17.0-alpha.1", path = "../postgres" }

postgres-openssl/src/lib.rs

@@ -42,8 +42,7 @@
 #![doc(html_root_url = "https://docs.rs/postgres-openssl/0.3")]
 #![warn(rust_2018_idioms, clippy::all, missing_docs)]
 
-use futures::task::Context;
-use futures::Poll;
+use std::task::{Poll, Context};
 #[cfg(feature = "runtime")]
 use openssl::error::ErrorStack;
 use openssl::hash::MessageDigest;
@@ -57,12 +56,14 @@ use std::io;
 use std::pin::Pin;
 #[cfg(feature = "runtime")]
 use std::sync::Arc;
-use tokio_io::{AsyncRead, AsyncWrite, Buf, BufMut};
+use tokio::io::{AsyncRead, AsyncWrite};
+use bytes::{Buf, BufMut};
 use tokio_openssl::{HandshakeError, SslStream};
 use tokio_postgres::tls;
 #[cfg(feature = "runtime")]
 use tokio_postgres::tls::MakeTlsConnect;
 use tokio_postgres::tls::{ChannelBinding, TlsConnect};
+use std::mem::MaybeUninit;
 
 #[cfg(test)]
 mod test;
@@ -156,7 +157,7 @@ impl<S> AsyncRead for TlsStream<S>
 where
     S: AsyncRead + AsyncWrite + Unpin,
 {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [u8]) -> bool {
+    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
         self.0.prepare_uninitialized_buffer(buf)
     }
 

postgres-protocol/Cargo.toml

@@ -11,7 +11,7 @@ readme = "../README.md"
 [dependencies]
 base64 = "0.10"
 byteorder = "1.0"
-bytes = "0.4"
+bytes = "0.5"
 fallible-iterator = "0.2"
 generic-array = "0.13"
 hmac = "0.7"

postgres-protocol/src/lib.rs

@@ -31,37 +31,13 @@ pub enum IsNull {
     No,
 }
 
-// https://github.com/tokio-rs/bytes/issues/170
-struct B<'a>(&'a mut BytesMut);
-
-impl<'a> BufMut for B<'a> {
-    #[inline]
-    fn remaining_mut(&self) -> usize {
-        usize::max_value() - self.0.len()
-    }
-
-    #[inline]
-    unsafe fn advance_mut(&mut self, cnt: usize) {
-        self.0.advance_mut(cnt);
-    }
-
-    #[inline]
-    unsafe fn bytes_mut(&mut self) -> &mut [u8] {
-        if !self.0.has_remaining_mut() {
-            self.0.reserve(64);
-        }
-
-        self.0.bytes_mut()
-    }
-}
-
 fn write_nullable<F, E>(serializer: F, buf: &mut BytesMut) -> Result<(), E>
 where
     F: FnOnce(&mut BytesMut) -> Result<IsNull, E>,
     E: From<io::Error>,
 {
     let base = buf.len();
-    B(buf).put_i32_be(0);
+    buf.put_i32(0);
     let size = match serializer(buf)? {
         IsNull::No => i32::from_usize(buf.len() - base - 4)?,
         IsNull::Yes => -1,

postgres-protocol/src/message/backend.rs

@@ -301,7 +301,7 @@ impl Buffer {
             Some(pos) => {
                 let start = self.idx;
                 let end = start + pos;
-                let cstr = self.bytes.slice(start, end);
+                let cstr = self.bytes.slice(start..end);
                 self.idx = end + 1;
                 Ok(cstr)
             }
@@ -314,7 +314,7 @@ impl Buffer {
 
     #[inline]
     fn read_all(&mut self) -> Bytes {
-        let buf = self.bytes.slice_from(self.idx);
+        let buf = self.bytes.slice(self.idx..);
         self.idx = self.bytes.len();
         buf
     }