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

seanmonstar · seanmonstar · commit 09156a70a63c · 2018-09-28T12:02:21.000-07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -49,9 +49,6 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 
-[build-dependencies]
-rustc_version = "0.2.3"
-
 [features]
 default = [
     "__internal_flaky_tests",
diff --git a/build.rs b/build.rs
diff --git a/src/client/conn.rs b/src/client/conn.rs
@@ -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))))
             }
-        })
+        }
     }
 }
 
diff --git a/src/common/macros.rs b/src/common/macros.rs
diff --git a/src/common/mod.rs b/src/common/mod.rs
@@ -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;
diff --git a/src/headers.rs b/src/headers.rs
@@ -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")

Original file line number	Diff line number	Diff line change
`@@ -240,11 +240,11 @@ where`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`
`243`		`- pub(crate) fn send_request_retryable(&mut self, req: Request<B>) -> impl_trait!(ty: Future<Item = Response<Body>, Error = (::Error, Option<Request<B>>)> + Send)`
	`243`	`+ pub(crate) fn send_request_retryable(&mut self, req: Request<B>) -> impl Future<Item = Response<Body>, Error = (::Error, Option<Request<B>>)>`
`244`	`244`	`where`
`245`	`245`	`B: Send,`
`246`	`246`	`{`
`247`		`- impl_trait!(e: match self.dispatch.try_send(req) {`
	`247`	`+ match self.dispatch.try_send(req) {`
`248`	`248`	`Ok(rx) => {`
`249`	`249`	`Either::A(rx.then(move \|res\| {`
`250`	`250`	`match res {`
`@@ -260,7 +260,7 @@ where`
`260`	`260`	`let err = ::Error::new_canceled(Some("connection was not ready"));`
`261`	`261`	`Either::B(future::err((err, Some(req))))`
`262`	`262`	`}`
`263`		`- })`
	`263`	`+ }`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
`@@ -300,11 +300,11 @@ impl<B> Http2SendRequest<B>`
`300`	`300`	`where`
`301`	`301`	`B: Payload + 'static,`
`302`	`302`	`{`
`303`		`- pub(super) fn send_request_retryable(&mut self, req: Request<B>) -> impl_trait!(ty: Future<Item=Response<Body>, Error=(::Error, Option<Request<B>>)> + Send)`
	`303`	`+ pub(super) fn send_request_retryable(&mut self, req: Request<B>) -> impl Future<Item=Response<Body>, Error=(::Error, Option<Request<B>>)>`
`304`	`304`	`where`
`305`	`305`	`B: Send,`
`306`	`306`	`{`
`307`		`- impl_trait!(e: match self.dispatch.try_send(req) {`
	`307`	`+ match self.dispatch.try_send(req) {`
`308`	`308`	`Ok(rx) => {`
`309`	`309`	`Either::A(rx.then(move \|res\| {`
`310`	`310`	`match res {`
`@@ -320,7 +320,7 @@ where`
`320`	`320`	`let err = ::Error::new_canceled(Some("connection was not ready"));`
`321`	`321`	`Either::B(future::err((err, Some(req))))`
`322`	`322`	`}`
`323`		`- })`
	`323`	`+ }`
`324`	`324`	`}`
`325`	`325`	`}`
`326`	`326`