Remove Send traits

Author: JanBerktold

Cargo.toml

@@ -40,6 +40,10 @@ smallvec = { version = "1.12", features = ["const_generics", "const_new"], optio
 tracing = { version = "0.1", default-features = false, features = ["std"], optional = true }
 want = { version = "0.3", optional = true }
 
+
+[patch.crates-io]
+http = { git = "https://github.com/JanBerktold/http", rev="cc1cc35" }
+
 [dev-dependencies]
 form_urlencoded = "1"
 futures-channel = { version = "0.3", features = ["sink"] }
@@ -168,6 +172,11 @@ name = "single_threaded"
 path = "examples/single_threaded.rs"
 required-features = ["full"]
 
+[[example]]
+name = "single_threaded_server"
+path = "examples/single_threaded_server.rs"
+required-features = ["http1", "http2", "server"]
+
 [[example]]
 name = "state"
 path = "examples/state.rs"

src/body/mod.rs

@@ -36,11 +36,3 @@ pub(crate) use self::length::DecodedLength;
 
 mod incoming;
 mod length;
-
-fn _assert_send_sync() {
-    fn _assert_send<T: Send>() {}
-    fn _assert_sync<T: Sync>() {}
-
-    _assert_send::<Incoming>();
-    _assert_sync::<Incoming>();
-}

src/client/conn/http1.rs

@@ -565,7 +565,7 @@ mod upgrades {
     #[allow(missing_debug_implementations)]
     pub struct UpgradeableConnection<T, B>
     where
-        T: Read + Write + Unpin + Send + 'static,
+        T: Read + Write + Unpin + 'static,
         B: Body + 'static,
         B::Error: Into<Box<dyn StdError + Send + Sync>>,
     {
@@ -574,9 +574,8 @@ mod upgrades {
 
     impl<I, B> Future for UpgradeableConnection<I, B>
     where
-        I: Read + Write + Unpin + Send + 'static,
+        I: Read + Write + Unpin + 'static,
         B: Body + 'static,
-        B::Data: Send,
         B::Error: Into<Box<dyn StdError + Send + Sync>>,
     {
         type Output = crate::Result<()>;

src/server/conn/http1.rs

@@ -192,10 +192,7 @@ where
     /// Enable this connection to support higher-level HTTP upgrades.
     ///
     /// See [the `upgrade` module](crate::upgrade) for more.
-    pub fn with_upgrades(self) -> UpgradeableConnection<I, S>
-    where
-        I: Send,
-    {
+    pub fn with_upgrades(self) -> UpgradeableConnection<I, S> {
         UpgradeableConnection { inner: Some(self) }
     }
 }
@@ -494,7 +491,7 @@ impl<I, B, S> Future for UpgradeableConnection<I, S>
 where
     S: HttpService<IncomingBody, ResBody = B>,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
-    I: Read + Write + Unpin + Send + 'static,
+    I: Read + Write + Unpin + 'static,
     B: Body + 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
 {
@@ -504,6 +501,7 @@ where
         match ready!(Pin::new(&mut self.inner.as_mut().unwrap().conn).poll(cx)) {
             Ok(proto::Dispatched::Shutdown) => Poll::Ready(Ok(())),
             Ok(proto::Dispatched::Upgrade(pending)) => {
+                println!("upgrade");
                 let (io, buf, _) = self.inner.take().unwrap().conn.into_inner();
                 pending.fulfill(Upgraded::new(io, buf));
                 Poll::Ready(Ok(()))

src/upgrade.rs

@@ -63,7 +63,7 @@ use crate::common::io::Rewind;
 /// Alternatively, if the exact type is known, this can be deconstructed
 /// into its parts.
 pub struct Upgraded {
-    io: Rewind<Box<dyn Io + Send>>,
+    io: Rewind<Box<dyn Io>>,
 }
 
 /// A future for a possible HTTP upgrade.
@@ -137,7 +137,7 @@ impl Upgraded {
     ))]
     pub(super) fn new<T>(io: T, read_buf: Bytes) -> Self
     where
-        T: Read + Write + Unpin + Send + 'static,
+        T: Read + Write + Unpin + 'static,
     {
         Upgraded {
             io: Rewind::new_buffered(Box::new(io), read_buf),
@@ -295,7 +295,7 @@ pub(super) trait Io: Read + Write + Unpin + 'static {
 
 impl<T: Read + Write + Unpin + 'static> Io for T {}
 
-impl dyn Io + Send {
+impl dyn Io {
     fn __hyper_is<T: Io>(&self) -> bool {
         let t = TypeId::of::<T>();
         self.__hyper_type_id() == t