be a bit less aggressive

5 files changed, 28 insertions, 32 deletions

diff --git a/src/bin/ttyplay/frames.rs b/src/bin/ttyplay/frames.rs
index 55c41a8..d6073dc 100644
--- a/src/bin/ttyplay/frames.rs
+++ b/src/bin/ttyplay/frames.rs
@@ -74,7 +74,7 @@ impl FrameData {
             .send(Some(self.frames.len()))
             .await
             // new_frame_w is never closed, so this can never fail
-            .unwrap_or_else(|_| unreachable!());
+            .unwrap();
     }
 
     pub async fn done_reading(&mut self) {
@@ -83,7 +83,7 @@ impl FrameData {
             .send(None)
             .await
             // new_frame_w is never closed, so this can never fail
-            .unwrap_or_else(|_| unreachable!());
+            .unwrap();
     }
 
     pub fn wait_for_frame(
@@ -104,7 +104,7 @@ impl FrameData {
                 .recv()
                 .await
                 // new_frame_r is never closed, so this can never fail
-                .unwrap_or_else(|_| unreachable!())
+                .unwrap()
             {
                 if i < new_len {
                     return true;
@@ -152,7 +152,7 @@ pub fn load_from_file(
                 .send(crate::event::Event::FrameLoaded(Some(frames.count())))
                 .await
                 // event_w is never closed, so this can never fail
-                .unwrap_or_else(|_| unreachable!());
+                .unwrap();
             prev_delay = delay;
         }
         frames.lock_arc().await.done_reading().await;
@@ -160,6 +160,6 @@ pub fn load_from_file(
             .send(crate::event::Event::FrameLoaded(None))
             .await
             // event_w is never closed, so this can never fail
-            .unwrap_or_else(|_| unreachable!());
+            .unwrap();
     });
 }
diff --git a/src/bin/ttyplay/input.rs b/src/bin/ttyplay/input.rs
index e6cf74b..81a2fef 100644
--- a/src/bin/ttyplay/input.rs
+++ b/src/bin/ttyplay/input.rs
@@ -14,7 +14,7 @@ pub fn spawn_task(
                         .send(crate::event::Event::Error(anyhow::anyhow!(e)))
                         .await
                         // event_w is never closed, so this can never fail
-                        .unwrap_or_else(|_| unreachable!());
+                        .unwrap();
                     break;
                 }
             };
@@ -28,7 +28,7 @@ pub fn spawn_task(
                             ))
                             .await
                             // event_w is never closed, so this can never fail
-                            .unwrap_or_else(|_| unreachable!());
+                            .unwrap();
                     }
                     textmode::Key::Backspace => {
                         search_contents.pop();
@@ -38,7 +38,7 @@ pub fn spawn_task(
                             ))
                             .await
                             // event_w is never closed, so this can never fail
-                            .unwrap_or_else(|_| unreachable!());
+                            .unwrap();
                     }
                     textmode::Key::Ctrl(b'm') => {
                         event_w
@@ -48,7 +48,7 @@ pub fn spawn_task(
                             ))
                             .await
                             // event_w is never closed, so this can never fail
-                            .unwrap_or_else(|_| unreachable!());
+                            .unwrap();
                         prev_search = search;
                         search = None;
                     }
@@ -57,7 +57,7 @@ pub fn spawn_task(
                             .send(crate::event::Event::CancelSearch)
                             .await
                             // event_w is never closed, so this can never fail
-                            .unwrap_or_else(|_| unreachable!());
+                            .unwrap();
                         search = None;
                     }
                     _ => {}
@@ -138,7 +138,7 @@ pub fn spawn_task(
                     _ => continue,
                 };
                 // event_w is never closed, so this can never fail
-                event_w.send(event).await.unwrap_or_else(|_| unreachable!());
+                event_w.send(event).await.unwrap();
             }
         }
     });
diff --git a/src/bin/ttyplay/main.rs b/src/bin/ttyplay/main.rs
index 401266c..1383690 100644
--- a/src/bin/ttyplay/main.rs
+++ b/src/bin/ttyplay/main.rs
@@ -1,10 +1,8 @@
 #![warn(clippy::cargo)]
 #![warn(clippy::pedantic)]
 #![warn(clippy::nursery)]
-#![warn(clippy::unwrap_used)]
-#![warn(clippy::expect_used)]
-#![warn(clippy::indexing_slicing)]
 #![warn(clippy::as_conversions)]
+#![warn(clippy::get_unwrap)]
 #![allow(clippy::cognitive_complexity)]
 #![allow(clippy::missing_const_for_fn)]
 #![allow(clippy::similar_names)]
diff --git a/src/bin/ttyplay/timer.rs b/src/bin/ttyplay/timer.rs
index 6b4e17f..12ff17c 100644
--- a/src/bin/ttyplay/timer.rs
+++ b/src/bin/ttyplay/timer.rs
@@ -17,7 +17,7 @@ pub fn spawn_task(
                 .send(crate::event::Event::Paused(true))
                 .await
                 // event_w is never closed, so this can never fail
-                .unwrap_or_else(|_| unreachable!());
+                .unwrap();
             Some(start_time)
         } else {
             None
@@ -77,7 +77,7 @@ pub fn spawn_task(
                         )))
                         .await
                         // event_w is never closed, so this can never fail
-                        .unwrap_or_else(|_| unreachable!());
+                        .unwrap();
                     idx += 1;
                 }
                 Res::Wait(None) => {
@@ -87,7 +87,7 @@ pub fn spawn_task(
                         .send(crate::event::Event::Paused(true))
                         .await
                         // event_w is never closed, so this can never fail
-                        .unwrap_or_else(|_| unreachable!());
+                        .unwrap();
                 }
                 Res::TimerAction(Ok(action)) => match action {
                     crate::event::TimerAction::Pause => {
@@ -103,7 +103,7 @@ pub fn spawn_task(
                             ))
                             .await
                             // event_w is never closed, so this can never fail
-                            .unwrap_or_else(|_| unreachable!());
+                            .unwrap();
                     }
                     crate::event::TimerAction::FirstFrame => {
                         idx = 0;
@@ -134,7 +134,7 @@ pub fn spawn_task(
                                 .await
                                 // event_w is never closed, so this can never
                                 // fail
-                                .unwrap_or_else(|_| unreachable!());
+                                .unwrap();
                         }
                     }
                     crate::event::TimerAction::SlowDown => {
@@ -149,7 +149,7 @@ pub fn spawn_task(
                                 .await
                                 // event_w is never closed, so this can never
                                 // fail
-                                .unwrap_or_else(|_| unreachable!());
+                                .unwrap();
                         }
                     }
                     crate::event::TimerAction::DefaultSpeed => {
@@ -161,7 +161,7 @@ pub fn spawn_task(
                             .send(crate::event::Event::Speed(playback_ratio))
                             .await
                             // event_w is never closed, so this can never fail
-                            .unwrap_or_else(|_| unreachable!());
+                            .unwrap();
                     }
                     crate::event::TimerAction::Search(s, backwards) => {
                         if let Some(new_idx) =
diff --git a/src/bin/ttyrec/main.rs b/src/bin/ttyrec/main.rs
index f7d3500..04c5cb6 100644
--- a/src/bin/ttyrec/main.rs
+++ b/src/bin/ttyrec/main.rs
@@ -1,10 +1,8 @@
 #![warn(clippy::cargo)]
 #![warn(clippy::pedantic)]
 #![warn(clippy::nursery)]
-#![warn(clippy::unwrap_used)]
-#![warn(clippy::expect_used)]
-#![warn(clippy::indexing_slicing)]
 #![warn(clippy::as_conversions)]
+#![warn(clippy::get_unwrap)]
 #![allow(clippy::cognitive_complexity)]
 #![allow(clippy::missing_const_for_fn)]
 #![allow(clippy::similar_names)]
@@ -104,7 +102,7 @@ async fn async_main(opt: Opt) -> anyhow::Result<()> {
                     ))
                     .await
                     // event_w is never closed, so this can never fail
-                    .unwrap_or_else(|_| unreachable!());
+                    .unwrap();
             }
         });
     }
@@ -117,7 +115,7 @@ async fn async_main(opt: Opt) -> anyhow::Result<()> {
                     .send(Event::Key(input.read_key().await))
                     .await
                     // event_w is never closed, so this can never fail
-                    .unwrap_or_else(|_| unreachable!());
+                    .unwrap();
             }
         });
     }
@@ -138,32 +136,32 @@ async fn async_main(opt: Opt) -> anyhow::Result<()> {
                 let resize = async { Res::Resize(resize_r.recv().await) };
                 match read.race(write).race(resize).await {
                     Res::Read(res) => {
-                        let res = res.map(|n| buf.get(..n).unwrap().to_vec());
+                        let res = res.map(|n| buf[..n].to_vec());
                         let err = res.is_err();
                         event_w
                             .send(Event::Stdout(res))
                             .await
                             // event_w is never closed, so this can never fail
-                            .unwrap_or_else(|_| unreachable!());
+                            .unwrap();
                         if err {
                             break;
                         }
                     }
                     Res::Write(res) => {
                         // input_r is never closed, so this can never fail
-                        let bytes = res.unwrap_or_else(|_| unreachable!());
+                        let bytes = res.unwrap();
                         if let Err(e) = pty.write(&bytes).await {
                             event_w
                                 .send(Event::Error(anyhow::anyhow!(e)))
                                 .await
                                 // event_w is never closed, so this can never
                                 // fail
-                                .unwrap_or_else(|_| unreachable!());
+                                .unwrap();
                         }
                     }
                     Res::Resize(res) => {
                         // resize_r is never closed, so this can never fail
-                        let size = res.unwrap_or_else(|_| unreachable!());
+                        let size = res.unwrap();
                         if let Err(e) = child.resize_pty(
                             &pty_process::Size::new(size.0, size.1),
                         ) {
@@ -172,7 +170,7 @@ async fn async_main(opt: Opt) -> anyhow::Result<()> {
                                 .await
                                 // event_w is never closed, so this can never
                                 // fail
-                                .unwrap_or_else(|_| unreachable!());
+                                .unwrap();
                         }
                     }
                 }