Remove the flush step from connect future

sfackler · sfackler · commit 5bea375b3734 · 2018-08-18T13:02:52.000-07:00
The socket's not buffered, so there's no need to do this.
diff --git a/tokio-postgres/src/proto/connect.rs b/tokio-postgres/src/proto/connect.rs
@@ -7,7 +7,7 @@ use std::io;
 use std::net::{SocketAddr, ToSocketAddrs};
 use std::time::{Duration, Instant};
 use std::vec;
-use tokio_io::io::{flush, read_exact, write_all, Flush, ReadExact, WriteAll};
+use tokio_io::io::{read_exact, write_all, ReadExact, WriteAll};
 use tokio_tcp::{self, TcpStream};
 use tokio_timer::Delay;
 
@@ -61,20 +61,13 @@ pub enum Connect {
         params: ConnectParams,
         tls: TlsMode,
     },
-    #[state_machine_future(transitions(FlushingSsl))]
+    #[state_machine_future(transitions(ReadingSsl))]
     SendingSsl {
         future: WriteAll<Socket, Vec<u8>>,
         params: ConnectParams,
         connector: Box<TlsConnect>,
         required: bool,
     },
-    #[state_machine_future(transitions(ReadingSsl))]
-    FlushingSsl {
-        future: Flush<Socket>,
-        params: ConnectParams,
-        connector: Box<TlsConnect>,
-        required: bool,
-    },
     #[state_machine_future(transitions(ConnectingTls, Ready))]
     ReadingSsl {
         future: ReadExact<Socket, [u8; 1]>,
@@ -240,19 +233,6 @@ impl PollConnect for Connect {
     ) -> Poll<AfterSendingSsl, Error> {
         let (stream, _) = try_ready_closed!(state.future.poll());
         let state = state.take();
-        transition!(FlushingSsl {
-            future: flush(stream),
-            params: state.params,
-            connector: state.connector,
-            required: state.required,
-        })
-    }
-
-    fn poll_flushing_ssl<'a>(
-        state: &'a mut RentToOwn<'a, FlushingSsl>,
-    ) -> Poll<AfterFlushingSsl, Error> {
-        let stream = try_ready_closed!(state.future.poll());
-        let state = state.take();
         transition!(ReadingSsl {
             future: read_exact(stream, [0]),
             params: state.params,
