Move Send + Sync bounds to higher layers

libp2p · Jun 20, 2022 · 37a23c4 · 37a23c4
1 parent 6943ddb
commit 37a23c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/core/src/muxing.rs b/core/src/muxing.rs
@@ -81,7 +81,7 @@ pub trait StreamMuxer {
     type OutboundSubstream;
 
     /// Error type of the muxer
-    type Error: std::error::Error + Send + Sync + 'static;
+    type Error: std::error::Error;
 
     /// Polls for a connection-wide event.
     ///

diff --git a/core/src/muxing/boxed.rs b/core/src/muxing/boxed.rs
@@ -39,6 +39,7 @@ impl<T> StreamMuxer for Wrap<T>
 where
     T: StreamMuxer,
     T::Substream: AsyncRead + AsyncWrite + Send + Unpin + 'static,
+    T::Error: Send + Sync + 'static,
 {
     type Substream = SubstreamBox;
     type OutboundSubstream = usize; // TODO: use a newtype
@@ -111,6 +112,7 @@ impl StreamMuxerBox {
         T: StreamMuxer + Send + Sync + 'static,
         T::OutboundSubstream: Send,
         T::Substream: AsyncRead + AsyncWrite + Send + Unpin + 'static,
+        T::Error: Send + Sync + 'static,
     {
         let wrap = Wrap {
             inner: muxer,

diff --git a/core/src/transport/upgrade.rs b/core/src/transport/upgrade.rs
@@ -302,6 +302,7 @@ impl<T> Multiplexed<T> {
         M: StreamMuxer + Send + Sync + 'static,
         M::Substream: AsyncRead + AsyncWrite + Send + Unpin + 'static,
         M::OutboundSubstream: Send + 'static,
+        M::Error: Send + Sync + 'static,
     {
         boxed(self.map(|(i, m), _| (i, StreamMuxerBox::new(m))))
     }