From f6829859fef56585498938f99ca2cec731abd1c1 Mon Sep 17 00:00:00 2001
From: Razican <iban.eguia@cern.ch>
Date: Mon, 18 Nov 2019 16:39:21 +0100
Subject: [PATCH] Fixed deduplication of code

---
 src/stream/stream/merge.rs | 40 +++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/stream/stream/merge.rs b/src/stream/stream/merge.rs
index b08b586..bdf7a29 100644
--- a/src/stream/stream/merge.rs
+++ b/src/stream/stream/merge.rs
@@ -45,25 +45,29 @@ where
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let this = self.project();
         if utils::random(1) == 1 {
-            match this.left.poll_next(cx) {
-                Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
-                Poll::Ready(None) => this.right.poll_next(cx),
-                Poll::Pending => match this.right.poll_next(cx) {
-                    Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
-                    Poll::Ready(None) => Poll::Pending,
-                    Poll::Pending => Poll::Pending,
-                },
-            }
+            poll_next_in_order(this.left, this.right, cx)
         } else {
-            match this.right.poll_next(cx) {
-                Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
-                Poll::Ready(None) => this.left.poll_next(cx),
-                Poll::Pending => match this.left.poll_next(cx) {
-                    Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
-                    Poll::Ready(None) => Poll::Pending,
-                    Poll::Pending => Poll::Pending,
-                },
-            }
+            poll_next_in_order(this.right, this.left, cx)
         }
     }
 }
+
+fn poll_next_in_order<F, S, I>(
+    first: Pin<&mut F>,
+    second: Pin<&mut S>,
+    cx: &mut Context<'_>,
+) -> Poll<Option<I>>
+where
+    F: Stream<Item = I>,
+    S: Stream<Item = I>,
+{
+    match first.poll_next(cx) {
+        Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
+        Poll::Ready(None) => second.poll_next(cx),
+        Poll::Pending => match second.poll_next(cx) {
+            Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
+            Poll::Ready(None) => Poll::Pending,
+            Poll::Pending => Poll::Pending,
+        },
+    }
+}