wip: hyper 1.0 upgrade + custom listeners

contrib/ws/src/duplex.rs

@@ -33,7 +33,6 @@ use crate::result::{Result, Error};
 ///
 /// [`StreamExt`]: rocket::futures::StreamExt
 /// [`SinkExt`]: rocket::futures::SinkExt
-
 pub struct DuplexStream(tokio_tungstenite::WebSocketStream<IoStream>);
 
 impl DuplexStream {

contrib/ws/src/websocket.rs

@@ -1,5 +1,4 @@
 use std::io;
-use std::pin::Pin;
 
 use rocket::data::{IoHandler, IoStream};
 use rocket::futures::{self, StreamExt, SinkExt, future::BoxFuture, stream::SplitStream};
@@ -37,10 +36,6 @@ pub struct WebSocket {
 }
 
 impl WebSocket {
-    fn new(key: String) -> WebSocket {
-        WebSocket { config: Config::default(), key }
-    }
-
     /// Change the default connection configuration to `config`.
     ///
     /// # Example
@@ -202,7 +197,9 @@ impl<'r> FromRequest<'r> for WebSocket {
         let is_13 = headers.get_one("Sec-WebSocket-Version").map_or(false, |v| v == "13");
         let key = headers.get_one("Sec-WebSocket-Key").map(|k| derive_accept_key(k.as_bytes()));
         match key {
-            Some(key) if is_upgrade && is_ws && is_13 => Outcome::Success(WebSocket::new(key)),
+            Some(key) if is_upgrade && is_ws && is_13 => {
+                Outcome::Success(WebSocket { key, config: Config::default() })
+            },
             Some(_) | None => Outcome::Forward(Status::BadRequest)
         }
     }
@@ -232,9 +229,9 @@ impl<'r, 'o: 'r, S> Responder<'r, 'o> for MessageStream<'o, S>
 
 #[rocket::async_trait]
 impl IoHandler for Channel<'_> {
-    async fn io(self: Pin<Box<Self>>, io: IoStream) -> io::Result<()> {
-        let channel = Pin::into_inner(self);
-        let result = (channel.handler)(DuplexStream::new(io, channel.ws.config).await).await;
+    async fn io(self: Box<Self>, io: IoStream) -> io::Result<()> {
+        let stream = DuplexStream::new(io, self.ws.config).await;
+        let result = (self.handler)(stream).await;
         handle_result(result).map(|_| ())
     }
 }
@@ -243,9 +240,9 @@ impl IoHandler for Channel<'_> {
 impl<'r, S> IoHandler for MessageStream<'r, S>
     where S: futures::Stream<Item = Result<Message>> + Send + 'r
 {
-    async fn io(self: Pin<Box<Self>>, io: IoStream) -> io::Result<()> {
+    async fn io(self: Box<Self>, io: IoStream) -> io::Result<()> {
         let (mut sink, source) = DuplexStream::new(io, self.ws.config).await.split();
-        let stream = (Pin::into_inner(self).handler)(source);
+        let stream = (self.handler)(source);
         rocket::tokio::pin!(stream);
         while let Some(msg) = stream.next().await {
             let result = match msg {

core/codegen/src/attribute/async_bound/mod.rs

@@ -0,0 +1,61 @@
+use proc_macro2::{TokenStream, Span};
+use devise::{Spanned, Result, ext::SpanDiagnosticExt};
+use syn::{Token, parse_quote, parse_quote_spanned};
+use syn::{TraitItemFn, TypeParamBound, ReturnType, Attribute};
+use syn::punctuated::Punctuated;
+use syn::parse::Parser;
+
+fn _async_bound(
+    args: proc_macro::TokenStream,
+    input: proc_macro::TokenStream
+) -> Result<TokenStream> {
+    let bounds = <Punctuated<TypeParamBound, Token![+]>>::parse_terminated.parse(args)?;
+    if bounds.is_empty() {
+        return Ok(input.into());
+    }
+
+    let mut func: TraitItemFn = syn::parse(input)?;
+    let original: TraitItemFn = func.clone();
+    if !func.sig.asyncness.is_some() {
+        let diag = Span::call_site()
+            .error("attribute can only be applied to async fns")
+            .span_help(func.sig.span(), "this fn declaration must be `async`");
+
+        return Err(diag);
+    }
+
+    let doc: Attribute = parse_quote! {
+        #[doc = concat!(
+            "# Future Bounds",
+            "\n",
+            "**The `Future` generated by this `async fn` must be `", stringify!(#bounds), "`**."
+        )]
+    };
+
+    func.sig.asyncness = None;
+    func.sig.output = match func.sig.output {
+        ReturnType::Type(arrow, ty) => parse_quote_spanned!(ty.span() =>
+            #arrow impl ::core::future::Future<Output = #ty> + #bounds
+        ),
+        default@ReturnType::Default => default
+    };
+
+    Ok(quote! {
+        #[cfg(all(not(doc), rust_analyzer))]
+        #original
+
+        #[cfg(all(doc, not(rust_analyzer)))]
+        #doc
+        #original
+
+        #[cfg(not(any(doc, rust_analyzer)))]
+        #func
+    })
+}
+
+pub fn async_bound(
+    args: proc_macro::TokenStream,
+    input: proc_macro::TokenStream
+) -> TokenStream {
+    _async_bound(args, input).unwrap_or_else(|d| d.emit_as_item_tokens())
+}

core/codegen/src/attribute/mod.rs

@@ -2,3 +2,4 @@ pub mod entry;
 pub mod catch;
 pub mod route;
 pub mod param;
+pub mod async_bound;

core/codegen/src/lib.rs

@@ -1497,3 +1497,10 @@ pub fn internal_guide_tests(input: TokenStream) -> TokenStream {
 pub fn export(input: TokenStream) -> TokenStream {
     emit!(bang::export_internal(input))
 }
+
+/// Private Rocket attribute: `async_bound(Bounds + On + Returned + Future)`.
+#[doc(hidden)]
+#[proc_macro_attribute]
+pub fn async_bound(args: TokenStream, input: TokenStream) -> TokenStream {
+    emit!(attribute::async_bound::async_bound(args, input))
+}

core/http/Cargo.toml

@@ -17,43 +17,22 @@ rust-version = "1.64"
 
 [features]
 default = []
-tls = ["rustls", "tokio-rustls", "rustls-pemfile"]
-mtls = ["tls", "x509-parser"]
-http2 = ["hyper/http2"]
-private-cookies = ["cookie/private", "cookie/key-expansion"]
 serde = ["uncased/with-serde-alloc", "serde_"]
 uuid = ["uuid_"]
 
 [dependencies]
 smallvec = { version = "1.11", features = ["const_generics", "const_new"] }
 percent-encoding = "2"
-http = "0.2"
 time = { version = "0.3", features = ["formatting", "macros"] }
 indexmap = "2"
-rustls = { version = "0.22", optional = true }
-tokio-rustls = { version = "0.25", optional = true }
-rustls-pemfile = { version = "2.0.0", optional = true }
-tokio = { version = "1.6.1", features = ["net", "sync", "time"] }
-log = "0.4"
 ref-cast = "1.0"
 uncased = "0.9.6"
 either = "1"
 pear = "0.2.8"
-pin-project-lite = "0.2"
 memchr = "2"
 stable-pattern = "0.1"
 cookie = { version = "0.18", features = ["percent-encode"] }
 state = "0.6"
-futures = { version = "0.3", default-features = false }
-
-[dependencies.x509-parser]
-version = "0.13"
-optional = true
-
-[dependencies.hyper]
-version = "0.14.9"
-default-features = false
-features = ["http1", "runtime", "server", "stream"]
 
 [dependencies.serde_]
 package = "serde"
@@ -67,6 +46,3 @@ package = "uuid"
 version = "1"
 optional = true
 default-features = false
-
-[dev-dependencies]
-rocket = { path = "../lib", features = ["mtls"] }

core/http/src/header/header.rs

@@ -745,8 +745,7 @@ impl<'h> HeaderMap<'h> {
     /// WARNING: This is unstable! Do not use this method outside of Rocket!
     #[doc(hidden)]
     #[inline]
-    pub fn into_iter_raw(self)
-            -> impl Iterator<Item=(Uncased<'h>, Vec<Cow<'h, str>>)> {
+    pub fn into_iter_raw(self) -> impl Iterator<Item=(Uncased<'h>, Vec<Cow<'h, str>>)> {
         self.headers.into_iter()
     }
 }

core/http/src/lib.rs

@@ -4,15 +4,11 @@
 //! Types that map to concepts in HTTP.
 //!
 //! This module exports types that map to HTTP concepts or to the underlying
-//! HTTP library when needed. Because the underlying HTTP library is likely to
-//! change (see [#17]), types in [`hyper`] should be considered unstable.
-//!
-//! [#17]: https://github.com/rwf2/Rocket/issues/17
+//! HTTP library when needed.
 
 #[macro_use]
 extern crate pear;
 
-pub mod hyper;
 pub mod uri;
 pub mod ext;
 
@@ -22,7 +18,6 @@ mod method;
 mod status;
 mod raw_str;
 mod parse;
-mod listener;
 
 /// Case-preserving, ASCII case-insensitive string types.
 ///
@@ -39,14 +34,8 @@ pub mod uncased {
 pub mod private {
     pub use crate::parse::Indexed;
     pub use smallvec::{SmallVec, Array};
-    pub use crate::listener::{TcpListener, Incoming, Listener, Connection, Certificates};
-    pub use cookie;
 }
 
-#[doc(hidden)]
-#[cfg(feature = "tls")]
-pub mod tls;
-
 pub use crate::method::Method;
 pub use crate::status::{Status, StatusClass};
 pub use crate::raw_str::{RawStr, RawStrBuf};