context changes (#5)

Author: dbcfd

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: rust
 rust:
-    - nightly-2019-04-07
+    - nightly
 sudo: false
 cache:
   - apt

Cargo.toml

@@ -7,15 +7,15 @@ edition = "2018"
 # - Update CHANGELOG.md.
 # - Update doc URL.
 # - Create "v0.1.x" git tag.
-version = "0.3.0-alpha.3"
+version = "0.3.0-alpha.4"
 license = "MIT"
 readme = "README.md"
 description = """
 TLS support for AsyncRead/AsyncWrite using native-tls
 """
 authors = ["Danny Browning <[email protected]>", "Carl Lerche <[email protected]>"]
 categories = ["asynchronous", "network-programming"]
-documentation = "https://docs.rs/tls-async/0.3.0-alpha.3/tls_async/"
+documentation = "https://docs.rs/tls-async/0.3.0-alpha.4/tls_async/"
 repository = "https://github.com/dbcfd/tls-async"
 
 [dependencies]
@@ -25,13 +25,13 @@ log = "0.4.1"
 native-tls = "0.2"
 
 [dependencies.futures]
-version = "0.3.0-alpha.13"
+version = "0.3.0-alpha.14"
 package = "futures-preview"
 features = ["compat", "io-compat", "std"]
 
 [dev-dependencies]
 cfg-if = "0.1"
-romio = "0.3.0-alpha.3"
+romio = "0.3.0-alpha.5"
 tokio = "0.1"
 
 [dev-dependencies.env_logger]

src/acceptor.rs

@@ -118,7 +118,7 @@ impl TlsAcceptor {
     /// `TcpListener`. That socket is then passed to this function to perform
     /// the server half of accepting a client connection.
     pub fn accept<S>(&self, stream: S) -> PendingTlsStream<S>
-        where S: AsyncRead + AsyncWrite,
+        where S: AsyncRead + AsyncWrite + Unpin,
     {
         PendingTlsStream::new(self.inner.accept(stream.compat()))
     }

src/connector.rs

@@ -156,7 +156,7 @@ impl TlsConnector {
     /// provided here to perform the client half of a connection to a
     /// TLS-powered server.
     pub fn connect<'a, S>(&'a self, domain: &'a str, stream: S) -> PendingTlsStream<S>
-        where S: AsyncRead + AsyncWrite,
+        where S: AsyncRead + AsyncWrite + Unpin,
     {
         PendingTlsStream::new(self.inner.connect(domain, stream.compat()))
     }

src/lib.rs

@@ -25,7 +25,8 @@ pub use connector::TlsConnector as TlsConnector;
 pub use errors::Error as Error;
 
 use std::io::{self, Read, Write};
-use std::task::Waker;
+use std::pin::Pin;
+use std::task::Context;
 
 use futures::compat::Compat;
 use futures::io::{AsyncRead, AsyncWrite};
@@ -56,12 +57,18 @@ impl<S> TlsStream<S> {
     pub fn get_mut(&mut self) -> &mut native_tls::TlsStream<Compat<S>> {
         &mut self.inner
     }
+
+    fn inner<'a>(self: Pin<&'a mut Self>) -> &'a mut native_tls::TlsStream<Compat<S>> {
+        unsafe {
+            &mut Pin::get_unchecked_mut(self).inner
+        }
+    }
 }
 
-impl<S: AsyncRead + AsyncWrite> AsyncRead for TlsStream<S> {
-    fn poll_read(&mut self, _lw: &Waker, buf: &mut [u8])
+impl<S: AsyncRead + AsyncWrite + Unpin> AsyncRead for TlsStream<S> {
+    fn poll_read(mut self: Pin<&mut Self>, _cx: &mut Context<'_>, buf: &mut [u8])
                  -> Poll<Result<usize, io::Error>> {
-        match self.inner.read(buf) {
+        match self.as_mut().inner().read(buf) {
             Ok(sz) => Poll::Ready(Ok(sz)),
             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
                 Poll::Pending
@@ -71,10 +78,10 @@ impl<S: AsyncRead + AsyncWrite> AsyncRead for TlsStream<S> {
     }
 }
 
-impl<S: AsyncRead + AsyncWrite> AsyncWrite for TlsStream<S> {
-    fn poll_write(&mut self, _lw: &Waker, buf: &[u8])
+impl<S: AsyncRead + AsyncWrite + Unpin> AsyncWrite for TlsStream<S> {
+    fn poll_write(mut self: Pin<&mut Self>, _cx: &mut Context<'_>, buf: &[u8])
                   -> Poll<Result<usize, io::Error>> {
-        match self.inner.write(buf) {
+        match self.as_mut().inner().write(buf) {
             Ok(sz) => Poll::Ready(Ok(sz)),
             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
                 Poll::Pending
@@ -83,8 +90,8 @@ impl<S: AsyncRead + AsyncWrite> AsyncWrite for TlsStream<S> {
         }
     }
 
-    fn poll_flush(&mut self, _lw: &Waker) -> Poll<Result<(), io::Error>> {
-        match self.inner.flush() {
+    fn poll_flush(mut self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+        match self.as_mut().inner().flush() {
             Ok(sz) => Poll::Ready(Ok(sz)),
             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
                 Poll::Pending
@@ -93,8 +100,8 @@ impl<S: AsyncRead + AsyncWrite> AsyncWrite for TlsStream<S> {
         }
     }
 
-    fn poll_close(&mut self, _lw: &Waker) -> Poll<Result<(), io::Error>> {
-        match self.inner.shutdown() {
+    fn poll_close(mut self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+        match self.as_mut().inner().shutdown() {
             Ok(sz) => Poll::Ready(Ok(sz)),
             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
                 Poll::Pending

src/pending.rs

@@ -2,7 +2,7 @@ use crate::errors::Error;
 use crate::TlsStream;
 
 use std::pin::Pin;
-use std::task::Waker;
+use std::task::Context;
 
 use futures::Future;
 use futures::compat::Compat;
@@ -57,10 +57,10 @@ impl<S> PendingTlsStream<S> {
     }
 }
 
-impl<S: AsyncRead + AsyncWrite + std::fmt::Debug> Future for PendingTlsStream<S> {
+impl<S: AsyncRead + AsyncWrite + std::fmt::Debug + Unpin> Future for PendingTlsStream<S> {
     type Output = Result<TlsStream<S>, Error>;
 
-    fn poll(mut self: Pin<&mut Self>, _lw: &Waker) -> Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Self::Output> {
         loop {
             let handshake = std::mem::replace(self.as_mut().inner(), Handshake::Error(Error::RepeatedHandshake));
             match handshake {