From f62f48c4d8f7862de77b20d1ca65e61cc77db6ae Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Tue, 14 Dec 2021 20:36:55 -0500
Subject: clippy

---
 src/bin/ttyplay/frames.rs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'src/bin/ttyplay/frames.rs')

diff --git a/src/bin/ttyplay/frames.rs b/src/bin/ttyplay/frames.rs
index dd60a21..55c41a8 100644
--- a/src/bin/ttyplay/frames.rs
+++ b/src/bin/ttyplay/frames.rs
@@ -73,12 +73,17 @@ impl FrameData {
         self.new_frame_w
             .send(Some(self.frames.len()))
             .await
-            .unwrap();
+            // new_frame_w is never closed, so this can never fail
+            .unwrap_or_else(|_| unreachable!());
     }
 
     pub async fn done_reading(&mut self) {
         self.done_reading = true;
-        self.new_frame_w.send(None).await.unwrap();
+        self.new_frame_w
+            .send(None)
+            .await
+            // new_frame_w is never closed, so this can never fail
+            .unwrap_or_else(|_| unreachable!());
     }
 
     pub fn wait_for_frame(
@@ -95,7 +100,12 @@ impl FrameData {
         }
         let new_frame_r = self.new_frame_r.clone();
         Box::pin(async move {
-            while let Some(new_len) = new_frame_r.recv().await.unwrap() {
+            while let Some(new_len) = new_frame_r
+                .recv()
+                .await
+                // new_frame_r is never closed, so this can never fail
+                .unwrap_or_else(|_| unreachable!())
+            {
                 if i < new_len {
                     return true;
                 }
@@ -141,13 +151,15 @@ pub fn load_from_file(
             event_w
                 .send(crate::event::Event::FrameLoaded(Some(frames.count())))
                 .await
-                .unwrap();
+                // event_w is never closed, so this can never fail
+                .unwrap_or_else(|_| unreachable!());
             prev_delay = delay;
         }
         frames.lock_arc().await.done_reading().await;
         event_w
             .send(crate::event::Event::FrameLoaded(None))
             .await
-            .unwrap();
+            // event_w is never closed, so this can never fail
+            .unwrap_or_else(|_| unreachable!());
     });
 }
-- 
cgit v1.2.3-54-g00ecf