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

refactor(server): remove deprecated API

Browse Source
This commit is contained in:
Sean McArthur
2019-12-09 13:03:43 -08:00
parent c775525109
commit f45137ad6d
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/conn.rs
View File

@@ -15,7 +15,6 @@ use std::mem;
use std::net::SocketAddr; use std::net::SocketAddr;
use bytes::Bytes; use bytes::Bytes;
use futures_core::Stream;
use pin_project::{pin_project, project}; use pin_project::{pin_project, project};
use tokio::io::{AsyncRead, AsyncWrite}; use tokio::io::{AsyncRead, AsyncWrite};
@@ -81,7 +80,7 @@ enum ConnectionMode {
#[must_use = "streams do nothing unless polled"] #[must_use = "streams do nothing unless polled"]
#[pin_project] #[pin_project]
#[derive(Debug)] #[derive(Debug)]
pub struct Serve<I, S, E = Exec> { pub(super) struct Serve<I, S, E = Exec> {
#[pin] #[pin]
incoming: I, incoming: I,
make_service: S, make_service: S,
@@ -632,11 +631,13 @@ impl<I, S, E> Serve<I, S, E> {
&self.incoming &self.incoming
} }
/*
/// Get a mutable reference to the incoming stream. /// Get a mutable reference to the incoming stream.
#[inline] #[inline]
pub fn incoming_mut(&mut self) -> &mut I { pub fn incoming_mut(&mut self) -> &mut I {
&mut self.incoming &mut self.incoming
} }
*/
/// Spawn all incoming connections onto the executor in `Http`. /// Spawn all incoming connections onto the executor in `Http`.
pub(super) fn spawn_all(self) -> SpawnAll<I, S, E> { pub(super) fn spawn_all(self) -> SpawnAll<I, S, E> {
@@ -680,23 +681,6 @@ where
} }
} }
// deprecated
impl<I, IO, IE, S, B, E> Stream for Serve<I, S, E>
where
I: Accept<Conn = IO, Error = IE>,
IO: AsyncRead + AsyncWrite + Unpin,
IE: Into<Box<dyn StdError + Send + Sync>>,
S: MakeServiceRef<IO, Body, ResBody = B>,
B: Payload,
E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
{
type Item = crate::Result<Connecting<IO, S::Future, E>>;
fn poll_next(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Option<Self::Item>> {
self.poll_next_(cx)
}
}
// ===== impl Connecting ===== // ===== impl Connecting =====
impl<I, F, S, FE, E, B> Future for Connecting<I, F, E> impl<I, F, S, FE, E, B> Future for Connecting<I, F, E>