core/muxing: Remove Unpin requirement from StreamMuxer::Substream (…

…#2776)
libp2p · Jul 25, 2022 · 0ec3bbc · 0ec3bbc
1 parent c19a211
commit 0ec3bbc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 - Remove `StreamMuxer::poll_event` in favor of individual functions: `poll_inbound`, `poll_outbound`
   and `poll_address_change`. Consequently, `StreamMuxerEvent` is also removed. See [PR 2724].
-- Drop `Unpin` requirement from `SubstreamBox`. See [PR 2762].
+- Drop `Unpin` requirement from `SubstreamBox`. See [PR 2762] and [PR 2776].
 
 [PR 2724]: https://github.com/libp2p/rust-libp2p/pull/2724
 [PR 2762]: https://github.com/libp2p/rust-libp2p/pull/2762
+[PR 2776]: https://github.com/libp2p/rust-libp2p/pull/2776
 
 # 0.34.0
 

diff --git a/core/src/muxing/boxed.rs b/core/src/muxing/boxed.rs
@@ -29,7 +29,7 @@ where
 impl<T> StreamMuxer for Wrap<T>
 where
     T: StreamMuxer,
-    T::Substream: Send + Unpin + 'static,
+    T::Substream: Send + 'static,
     T::Error: Send + Sync + 'static,
 {
     type Substream = SubstreamBox;
@@ -71,7 +71,7 @@ impl StreamMuxerBox {
     pub fn new<T>(muxer: T) -> StreamMuxerBox
     where
         T: StreamMuxer + Send + Sync + 'static,
-        T::Substream: Send + Unpin + 'static,
+        T::Substream: Send + '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
@@ -300,7 +300,7 @@ impl<T> Multiplexed<T> {
         T::ListenerUpgrade: Send + 'static,
         T::Error: Send + Sync,
         M: StreamMuxer + Send + Sync + 'static,
-        M::Substream: Send + Unpin + 'static,
+        M::Substream: Send + 'static,
         M::Error: Send + Sync + 'static,
     {
         boxed(self.map(|(i, m), _| (i, StreamMuxerBox::new(m))))