From ffaea07e31c6aa1b5d83b4149a3f8499edf42e12 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 22 Aug 2023 16:41:43 +0200 Subject: [PATCH] Revert new Send requirement for 'merge_external' --- apis/rust/node/src/event_stream/merged.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apis/rust/node/src/event_stream/merged.rs b/apis/rust/node/src/event_stream/merged.rs index e622c856..76f41bb1 100644 --- a/apis/rust/node/src/event_stream/merged.rs +++ b/apis/rust/node/src/event_stream/merged.rs @@ -25,8 +25,8 @@ pub trait MergeExternal<'a, E> { fn merge_external( self, - external_events: impl Stream + Send + Unpin + 'a, - ) -> Box + Send + Unpin + 'a>; + external_events: impl Stream + Unpin + 'a, + ) -> Box + Unpin + 'a>; } impl<'a, E> MergeExternal<'a, E> for super::EventStream @@ -37,8 +37,8 @@ where fn merge_external( self, - external_events: impl Stream + Send + Unpin + 'a, - ) -> Box + Send + Unpin + 'a> { + external_events: impl Stream + Unpin + 'a, + ) -> Box + Unpin + 'a> { let dora = self.map(MergedEvent::Dora); let external = external_events.map(MergedEvent::External); Box::new((dora, external).merge()) @@ -47,7 +47,7 @@ where impl<'a, E, F, S> MergeExternal<'a, F> for S where - S: Stream> + Send + Unpin + 'a, + S: Stream> + Unpin + 'a, E: 'a, F: 'a, { @@ -55,8 +55,8 @@ where fn merge_external( self, - external_events: impl Stream + Send + Unpin + 'a, - ) -> Box + Send + Unpin + 'a> { + external_events: impl Stream + Unpin + 'a, + ) -> Box + Unpin + 'a> { let first = self.map(|e| match e { MergedEvent::Dora(d) => MergedEvent::Dora(d), MergedEvent::External(e) => MergedEvent::External(Either::First(e)),