From bb8cb056fdecc6779cd0bde9bfdf795413c0d075 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean@seanmonstar.com>
Date: Thu, 31 May 2018 15:51:27 -0700
Subject: [PATCH] refactor(h1): collapse some duplicate methods from Cursor

---
 src/proto/h1/io.rs | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/proto/h1/io.rs b/src/proto/h1/io.rs
index cbe751b8..0e280b00 100644
--- a/src/proto/h1/io.rs
+++ b/src/proto/h1/io.rs
@@ -254,23 +254,13 @@ pub struct Cursor<T> {
 }
 
 impl<T: AsRef<[u8]>> Cursor<T> {
-    pub fn new(bytes: T) -> Cursor<T> {
+    #[inline]
+    pub(crate) fn new(bytes: T) -> Cursor<T> {
         Cursor {
             bytes: bytes,
             pos: 0,
         }
     }
-
-    #[inline]
-    pub fn buf(&self) -> &[u8] {
-        &self.bytes.as_ref()[self.pos..]
-    }
-
-    #[inline]
-    pub fn consume(&mut self, num: usize) {
-        debug_assert!(self.pos + num <= self.bytes.as_ref().len());
-        self.pos += num;
-    }
 }
 
 impl Cursor<Vec<u8>> {
@@ -299,12 +289,13 @@ impl<T: AsRef<[u8]>> Buf for Cursor<T> {
 
     #[inline]
     fn bytes(&self) -> &[u8] {
-        self.buf()
+        &self.bytes.as_ref()[self.pos..]
     }
 
     #[inline]
     fn advance(&mut self, cnt: usize) {
-        self.consume(cnt)
+        debug_assert!(self.pos + cnt <= self.bytes.as_ref().len());
+        self.pos += cnt;
     }
 }