update to new tokio

godofdream · jbg · commit 73eb49568b8d · 2020-12-02T07:31:57.000+07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,23 +1,23 @@
 [package]
 name = "tokio-postgres-rustls"
 description = "Rustls integration for tokio-postgres"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Jasper <jasper@jasperhugo.com>"]
 repository = "https://github.com/jbg/tokio-postgres-rustls"
 edition = "2018"
 license = "MIT"
 readme = "README.md"
 
 [dependencies]
-bytes = "0.5.4"
-futures = "0.3.4"
-ring = "0.16.11"
-rustls = "0.18.0"
-tokio = "0.2.16"
-tokio-postgres = "0.5.3"
-tokio-rustls = "0.14.0"
-webpki = "0.21.2"
+bytes = "0.6"
+futures = "0.3"
+ring = "0.16"
+rustls = "0.19"
+tokio = "0.3"
+tokio-postgres = "0.6"
+tokio-rustls = "0.21"
+webpki = "0.21"
 
 [dev-dependencies]
-env_logger = { version = "0.7.1", default-features = false }
-tokio = { version = "0.2.16", features = ["macros"] }
+env_logger = { version = "0.8", default-features = false }
+tokio = { version = "0.3", features = ["macros", "rt"] }
diff --git a/README.md b/README.md
@@ -17,4 +17,3 @@ let connect_fut = tokio_postgres::connect("sslmode=require host=localhost user=p
 
 # License
 tokio-postgres-rustls is distributed under the MIT license.
-
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,17 +1,15 @@
 use std::{
     future::Future,
     io,
-    mem::MaybeUninit,
     pin::Pin,
     sync::Arc,
     task::{Context, Poll},
 };
 
-use bytes::{Buf, BufMut};
 use futures::future::{FutureExt, TryFutureExt};
 use ring::digest;
 use rustls::{ClientConfig, Session};
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio_postgres::tls::{ChannelBinding, MakeTlsConnect, TlsConnect};
 use tokio_rustls::{client::TlsStream, TlsConnector};
 use webpki::{DNSName, DNSNameRef};
@@ -93,25 +91,11 @@ where
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut Context,
-        buf: &mut [u8],
-    ) -> Poll<tokio::io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<tokio::io::Result<()>> {
         self.0.as_mut().poll_read(cx, buf)
     }
 
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        self.0.prepare_uninitialized_buffer(buf)
-    }
-
-    fn poll_read_buf<B: BufMut>(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context,
-        buf: &mut B,
-    ) -> Poll<tokio::io::Result<usize>>
-    where
-        Self: Sized,
-    {
-        self.0.as_mut().poll_read_buf(cx, buf)
-    }
 }
 
 impl<S> AsyncWrite for RustlsStream<S>
@@ -134,16 +118,6 @@ where
         self.0.as_mut().poll_shutdown(cx)
     }
 
-    fn poll_write_buf<B: Buf>(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context,
-        buf: &mut B,
-    ) -> Poll<tokio::io::Result<usize>>
-    where
-        Self: Sized,
-    {
-        self.0.as_mut().poll_write_buf(cx, buf)
-    }
 }
 
 #[cfg(test)]
@@ -157,7 +131,7 @@ mod tests {
         let config = rustls::ClientConfig::new();
         let tls = super::MakeRustlsConnect::new(config);
         let (client, conn) =
-            tokio_postgres::connect("sslmode=require host=localhost user=postgres", tls)
+            tokio_postgres::connect("sslmode=require host=localhost port=5432 user=postgres", tls)
                 .await
                 .expect("connect");
         tokio::spawn(conn.map_err(|e| panic!("{:?}", e)));

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,3 @@ let connect_fut = tokio_postgres::connect("sslmode=require host=localhost user=p`
`17`	`17`
`18`	`18`	`# License`
`19`	`19`	`tokio-postgres-rustls is distributed under the MIT license.`
`20`		`-`