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

refactor(lib): remove build script features since minimum version is higher

Browse Source
This commit is contained in:
Sean McArthur
2018-09-28 12:02:21 -07:00
parent b0c132023c
commit 09156a70a6
6 changed files with 6 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/client/conn.rs
View File

@@ -240,11 +240,11 @@ where
}
}
pub(crate) fn send_request_retryable(&mut self, req: Request<B>) -> impl_trait!(ty: Future<Item = Response<Body>, Error = (::Error, Option<Request<B>>)> + Send)
pub(crate) fn send_request_retryable(&mut self, req: Request<B>) -> impl Future<Item = Response<Body>, Error = (::Error, Option<Request<B>>)>
where
B: Send,
{
impl_trait!(e: match self.dispatch.try_send(req) {
match self.dispatch.try_send(req) {
Ok(rx) => {
Either::A(rx.then(move |res| {
match res {
@@ -260,7 +260,7 @@ where
let err = ::Error::new_canceled(Some("connection was not ready"));
Either::B(future::err((err, Some(req))))
}
})
}
}
}
@@ -300,11 +300,11 @@ impl<B> Http2SendRequest<B>
where
B: Payload + 'static,
{
pub(super) fn send_request_retryable(&mut self, req: Request<B>) -> impl_trait!(ty: Future<Item=Response<Body>, Error=(::Error, Option<Request<B>>)> + Send)
pub(super) fn send_request_retryable(&mut self, req: Request<B>) -> impl Future<Item=Response<Body>, Error=(::Error, Option<Request<B>>)>
where
B: Send,
{
impl_trait!(e: match self.dispatch.try_send(req) {
match self.dispatch.try_send(req) {
Ok(rx) => {
Either::A(rx.then(move |res| {
match res {
@@ -320,7 +320,7 @@ where
let err = ::Error::new_canceled(Some("connection was not ready"));
Either::B(future::err((err, Some(req))))
}
})
}
}
}

21
src/common/macros.rs
View File

@@ -1,21 +0,0 @@
#[macro_export]
#[cfg(__hyper_impl_trait_available)]
macro_rules! impl_trait {
(ty: $($t:tt)+) => {
impl $($t)+
};
(e: $e:expr) => {
$e
}
}
#[macro_export]
#[cfg(not(__hyper_impl_trait_available))]
macro_rules! impl_trait {
(ty: $($t:tt)+) => {
Box<$($t)+>
};
(e: $e:expr) => {
Box::new($e)
}
}

2
src/common/mod.rs
View File

@@ -3,8 +3,6 @@ pub(crate) mod drain;
mod exec;
pub(crate) mod io;
mod lazy;
#[macro_use]
mod macros;
mod never;
pub(crate) use self::buf::StaticBuf;

2
src/headers.rs
View File

@@ -2,8 +2,6 @@ use bytes::BytesMut;
use http::HeaderMap;
use http::header::{CONTENT_LENGTH, TRANSFER_ENCODING};
use http::header::{HeaderValue, OccupiedEntry, ValueIter};
#[cfg(not(__hyper_inherent_ascii))]
use std::ascii::AsciiExt;
pub fn connection_keep_alive(value: &HeaderValue) -> bool {
connection_has(value, "keep-alive")