From e349ecb85084d3295c0bb55766cf599188f41de5 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 31 Jul 2017 10:35:16 -0700 Subject: [PATCH] Revert "Rename `Builder` to `{Request,Response}Builder`" This reverts commit 4adeec428f2eff5f1496787f827aa51d0306ad38. --- src/lib.rs | 4 ++-- src/request.rs | 42 +++++++++++++++++++++--------------------- src/response.rs | 38 +++++++++++++++++++------------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index f56fbc2..e0b0178 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -181,8 +181,8 @@ pub use error::{Error, Result}; pub use extensions::Extensions; pub use header::HeaderMap; pub use method::Method; -pub use request::{Request, RequestBuilder}; -pub use response::{Response, ResponseBuilder}; +pub use request::Request; +pub use response::Response; pub use status::StatusCode; pub use uri::Uri; pub use version::Version; diff --git a/src/request.rs b/src/request.rs index c8bd7a6..1cf82a9 100644 --- a/src/request.rs +++ b/src/request.rs @@ -189,7 +189,7 @@ pub struct Parts { /// This type can be used to construct an instance or `Request` /// through a builder-like pattern. #[derive(Debug)] -pub struct RequestBuilder { +pub struct Builder { head: Option, err: Option, } @@ -197,7 +197,7 @@ pub struct RequestBuilder { impl Request<()> { /// Creates a new builder-style object to manufacture a `Request` /// - /// This method returns an instance of `RequestBuilder` which can be used to + /// This method returns an instance of `Builder` which can be used to /// create a `Request`. /// /// # Examples @@ -212,8 +212,8 @@ impl Request<()> { /// .unwrap(); /// ``` #[inline] - pub fn builder() -> RequestBuilder { - RequestBuilder::new() + pub fn builder() -> Builder { + Builder::new() } } @@ -486,8 +486,8 @@ impl Parts { } } -impl RequestBuilder { - /// Creates a new default instance of `RequestBuilder` to construct either a +impl Builder { + /// Creates a new default instance of `Builder` to construct either a /// `Head` or a `Request`. /// /// # Examples @@ -495,20 +495,20 @@ impl RequestBuilder { /// ``` /// # use http::*; /// - /// let req = request::RequestBuilder::new() + /// let req = request::Builder::new() /// .method("POST") /// .body(()) /// .unwrap(); /// ``` #[inline] - pub fn new() -> RequestBuilder { - RequestBuilder::default() + pub fn new() -> Builder { + Builder::default() } /// Set the HTTP method for this request. /// /// This function will configure the HTTP method of the `Request` that will - /// be returned from `RequestBuilder::build`. + /// be returned from `Builder::build`. /// /// By default this is `GET`. /// @@ -522,7 +522,7 @@ impl RequestBuilder { /// .body(()) /// .unwrap(); /// ``` - pub fn method(&mut self, method: T) -> &mut RequestBuilder + pub fn method(&mut self, method: T) -> &mut Builder where Method: HttpTryFrom, { if let Some(head) = head(&mut self.head, &self.err) { @@ -537,7 +537,7 @@ impl RequestBuilder { /// Set the URI for this request. /// /// This function will configure the URI of the `Request` that will - /// be returned from `RequestBuilder::build`. + /// be returned from `Builder::build`. /// /// By default this is `/`. /// @@ -551,7 +551,7 @@ impl RequestBuilder { /// .body(()) /// .unwrap(); /// ``` - pub fn uri(&mut self, uri: T) -> &mut RequestBuilder + pub fn uri(&mut self, uri: T) -> &mut Builder where Uri: HttpTryFrom, { if let Some(head) = head(&mut self.head, &self.err) { @@ -566,7 +566,7 @@ impl RequestBuilder { /// Set the HTTP version for this request. /// /// This function will configure the HTTP version of the `Request` that - /// will be returned from `RequestBuilder::build`. + /// will be returned from `Builder::build`. /// /// By default this is HTTP/1.1 /// @@ -581,7 +581,7 @@ impl RequestBuilder { /// .body(()) /// .unwrap(); /// ``` - pub fn version(&mut self, version: Version) -> &mut RequestBuilder { + pub fn version(&mut self, version: Version) -> &mut Builder { if let Some(head) = head(&mut self.head, &self.err) { head.version = version; } @@ -606,7 +606,7 @@ impl RequestBuilder { /// .body(()) /// .unwrap(); /// ``` - pub fn header(&mut self, key: K, value: V) -> &mut RequestBuilder + pub fn header(&mut self, key: K, value: V) -> &mut Builder where K: HeaderMapKey, HeaderValue: HttpTryFrom { @@ -644,7 +644,7 @@ impl RequestBuilder { /// .unwrap(); /// # fn needs_custom_bar_header() -> bool { true } /// ``` - pub fn headers(&mut self, headers: I) -> &mut RequestBuilder + pub fn headers(&mut self, headers: I) -> &mut Builder where I: IntoIterator, K: HeaderMapKey, HeaderValue: HttpTryFrom, @@ -670,7 +670,7 @@ impl RequestBuilder { /// assert_eq!(req.extensions().get::<&'static str>(), /// Some(&"My Extension")); /// ``` - pub fn extension(&mut self, extension: T) -> &mut RequestBuilder + pub fn extension(&mut self, extension: T) -> &mut Builder where T: Any + Send + Sync + 'static, { if let Some(head) = head(&mut self.head, &self.err) { @@ -729,10 +729,10 @@ fn head<'a>(head: &'a mut Option, err: &Option) head.as_mut() } -impl Default for RequestBuilder { +impl Default for Builder { #[inline] - fn default() -> RequestBuilder { - RequestBuilder { + fn default() -> Builder { + Builder { head: Some(Parts::new()), err: None, } diff --git a/src/response.rs b/src/response.rs index dae6f91..589e752 100644 --- a/src/response.rs +++ b/src/response.rs @@ -213,7 +213,7 @@ pub struct Parts { /// This type can be used to construct an instance of `Response` through a /// builder-like pattern. #[derive(Debug)] -pub struct ResponseBuilder { +pub struct Builder { head: Option, err: Option, } @@ -221,7 +221,7 @@ pub struct ResponseBuilder { impl Response<()> { /// Creates a new builder-style object to manufacture a `Response` /// - /// This method returns an instance of `ResponseBuilder` which can be used to + /// This method returns an instance of `Builder` which can be used to /// create a `Response`. /// /// # Examples @@ -235,8 +235,8 @@ impl Response<()> { /// .unwrap(); /// ``` #[inline] - pub fn builder() -> ResponseBuilder { - ResponseBuilder::new() + pub fn builder() -> Builder { + Builder::new() } } @@ -481,8 +481,8 @@ impl Parts { } } -impl ResponseBuilder { - /// Creates a new default instance of `ResponseBuilder` to construct either a +impl Builder { + /// Creates a new default instance of `Builder` to construct either a /// `Head` or a `Response`. /// /// # Examples @@ -490,20 +490,20 @@ impl ResponseBuilder { /// ``` /// # use http::*; /// - /// let response = response::ResponseBuilder::new() + /// let response = response::Builder::new() /// .status(200) /// .body(()) /// .unwrap(); /// ``` #[inline] - pub fn new() -> ResponseBuilder { - ResponseBuilder::default() + pub fn new() -> Builder { + Builder::default() } /// Set the HTTP method for this response. /// /// This function will configure the HTTP status code of the `Response` that - /// will be returned from `ResponseBuilder::build`. + /// will be returned from `Builder::build`. /// /// By default this is `GET`. /// @@ -517,7 +517,7 @@ impl ResponseBuilder { /// .body(()) /// .unwrap(); /// ``` - pub fn status(&mut self, status: T) -> &mut ResponseBuilder + pub fn status(&mut self, status: T) -> &mut Builder where StatusCode: HttpTryFrom, { if let Some(head) = head(&mut self.head, &self.err) { @@ -532,7 +532,7 @@ impl ResponseBuilder { /// Set the HTTP version for this response. /// /// This function will configure the HTTP version of the `Response` that - /// will be returned from `ResponseBuilder::build`. + /// will be returned from `Builder::build`. /// /// By default this is HTTP/1.1 /// @@ -547,7 +547,7 @@ impl ResponseBuilder { /// .body(()) /// .unwrap(); /// ``` - pub fn version(&mut self, version: Version) -> &mut ResponseBuilder { + pub fn version(&mut self, version: Version) -> &mut Builder { if let Some(head) = head(&mut self.head, &self.err) { head.version = version; } @@ -572,7 +572,7 @@ impl ResponseBuilder { /// .body(()) /// .unwrap(); /// ``` - pub fn header(&mut self, key: K, value: V) -> &mut ResponseBuilder + pub fn header(&mut self, key: K, value: V) -> &mut Builder where K: HeaderMapKey, HeaderValue: HttpTryFrom { @@ -610,7 +610,7 @@ impl ResponseBuilder { /// .unwrap(); /// # fn needs_custom_bar_header() -> bool { true } /// ``` - pub fn headers(&mut self, headers: I) -> &mut ResponseBuilder + pub fn headers(&mut self, headers: I) -> &mut Builder where I: IntoIterator, K: HeaderMapKey, HeaderValue: HttpTryFrom, @@ -636,7 +636,7 @@ impl ResponseBuilder { /// assert_eq!(response.extensions().get::<&'static str>(), /// Some(&"My Extension")); /// ``` - pub fn extension(&mut self, extension: T) -> &mut ResponseBuilder + pub fn extension(&mut self, extension: T) -> &mut Builder where T: Any + Send + Sync + 'static, { if let Some(head) = head(&mut self.head, &self.err) { @@ -695,10 +695,10 @@ fn head<'a>(head: &'a mut Option, err: &Option) head.as_mut() } -impl Default for ResponseBuilder { +impl Default for Builder { #[inline] - fn default() -> ResponseBuilder { - ResponseBuilder { + fn default() -> Builder { + Builder { head: Some(Parts::new()), err: None, }