From 2f0470bcf3c4acea408c27cc587b8c032c2c382b Mon Sep 17 00:00:00 2001
From: Yazad Daruvala <y.daruvala@gmail.com>
Date: Wed, 10 May 2017 23:52:45 -0700
Subject: [PATCH] refactor(http): delete some indirection around
 Http1Transaction::parse

---
 src/http/h1/mod.rs   |  2 --
 src/http/h1/parse.rs | 31 +++++++++++++++----------------
 src/http/io.rs       |  8 ++------
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/http/h1/mod.rs b/src/http/h1/mod.rs
index 12101444..fcedf141 100644
--- a/src/http/h1/mod.rs
+++ b/src/http/h1/mod.rs
@@ -1,8 +1,6 @@
 pub use self::decode::Decoder;
 pub use self::encode::Encoder;
 
-pub use self::parse::parse;
-
 mod decode;
 mod encode;
 pub mod parse;
diff --git a/src/http/h1/parse.rs b/src/http/h1/parse.rs
index 8a952099..9ad0f7fa 100644
--- a/src/http/h1/parse.rs
+++ b/src/http/h1/parse.rs
@@ -15,19 +15,15 @@ use version::HttpVersion::{Http10, Http11};
 const MAX_HEADERS: usize = 100;
 const AVERAGE_HEADER_SIZE: usize = 30; // totally scientific
 
-pub fn parse<T: Http1Transaction<Incoming=I>, I>(buf: &mut BytesMut) -> ParseResult<I> {
-    if buf.len() == 0 {
-        return Ok(None);
-    }
-    trace!("parse({:?})", buf);
-    <T as Http1Transaction>::parse(buf)
-}
-
 impl Http1Transaction for ServerTransaction {
     type Incoming = RequestLine;
     type Outgoing = StatusCode;
 
     fn parse(buf: &mut BytesMut) -> ParseResult<RequestLine> {
+        if buf.len() == 0 {
+            return Ok(None);
+        }
+        trace!("parse({:?})", buf);
         let mut headers_indices = [HeaderIndices {
             name: (0, 0),
             value: (0, 0)
@@ -145,6 +141,10 @@ impl Http1Transaction for ClientTransaction {
     type Outgoing = RequestLine;
 
     fn parse(buf: &mut BytesMut) -> ParseResult<RawStatus> {
+        if buf.len() == 0 {
+            return Ok(None);
+        }
+        trace!("parse({:?})", buf);
         let mut headers_indices = [HeaderIndices {
             name: (0, 0),
             value: (0, 0)
@@ -332,9 +332,8 @@ fn extend(dst: &mut Vec<u8>, data: &[u8]) {
 
 #[cfg(test)]
 mod tests {
-    use http;
+    use http::{ServerTransaction, ClientTransaction, Http1Transaction};
     use bytes::BytesMut;
-    use super::{parse};
 
     #[test]
     fn test_parse_request() {
@@ -342,7 +341,7 @@ mod tests {
         let _ = pretty_env_logger::init();
         let mut raw = BytesMut::from(b"GET /echo HTTP/1.1\r\nHost: hyper.rs\r\n\r\n".to_vec());
         let expected_len = raw.len();
-        let (req, len) = parse::<http::ServerTransaction, _>(&mut raw).unwrap().unwrap();
+        let (req, len) = ServerTransaction::parse(&mut raw).unwrap().unwrap();
         assert_eq!(len, expected_len);
         assert_eq!(req.subject.0, ::Method::Get);
         assert_eq!(req.subject.1, "/echo");
@@ -358,7 +357,7 @@ mod tests {
         let _ = pretty_env_logger::init();
         let mut raw = BytesMut::from(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n".to_vec());
         let expected_len = raw.len();
-        let (req, len) = parse::<http::ClientTransaction, _>(&mut raw).unwrap().unwrap();
+        let (req, len) = ClientTransaction::parse(&mut raw).unwrap().unwrap();
         assert_eq!(len, expected_len);
         assert_eq!(req.subject.0, 200);
         assert_eq!(req.subject.1, "OK");
@@ -370,16 +369,16 @@ mod tests {
     #[test]
     fn test_parse_request_errors() {
         let mut raw = BytesMut::from(b"GET htt:p// HTTP/1.1\r\nHost: hyper.rs\r\n\r\n".to_vec());
-        parse::<http::ServerTransaction, _>(&mut raw).unwrap_err();
+        ServerTransaction::parse(&mut raw).unwrap_err();
     }
     #[test]
     fn test_parse_raw_status() {
         let mut raw = BytesMut::from(b"HTTP/1.1 200 OK\r\n\r\n".to_vec());
-        let (res, _) = parse::<http::ClientTransaction, _>(&mut raw).unwrap().unwrap();
+        let (res, _) = ClientTransaction::parse(&mut raw).unwrap().unwrap();
         assert_eq!(res.subject.1, "OK");
 
         let mut raw = BytesMut::from(b"HTTP/1.1 200 Howdy\r\n\r\n".to_vec());
-        let (res, _) = parse::<http::ClientTransaction, _>(&mut raw).unwrap().unwrap();
+        let (res, _) = ClientTransaction::parse(&mut raw).unwrap().unwrap();
         assert_eq!(res.subject.1, "Howdy");
     }
 
@@ -412,7 +411,7 @@ mod tests {
 
         b.bytes = len as u64;
         b.iter(|| {
-            parse::<http::ServerTransaction, _>(&mut raw).unwrap();
+            ServerTransaction::parse(&mut raw).unwrap();
             restart(&mut raw, len);
         });
 
diff --git a/src/http/io.rs b/src/http/io.rs
index dd82bc04..3c795fe1 100644
--- a/src/http/io.rs
+++ b/src/http/io.rs
@@ -5,7 +5,7 @@ use std::ptr;
 
 use tokio_io::{AsyncRead, AsyncWrite};
 
-use http::{Http1Transaction, h1, MessageHead, ParseResult, DebugTruncate};
+use http::{Http1Transaction, MessageHead, DebugTruncate};
 use bytes::{BytesMut, Bytes};
 
 const INIT_BUFFER_SIZE: usize = 8192;
@@ -56,7 +56,7 @@ impl<T: AsyncRead + AsyncWrite> Buffered<T> {
 
     pub fn parse<S: Http1Transaction>(&mut self) -> ::Result<Option<MessageHead<S::Incoming>>> {
         loop {
-            match try!(parse::<S, _>(&mut self.read_buf)) {
+            match try!(S::parse(&mut self.read_buf)) {
                 Some(head) => {
                     //trace!("parsed {} bytes out of {}", len, self.read_buf.len());
                     return Ok(Some(head.0))
@@ -151,10 +151,6 @@ impl<T: Write> Write for Buffered<T> {
     }
 }
 
-fn parse<T: Http1Transaction<Incoming=I>, I>(rdr: &mut BytesMut) -> ParseResult<I> {
-    h1::parse::<T, I>(rdr)
-}
-
 pub trait MemRead {
     fn read_mem(&mut self, len: usize) -> io::Result<Bytes>;
 }