Browse Source

Revert new Send requirement for 'merge_external'

tags/v0.2.5-alpha.2
Philipp Oppermann 2 years ago
parent
commit
ffaea07e31
Failed to extract signature
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      apis/rust/node/src/event_stream/merged.rs

+ 7
- 7
apis/rust/node/src/event_stream/merged.rs View File

@@ -25,8 +25,8 @@ pub trait MergeExternal<'a, E> {

fn merge_external(
self,
external_events: impl Stream<Item = E> + Send + Unpin + 'a,
) -> Box<dyn Stream<Item = Self::Item> + Send + Unpin + 'a>;
external_events: impl Stream<Item = E> + Unpin + 'a,
) -> Box<dyn Stream<Item = Self::Item> + Unpin + 'a>;
}

impl<'a, E> MergeExternal<'a, E> for super::EventStream
@@ -37,8 +37,8 @@ where

fn merge_external(
self,
external_events: impl Stream<Item = E> + Send + Unpin + 'a,
) -> Box<dyn Stream<Item = Self::Item> + Send + Unpin + 'a> {
external_events: impl Stream<Item = E> + Unpin + 'a,
) -> Box<dyn Stream<Item = Self::Item> + 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<Item = MergedEvent<E>> + Send + Unpin + 'a,
S: Stream<Item = MergedEvent<E>> + Unpin + 'a,
E: 'a,
F: 'a,
{
@@ -55,8 +55,8 @@ where

fn merge_external(
self,
external_events: impl Stream<Item = F> + Send + Unpin + 'a,
) -> Box<dyn Stream<Item = Self::Item> + Send + Unpin + 'a> {
external_events: impl Stream<Item = F> + Unpin + 'a,
) -> Box<dyn Stream<Item = Self::Item> + Unpin + 'a> {
let first = self.map(|e| match e {
MergedEvent::Dora(d) => MergedEvent::Dora(d),
MergedEvent::External(e) => MergedEvent::External(Either::First(e)),


Loading…
Cancel
Save