Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down
10 changes: 5 additions & 5 deletions src/server/conn/auto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -75,7 +75,7 @@ impl<E> Builder<E> {
B::Data: Send,
B::Error: Into<Box<dyn StdError + Send + Sync>>,
I: AsyncRead + AsyncWrite + Unpin + 'static,
E: Http2ConnExec<S::Future, B>,
E: Http2ServerConnExec<S::Future, B>,
{
let (version, io) = read_version(io).await?;
let io = TokioIo::new(io);
Expand All @@ -99,7 +99,7 @@ impl<E> Builder<E> {
B::Data: Send,
B::Error: Into<Box<dyn StdError + Send + Sync>>,
I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
E: Http2ConnExec<S::Future, B>,
E: Http2ServerConnExec<S::Future, B>,
{
let (version, io) = read_version(io).await?;
let io = TokioIo::new(io);
Expand Down Expand Up @@ -303,7 +303,7 @@ impl<E> Http1Builder<'_, E> {
B::Data: Send,
B::Error: Into<Box<dyn StdError + Send + Sync>>,
I: AsyncRead + AsyncWrite + Unpin + 'static,
E: Http2ConnExec<S::Future, B>,
E: Http2ServerConnExec<S::Future, B>,
{
self.inner.serve_connection(io, service).await
}
Expand Down Expand Up @@ -451,7 +451,7 @@ impl<E> Http2Builder<'_, E> {
B::Data: Send,
B::Error: Into<Box<dyn StdError + Send + Sync>>,
I: AsyncRead + AsyncWrite + Unpin + 'static,
E: Http2ConnExec<S::Future, B>,
E: Http2ServerConnExec<S::Future, B>,
{
self.inner.serve_connection(io, service).await
}
Expand Down