From e859f899429f0c94fd105a54c8bb520a547db2e7 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Fri, 23 Jun 2017 18:53:30 -0700
Subject: [PATCH] refactor(http): reduce complexity of Conn::start_send

---
 src/http/conn.rs | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/http/conn.rs b/src/http/conn.rs
index 890740db..9fc6816e 100644
--- a/src/http/conn.rs
+++ b/src/http/conn.rs
@@ -213,7 +213,7 @@ where I: AsyncRead + AsyncWrite,
         }
     }
 
-    fn write_head(&mut self, mut head: http::MessageHead<T::Outgoing>, body: bool) -> StartSend<http::MessageHead<T::Outgoing>,io::Error> {
+    fn write_head(&mut self, mut head: http::MessageHead<T::Outgoing>, body: bool) {
         debug_assert!(self.can_write_head());
         if !body {
             head.headers.remove::<TransferEncoding>();
@@ -233,8 +233,6 @@ where I: AsyncRead + AsyncWrite,
         } else {
             Writing::KeepAlive
         };
-
-        Ok(AsyncSink::Ready)
     }
 
     fn write_body(&mut self, chunk: Option<B>) -> StartSend<Option<B>, io::Error> {
@@ -382,24 +380,15 @@ where I: AsyncRead + AsyncWrite,
     type SinkItem = Frame<http::MessageHead<T::Outgoing>, B, ::Error>;
     type SinkError = io::Error;
 
+    #[inline]
     fn start_send(&mut self, frame: Self::SinkItem) -> StartSend<Self::SinkItem, Self::SinkError> {
         trace!("Conn::start_send( frame={:?} )", DebugFrame(&frame));
 
         let frame: Self::SinkItem = match frame {
             Frame::Message { message: head, body } => {
                 if self.can_write_head() {
-                    return self.write_head(head, body)
-                        .map(|async| {
-                            match async {
-                                AsyncSink::Ready => AsyncSink::Ready,
-                                AsyncSink::NotReady(head) => {
-                                    AsyncSink::NotReady(Frame::Message {
-                                        message: head,
-                                        body: body,
-                                    })
-                                }
-                            }
-                        })
+                    self.write_head(head, body);
+                    return Ok(AsyncSink::Ready);
                 } else {
                     Frame::Message { message: head, body: body }
                 }