From d585ad7b3135f38149104b7393b8fa236a0b2288 Mon Sep 17 00:00:00 2001
From: Tangent Wantwight <tangent128@gmail.com>
Date: Sat, 9 May 2020 00:17:22 -0400
Subject: [PATCH] use ergonomic try_next() combinator instead of transpose()

---
 src/commands/send.rs | 2 +-
 src/stream_parser.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands/send.rs b/src/commands/send.rs
index 8917aeb..41df5fe 100644
--- a/src/commands/send.rs
+++ b/src/commands/send.rs
@@ -57,7 +57,7 @@ pub async fn run(args: &ArgMatches) -> Result<(), WebmetroError> {
 
     let response = client.request(request).await?;
     let mut response_stream = response.into_body();
-    while let Some(response_chunk) = response_stream.next().await.transpose()? {
+    while let Some(response_chunk) = response_stream.try_next().await? {
         stdout().write_all(&response_chunk)?;
     }
     Ok(())
diff --git a/src/stream_parser.rs b/src/stream_parser.rs
index 4e9b433..9ef16fc 100644
--- a/src/stream_parser.rs
+++ b/src/stream_parser.rs
@@ -1,5 +1,5 @@
 use bytes::{Buf, BufMut, Bytes, BytesMut};
-use futures::stream::{Stream, StreamExt};
+use futures::{TryStreamExt, stream::{Stream, StreamExt}};
 use std::task::{Context, Poll};
 
 use crate::ebml::FromEbml;
@@ -93,7 +93,7 @@ where
                 }
             }
 
-            match self.stream.next().await.transpose()? {
+            match self.stream.try_next().await? {
                 Some(refill) => {
                     self.buffer.reserve(refill.remaining());
                     self.buffer.put(refill);