Upgrade hyper to 0.14.11 (#9557)

* Upgrade hyper to 0.14.10

* fmt

* Enable required features
This commit is contained in:
Bastian Köcher
2021-08-13 20:31:40 +02:00
committed by GitHub
parent 7e9b8d278e
commit 1aadab917e
8 changed files with 70 additions and 198 deletions
+5 -6
View File
@@ -16,7 +16,7 @@
// limitations under the License.
#[cfg(not(target_os = "unknown"))]
use futures_util::{future::Future, FutureExt};
use futures_util::future::Future;
use prometheus::core::Collector;
pub use prometheus::{
self,
@@ -67,8 +67,9 @@ mod known_os {
use super::*;
use hyper::{
http::StatusCode,
server::Server,
service::{make_service_fn, service_fn},
Body, Request, Response, Server,
Body, Request, Response,
};
#[derive(Debug, derive_more::Display, derive_more::From)]
@@ -153,10 +154,8 @@ mod known_os {
}
});
let server = Server::builder(Incoming(listener.incoming()))
.executor(Executor)
.serve(service)
.boxed();
let server =
Server::builder(Incoming(listener.incoming())).executor(Executor).serve(service);
let result = server.await.map_err(Into::into);
+5 -3
View File
@@ -44,9 +44,11 @@ impl tokio::io::AsyncRead for TcpStream {
fn poll_read(
self: Pin<&mut Self>,
cx: &mut Context,
buf: &mut [u8],
) -> Poll<Result<usize, std::io::Error>> {
Pin::new(&mut Pin::into_inner(self).0).poll_read(cx, buf)
buf: &mut tokio::io::ReadBuf<'_>,
) -> Poll<Result<(), std::io::Error>> {
Pin::new(&mut Pin::into_inner(self).0)
.poll_read(cx, buf.initialized_mut())
.map_ok(drop)
}
}