From 4c6e36e03a6bf6bf6a04a9df4a31fa8cafddf8a9 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 19 Jul 2017 21:27:12 -0700
Subject: [PATCH] Fixes

---
 postgres/src/priv_io.rs    | 2 +-
 tokio-postgres/src/sink.rs | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/postgres/src/priv_io.rs b/postgres/src/priv_io.rs
index 6f07741e..9d233337 100644
--- a/postgres/src/priv_io.rs
+++ b/postgres/src/priv_io.rs
@@ -13,7 +13,7 @@ use std::os::windows::io::{AsRawSocket, RawSocket};
 use postgres_protocol::message::frontend;
 use postgres_protocol::message::backend;
 
-use {Error, Result, TlsMode};
+use {Result, TlsMode};
 use error;
 use tls::TlsStream;
 use params::{ConnectParams, Host};
diff --git a/tokio-postgres/src/sink.rs b/tokio-postgres/src/sink.rs
index 518e0d9b..3d99a0e7 100644
--- a/tokio-postgres/src/sink.rs
+++ b/tokio-postgres/src/sink.rs
@@ -147,15 +147,13 @@ where
                 }
                 Ok(Async::NotReady) => {
                     match sink.poll_complete() {
-                        Ok(Async::Ready(())) => return Ok(Async::Ready((sink, stream.into_inner()))),
-                        Ok(Async::NotReady) => {
+                        Ok(Async::Ready(())) | Ok(Async::NotReady) => {
                             self.sink = Some(sink);
                             self.stream = Some(stream);
                             return Ok(Async::NotReady);
                         }
                         Err(e) => return Err((e, sink, stream.into_inner())),
                     }
-                    return Ok(Async::NotReady);
                 }
                 Err(e) => return Err((e.into(), sink, stream.into_inner())),
             }