diff --git a/CHANGES.md b/CHANGES.md index 03ae7a25d..dd92b1408 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,8 @@ * Use more ergonomic `actix_web::Error` instead of `http::Error` for `HttpResponseBuilder::body()` +* Use more ergonomic `actix_web::Error` instead of `http::Error` for `ClientRequestBuilder::body()` + ## 0.4.10 (2018-03-20) diff --git a/src/client/request.rs b/src/client/request.rs index d7e634736..fdff515ab 100644 --- a/src/client/request.rs +++ b/src/client/request.rs @@ -542,9 +542,9 @@ impl ClientRequestBuilder { /// Set a body and generate `ClientRequest`. /// /// `ClientRequestBuilder` can not be used after this call. - pub fn body>(&mut self, body: B) -> Result { + pub fn body>(&mut self, body: B) -> Result { if let Some(e) = self.err.take() { - return Err(e) + return Err(e.into()) } if self.default_headers { @@ -596,13 +596,13 @@ impl ClientRequestBuilder { self.header(header::CONTENT_TYPE, "application/json"); } - Ok(self.body(body)?) + self.body(body) } /// Set a streaming body and generate `ClientRequest`. /// /// `ClientRequestBuilder` can not be used after this call. - pub fn streaming(&mut self, stream: S) -> Result + pub fn streaming(&mut self, stream: S) -> Result where S: Stream + 'static, E: Into, { @@ -612,7 +612,7 @@ impl ClientRequestBuilder { /// Set an empty body and generate `ClientRequest` /// /// `ClientRequestBuilder` can not be used after this call. - pub fn finish(&mut self) -> Result { + pub fn finish(&mut self) -> Result { self.body(Body::Empty) } diff --git a/src/ws/client.rs b/src/ws/client.rs index 595930989..61001c47b 100644 --- a/src/ws/client.rs +++ b/src/ws/client.rs @@ -18,7 +18,7 @@ use futures::unsync::mpsc::{unbounded, UnboundedSender}; use actix::prelude::*; use body::{Body, Binary}; -use error::UrlParseError; +use error::{Error, UrlParseError}; use header::IntoHeaderValue; use payload::PayloadHelper; use httpmessage::HttpMessage; @@ -68,7 +68,7 @@ pub enum ClientError { #[fail(display="Invalid challenge response")] InvalidChallengeResponse(String, HeaderValue), #[fail(display="Http parsing error")] - Http(HttpError), + Http(Error), #[fail(display="Url parsing error")] Url(UrlParseError), #[fail(display="Response parsing error")] @@ -83,8 +83,8 @@ pub enum ClientError { Disconnected, } -impl From for ClientError { - fn from(err: HttpError) -> ClientError { +impl From for ClientError { + fn from(err: Error) -> ClientError { ClientError::Http(err) } } @@ -224,7 +224,7 @@ impl Client { ClientHandshake::error(e) } else if let Some(e) = self.http_err.take() { - ClientHandshake::error(e.into()) + ClientHandshake::error(Error::from(e).into()) } else { // origin if let Some(origin) = self.origin.take() {