diff --git a/Cargo.toml b/Cargo.toml index e5da4ee3..6bd57010 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,11 +15,11 @@ edition = "2018" publish = false # no accidents while in dev [dependencies] -hyper = "=1.0.0-rc.4" +hyper = "1.0.0" futures-channel = "0.3" futures-util = { version = "0.3", default-features = false } -http = "0.2" -http-body = "1.0.0-rc.2" +http = "1.0" +http-body = "1.0.0" bytes = "1" pin-project-lite = "0.2.4" socket2 = "0.5" @@ -29,9 +29,9 @@ tower-service = "0.3" tower = { version = "0.4", features = ["make", "util"] } [dev-dependencies] -hyper = { version = "1.0.0-rc.3", features = ["full"] } +hyper = { version = "1.0.0", features = ["full"] } bytes = "1" -http-body-util = "0.1.0-rc.3" +http-body-util = "0.1.0" tokio = { version = "1", features = ["macros", "test-util"] } tokio-test = "0.4" diff --git a/src/server/conn/auto.rs b/src/server/conn/auto.rs index f10450e2..e10c201a 100644 --- a/src/server/conn/auto.rs +++ b/src/server/conn/auto.rs @@ -13,7 +13,7 @@ use http::{Request, Response}; use http_body::Body; use hyper::{ body::Incoming, - rt::{bounds::Http2ConnExec, Timer}, + rt::{bounds::Http2ServerConnExec, Timer}, server::conn::{http1, http2}, service::Service, }; @@ -75,7 +75,7 @@ impl Builder { B::Data: Send, B::Error: Into>, I: AsyncRead + AsyncWrite + Unpin + 'static, - E: Http2ConnExec, + E: Http2ServerConnExec, { let (version, io) = read_version(io).await?; let io = TokioIo::new(io); @@ -99,7 +99,7 @@ impl Builder { B::Data: Send, B::Error: Into>, I: AsyncRead + AsyncWrite + Unpin + Send + 'static, - E: Http2ConnExec, + E: Http2ServerConnExec, { let (version, io) = read_version(io).await?; let io = TokioIo::new(io); @@ -303,7 +303,7 @@ impl Http1Builder<'_, E> { B::Data: Send, B::Error: Into>, I: AsyncRead + AsyncWrite + Unpin + 'static, - E: Http2ConnExec, + E: Http2ServerConnExec, { self.inner.serve_connection(io, service).await } @@ -451,7 +451,7 @@ impl Http2Builder<'_, E> { B::Data: Send, B::Error: Into>, I: AsyncRead + AsyncWrite + Unpin + 'static, - E: Http2ConnExec, + E: Http2ServerConnExec, { self.inner.serve_connection(io, service).await }