mirror of https://github.com/stjepang/smol
Merge pull request #227 from smol-rs/hyper-example
Fix hyper-server example
This commit is contained in:
commit
ad0839e1b3
|
@ -39,7 +39,7 @@ async fn listen(listener: Async<TcpListener>, tls: Option<TlsAcceptor>) -> Resul
|
||||||
println!("Listening on {}", host);
|
println!("Listening on {}", host);
|
||||||
|
|
||||||
// Start a hyper server.
|
// Start a hyper server.
|
||||||
Server::builder(SmolListener::new(listener, tls))
|
Server::builder(SmolListener::new(&listener, tls))
|
||||||
.executor(SmolExecutor)
|
.executor(SmolExecutor)
|
||||||
.serve(make_service_fn(move |_| {
|
.serve(make_service_fn(move |_| {
|
||||||
let host = host.clone();
|
let host = host.clone();
|
||||||
|
@ -78,28 +78,29 @@ impl<F: Future + Send + 'static> hyper::rt::Executor<F> for SmolExecutor {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Listens for incoming connections.
|
/// Listens for incoming connections.
|
||||||
struct SmolListener {
|
struct SmolListener<'a> {
|
||||||
listener: Async<TcpListener>,
|
|
||||||
tls: Option<TlsAcceptor>,
|
tls: Option<TlsAcceptor>,
|
||||||
|
incoming: Pin<Box<dyn Stream<Item = io::Result<Async<TcpStream>>> + Send + 'a>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SmolListener {
|
impl<'a> SmolListener<'a> {
|
||||||
fn new(listener: Async<TcpListener>, tls: Option<TlsAcceptor>) -> Self {
|
fn new(listener: &'a Async<TcpListener>, tls: Option<TlsAcceptor>) -> Self {
|
||||||
Self { listener, tls }
|
Self {
|
||||||
|
incoming: Box::pin(listener.incoming()),
|
||||||
|
tls,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl hyper::server::accept::Accept for SmolListener {
|
impl hyper::server::accept::Accept for SmolListener<'_> {
|
||||||
type Conn = SmolStream;
|
type Conn = SmolStream;
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
fn poll_accept(
|
fn poll_accept(
|
||||||
self: Pin<&mut Self>,
|
mut self: Pin<&mut Self>,
|
||||||
cx: &mut Context,
|
cx: &mut Context,
|
||||||
) -> Poll<Option<Result<Self::Conn, Self::Error>>> {
|
) -> Poll<Option<Result<Self::Conn, Self::Error>>> {
|
||||||
let incoming = self.listener.incoming();
|
let stream = smol::ready!(self.incoming.as_mut().poll_next(cx)).unwrap()?;
|
||||||
smol::pin!(incoming);
|
|
||||||
let stream = smol::ready!(incoming.poll_next(cx)).unwrap()?;
|
|
||||||
|
|
||||||
let stream = match &self.tls {
|
let stream = match &self.tls {
|
||||||
None => SmolStream::Plain(stream),
|
None => SmolStream::Plain(stream),
|
||||||
|
@ -151,7 +152,7 @@ impl tokio::io::AsyncRead for SmolStream {
|
||||||
.map_ok(|size| {
|
.map_ok(|size| {
|
||||||
buf.advance(size);
|
buf.advance(size);
|
||||||
()
|
()
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
SmolStream::Tls(s) => {
|
SmolStream::Tls(s) => {
|
||||||
return Pin::new(s)
|
return Pin::new(s)
|
||||||
|
@ -159,7 +160,7 @@ impl tokio::io::AsyncRead for SmolStream {
|
||||||
.map_ok(|size| {
|
.map_ok(|size| {
|
||||||
buf.advance(size);
|
buf.advance(size);
|
||||||
()
|
()
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
SmolStream::Handshake(f) => {
|
SmolStream::Handshake(f) => {
|
||||||
let s = smol::ready!(f.as_mut().poll(cx))?;
|
let s = smol::ready!(f.as_mut().poll(cx))?;
|
||||||
|
|
Loading…
Reference in New Issue