forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(client): rename FutureResponse to ResponseFuture

Browse Source 
BREAKING CHANGE: Replace any references of
  `hyper::client::FutureResponse` to `hyper::client::ResponseFuture`.
This commit is contained in:
Sean McArthur
2018-05-04 15:21:59 -07:00
parent ef14a1bd67
commit 04c74ef596
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/client/mod.rs
View File

@@ -172,7 +172,7 @@ where C: Connect + Sync + 'static,
/// This requires that the `Payload` type have a `Default` implementation. /// This requires that the `Payload` type have a `Default` implementation.
/// It *should* return an "empty" version of itself, such that /// It *should* return an "empty" version of itself, such that
/// `Payload::is_end_stream` is `true`. /// `Payload::is_end_stream` is `true`.
pub fn get(&self, uri: Uri) -> FutureResponse pub fn get(&self, uri: Uri) -> ResponseFuture
where where
B: Default, B: Default,
{ {
@@ -187,20 +187,20 @@ where C: Connect + Sync + 'static,
} }
/// Send a constructed Request using this Client. /// Send a constructed Request using this Client.
pub fn request(&self, mut req: Request<B>) -> FutureResponse { pub fn request(&self, mut req: Request<B>) -> ResponseFuture {
match req.version() { match req.version() {
Version::HTTP_10 | Version::HTTP_10 |
Version::HTTP_11 => (), Version::HTTP_11 => (),
other => { other => {
error!("Request has unsupported version \"{:?}\"", other); error!("Request has unsupported version \"{:?}\"", other);
//TODO: replace this with a proper variant //TODO: replace this with a proper variant
return FutureResponse(Box::new(future::err(::Error::new_user_unsupported_version()))); return ResponseFuture::new(Box::new(future::err(::Error::new_user_unsupported_version())));
} }
} }
if req.method() == &Method::CONNECT { if req.method() == &Method::CONNECT {
debug!("Client does not support CONNECT requests"); debug!("Client does not support CONNECT requests");
return FutureResponse(Box::new(future::err(::Error::new_user_unsupported_request_method()))); return ResponseFuture::new(Box::new(future::err(::Error::new_user_unsupported_request_method())));
} }
let uri = req.uri().clone(); let uri = req.uri().clone();
@@ -210,7 +210,7 @@ where C: Connect + Sync + 'static,
} }
_ => { _ => {
//TODO: replace this with a proper variant //TODO: replace this with a proper variant
return FutureResponse(Box::new(future::err(::Error::new_io( return ResponseFuture::new(Box::new(future::err(::Error::new_io(
io::Error::new( io::Error::new(
io::ErrorKind::InvalidInput, io::ErrorKind::InvalidInput,
"invalid URI for Client Request" "invalid URI for Client Request"
@@ -241,7 +241,7 @@ where C: Connect + Sync + 'static,
domain: domain, domain: domain,
uri: uri, uri: uri,
}; };
FutureResponse(Box::new(fut)) ResponseFuture::new(Box::new(fut))
} }
//TODO: replace with `impl Future` when stable //TODO: replace with `impl Future` when stable
@@ -429,20 +429,30 @@ impl<C, B> fmt::Debug for Client<C, B> {
/// A `Future` that will resolve to an HTTP Response. /// A `Future` that will resolve to an HTTP Response.
#[must_use = "futures do nothing unless polled"] #[must_use = "futures do nothing unless polled"]
pub struct FutureResponse(Box<Future<Item=Response<Body>, Error=::Error> + Send + 'static>); pub struct ResponseFuture {
inner: Box<Future<Item=Response<Body>, Error=::Error> + Send>,
}
impl fmt::Debug for FutureResponse { impl ResponseFuture {
fn new(fut: Box<Future<Item=Response<Body>, Error=::Error> + Send>) -> Self {
Self {
inner: fut,
}
}
}
impl fmt::Debug for ResponseFuture {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.pad("Future<Response>") f.pad("Future<Response>")
} }
} }
impl Future for FutureResponse { impl Future for ResponseFuture {
type Item = Response<Body>; type Item = Response<Body>;
type Error = ::Error; type Error = ::Error;
fn poll(&mut self) -> Poll<Self::Item, Self::Error> { fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
self.0.poll() self.inner.poll()
} }
} }
@@ -704,7 +714,7 @@ impl Builder {
/// connection, and then encounters an error immediately as the idle /// connection, and then encounters an error immediately as the idle
/// connection was found to be unusable. /// connection was found to be unusable.
/// ///
/// When this is set to `false`, the related `FutureResponse` would instead /// When this is set to `false`, the related `ResponseFuture` would instead
/// resolve to an `Error::Cancel`. /// resolve to an `Error::Cancel`.
/// ///
/// Default is `true`. /// Default is `true`.