From 0f76622b170c166fa0c5dbc8c03b6a0ece27b311 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Fri, 24 Feb 2023 07:37:58 +0700 Subject: [PATCH] Fix merge issues --- crates/core/src/bc_protocol/connection/bcsub.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/core/src/bc_protocol/connection/bcsub.rs b/crates/core/src/bc_protocol/connection/bcsub.rs index 5a391b0..9e54186 100644 --- a/crates/core/src/bc_protocol/connection/bcsub.rs +++ b/crates/core/src/bc_protocol/connection/bcsub.rs @@ -64,10 +64,9 @@ impl<'a> Stream for BcPayloadStream<'a> { Poll::Pending } } - Poll::Pending => { - return Poll::Pending; - } } + Poll::Ready(None) => Poll::Ready(None), + Poll::Pending => Poll::Pending, } } }