diff --git a/src/async_impl/client.rs b/src/async_impl/client.rs index fe9e4e6..56e0ed2 100644 --- a/src/async_impl/client.rs +++ b/src/async_impl/client.rs @@ -12,7 +12,7 @@ use native_tls::{TlsConnector, TlsConnectorBuilder}; use super::body; -use super::request::{self, Request, RequestBuilder}; +use super::request::{Request, RequestBuilder}; use super::response::Response; use connect::Connector; use into_url::to_uri; @@ -295,7 +295,7 @@ impl Client { Ok(url) => Ok(Request::new(method, url)), Err(err) => Err(::error::from(err)), }; - request::builder(self.clone(), req) + RequestBuilder::new(self.clone(), req) } /// Executes a `Request`. @@ -321,7 +321,7 @@ impl Client { url, user_headers, body - ) = request::pieces(req); + ) = req.pieces(); let mut headers = self.inner.headers.clone(); // default headers for (key, value) in user_headers.iter() { diff --git a/src/async_impl/request.rs b/src/async_impl/request.rs index 96953e8..422ee86 100644 --- a/src/async_impl/request.rs +++ b/src/async_impl/request.rs @@ -84,9 +84,20 @@ impl Request { pub fn body_mut(&mut self) -> &mut Option { &mut self.body } + + pub(super) fn pieces(self) -> (Method, Url, HeaderMap, Option) { + (self.method, self.url, self.headers, self.body) + } } impl RequestBuilder { + pub(super) fn new(client: Client, request: ::Result) -> RequestBuilder { + RequestBuilder { + client, + request, + } + } + /// Add a `Header` to this Request. pub fn header(mut self, key: K, value: V) -> RequestBuilder where @@ -301,20 +312,6 @@ fn fmt_request_fields<'a, 'b>(f: &'a mut fmt::DebugStruct<'a, 'b>, req: &Request .field("headers", &req.headers) } -// pub(crate) - -#[inline] -pub fn builder(client: Client, request: ::Result) -> RequestBuilder { - RequestBuilder { - client, - request, - } -} - -#[inline] -pub fn pieces(req: Request) -> (Method, Url, HeaderMap, Option) { - (req.method, req.url, req.headers, req.body) -} #[cfg(test)] mod tests {