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

chore(server): stop using deprecated method internally

Browse Source
This commit is contained in:
Sean McArthur
2019-09-11 11:00:48 -07:00
parent 1f3a8393e8
commit d36e028b21
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/conn.rs
View File

@@ -470,6 +470,27 @@ impl<E> Http<E> {
protocol: self.clone(), protocol: self.clone(),
} }
} }
pub(super) fn serve<I, IO, IE, S, Bd>(&self, incoming: I, make_service: S) -> Serve<I, S, E>
where
I: Accept<Conn=IO, Error=IE>,
IE: Into<Box<dyn StdError + Send + Sync>>,
IO: AsyncRead + AsyncWrite + Unpin,
S: MakeServiceRef<
IO,
Body,
ResBody=Bd,
>,
S::Error: Into<Box<dyn StdError + Send + Sync>>,
Bd: Payload,
E: H2Exec<<S::Service as Service<Body>>::Future, Bd>,
{
Serve {
incoming,
make_service,
protocol: self.clone(),
}
}
} }

2
src/server/mod.rs
View File

@@ -394,7 +394,7 @@ impl<I, E> Builder<I, E> {
E: NewSvcExec<I::Conn, S::Future, S::Service, E, NoopWatcher>, E: NewSvcExec<I::Conn, S::Future, S::Service, E, NoopWatcher>,
E: H2Exec<<S::Service as Service<Body>>::Future, B>, E: H2Exec<<S::Service as Service<Body>>::Future, B>,
{ {
let serve = self.protocol.serve_incoming(self.incoming, new_service); let serve = self.protocol.serve(self.incoming, new_service);
let spawn_all = serve.spawn_all(); let spawn_all = serve.spawn_all();
Server { Server {
spawn_all, spawn_all,