clippy

5 files changed, 23 insertions, 15 deletions

diff --git a/src/bin/ttyplay/frames.rs b/src/bin/ttyplay/frames.rs
index 1cf2d01..4d5eae6 100644
--- a/src/bin/ttyplay/frames.rs
+++ b/src/bin/ttyplay/frames.rs
@@ -68,7 +68,7 @@ impl FrameData {
         }
     }
 
-    pub async fn add_frame(&mut self, frame: Frame) {
+    pub fn add_frame(&mut self, frame: Frame) {
         self.frames.push(frame);
         self.new_frame_w
             .send(Some(self.frames.len()))
@@ -76,7 +76,7 @@ impl FrameData {
             .unwrap();
     }
 
-    pub async fn done_reading(&mut self) {
+    pub fn done_reading(&mut self) {
         self.done_reading = true;
         self.new_frame_w
             .send(None)
@@ -142,16 +142,14 @@ pub fn load_from_file(
             }
             parser.process(&frame.data);
             let mut frames = frames.clone().lock_owned().await;
-            frames
-                .add_frame(Frame::new(parser.screen().clone(), delay))
-                .await;
+            frames.add_frame(Frame::new(parser.screen().clone(), delay));
             event_w
                 .send(crate::event::Event::FrameLoaded(Some(frames.count())))
                 // event_w is never closed, so this can never fail
                 .unwrap();
             prev_delay = delay;
         }
-        frames.lock_owned().await.done_reading().await;
+        frames.lock_owned().await.done_reading();
         event_w
             .send(crate::event::Event::FrameLoaded(None))
             // event_w is never closed, so this can never fail
diff --git a/src/bin/ttyplay/input.rs b/src/bin/ttyplay/input.rs
index fe7dc30..fb4018b 100644
--- a/src/bin/ttyplay/input.rs
+++ b/src/bin/ttyplay/input.rs
@@ -107,8 +107,8 @@ pub fn spawn_thread(
                         )
                     }
                     textmode::Key::Char('/') => {
-                        search = Some("".to_string());
-                        crate::event::Event::ActiveSearch("".to_string())
+                        search = Some(String::new());
+                        crate::event::Event::ActiveSearch(String::new())
                     }
                     textmode::Key::Char('n') => {
                         if let Some(ref search) = prev_search {
diff --git a/src/bin/ttyplay/main.rs b/src/bin/ttyplay/main.rs
index 0cf7427..1b0bcec 100644
--- a/src/bin/ttyplay/main.rs
+++ b/src/bin/ttyplay/main.rs
@@ -107,7 +107,7 @@ fn main() {
     match async_main(opt) {
         Ok(_) => (),
         Err(e) => {
-            eprintln!("ttyplay: {}", e);
+            eprintln!("ttyplay: {e}");
             std::process::exit(1);
         }
     };
diff --git a/src/bin/ttyplay/timer.rs b/src/bin/ttyplay/timer.rs
index b212b4a..d7cb7e0 100644
--- a/src/bin/ttyplay/timer.rs
+++ b/src/bin/ttyplay/timer.rs
@@ -42,7 +42,9 @@ pub fn spawn_task(
                         .clone();
                     if force_update_time {
                         let now = std::time::Instant::now();
-                        start_time = now - frame.delay() * playback_ratio / 16
+                        start_time = now
+                            .checked_sub(frame.delay() * playback_ratio / 16)
+                            .unwrap()
                             // give a bit of extra time before moving to the
                             // next frame, otherwise backing up behind two
                             // frames that are extremely close together
@@ -132,7 +134,9 @@ pub fn spawn_task(
                         if playback_ratio > 1 {
                             playback_ratio /= 2;
                             let now = std::time::Instant::now();
-                            start_time = now - (now - start_time) / 2;
+                            start_time = now
+                                .checked_sub((now - start_time) / 2)
+                                .unwrap();
                             event_w
                                 .send(crate::event::Event::Speed(
                                     playback_ratio,
@@ -146,7 +150,9 @@ pub fn spawn_task(
                         if playback_ratio < 256 {
                             playback_ratio *= 2;
                             let now = std::time::Instant::now();
-                            start_time = now - (now - start_time) * 2;
+                            start_time = now
+                                .checked_sub((now - start_time) * 2)
+                                .unwrap();
                             event_w
                                 .send(crate::event::Event::Speed(
                                     playback_ratio,
@@ -159,7 +165,10 @@ pub fn spawn_task(
                     crate::event::TimerAction::DefaultSpeed => {
                         let now = std::time::Instant::now();
                         start_time = now
-                            - (((now - start_time) * 16) / playback_ratio);
+                            .checked_sub(
+                                ((now - start_time) * 16) / playback_ratio,
+                            )
+                            .unwrap();
                         playback_ratio = 16;
                         event_w
                             .send(crate::event::Event::Speed(playback_ratio))
diff --git a/src/bin/ttyrec/main.rs b/src/bin/ttyrec/main.rs
index 1a3c03d..29cf09f 100644
--- a/src/bin/ttyrec/main.rs
+++ b/src/bin/ttyrec/main.rs
@@ -123,6 +123,7 @@ async fn async_main(opt: Opt) -> anyhow::Result<()> {
 
     {
         let event_w = event_w.clone();
+        #[allow(clippy::redundant_pub_crate)]
         tokio::task::spawn(async move {
             loop {
                 let mut buf = [0_u8; 4096];
@@ -135,7 +136,7 @@ async fn async_main(opt: Opt) -> anyhow::Result<()> {
                             // event_w is never closed, so this can never fail
                             .unwrap();
                         if err {
-                            eprintln!("pty read failed: {}", err);
+                            eprintln!("pty read failed: {err}");
                             break;
                         }
                     }
@@ -212,7 +213,7 @@ fn main() {
     match async_main(opt) {
         Ok(_) => (),
         Err(e) => {
-            eprintln!("ttyrec: {}", e);
+            eprintln!("ttyrec: {e}");
             std::process::exit(1);
         }
     };