From c266c25c8f2f9d9bf3783ecc85a2b4bb6c8a465e Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 26 Jul 2017 15:55:20 -0700
Subject: [PATCH] Rename Builder::head

---
 src/error.rs    | 6 +-----
 src/request.rs  | 5 ++---
 src/response.rs | 5 ++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index 71f93e9..de9ea87 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -32,11 +32,7 @@ enum ErrorKind {
 
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", error::Error::description(self))?;
-        match self.inner {
-            ErrorKind::Io(ref e) => write!(f, ": {}", e),
-            _ => Ok(())
-        }
+        error::Error::description(self).fmt(f)
     }
 }
 
diff --git a/src/request.rs b/src/request.rs
index f644028..209087d 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -508,8 +508,7 @@ impl Builder {
         self
     }
 
-    /// "Consumes" this builder, returning the constructed `Head`.
-    fn head(&mut self) -> Result<Parts> {
+    fn take_parts(&mut self) -> Result<Parts> {
         let ret = self.head.take().expect("cannot reuse request builder");
         if let Some(e) = self.err.take() {
             return Err(e)
@@ -544,7 +543,7 @@ impl Builder {
     /// ```
     pub fn body<T>(&mut self, body: T) -> Result<Request<T>> {
         Ok(Request {
-            head: self.head()?,
+            head: self.take_parts()?,
             body: body,
         })
     }
diff --git a/src/response.rs b/src/response.rs
index 27f6feb..28c0cbf 100644
--- a/src/response.rs
+++ b/src/response.rs
@@ -450,8 +450,7 @@ impl Builder {
         self
     }
 
-    /// "Consumes" this builder, returning the constructed `Parts`.
-    fn head(&mut self) -> Result<Parts> {
+    fn take_parts(&mut self) -> Result<Parts> {
         let ret = self.head.take().expect("cannot reuse response builder");
         if let Some(e) = self.err.take() {
             return Err(e)
@@ -486,7 +485,7 @@ impl Builder {
     /// ```
     pub fn body<T>(&mut self, body: T) -> Result<Response<T>> {
         Ok(Response {
-            head: self.head()?,
+            head: self.take_parts()?,
             body: body,
         })
     }