From d36e028b214fec471a876b6b277461eb22905fb8 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Wed, 11 Sep 2019 11:00:48 -0700 Subject: [PATCH] chore(server): stop using deprecated method internally --- src/server/conn.rs | 21 +++++++++++++++++++++ src/server/mod.rs | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/server/conn.rs b/src/server/conn.rs index 7a707860..5d80cc70 100644 --- a/src/server/conn.rs +++ b/src/server/conn.rs @@ -470,6 +470,27 @@ impl Http { protocol: self.clone(), } } + + pub(super) fn serve(&self, incoming: I, make_service: S) -> Serve + where + I: Accept, + IE: Into>, + IO: AsyncRead + AsyncWrite + Unpin, + S: MakeServiceRef< + IO, + Body, + ResBody=Bd, + >, + S::Error: Into>, + Bd: Payload, + E: H2Exec<>::Future, Bd>, + { + Serve { + incoming, + make_service, + protocol: self.clone(), + } + } } diff --git a/src/server/mod.rs b/src/server/mod.rs index 152f6733..da125b38 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -394,7 +394,7 @@ impl Builder { E: NewSvcExec, E: H2Exec<>::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(); Server { spawn_all,