diff options
| author | Jesse Luehrs <doy@tozt.net> | 2021-12-14 20:36:55 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2021-12-14 20:36:55 -0500 |
| commit | f62f48c4d8f7862de77b20d1ca65e61cc77db6ae (patch) | |
| tree | bd835ac408370578e6c0e3326561a035323e5454 /src/bin/ttyplay/timer.rs | |
| parent | 4002204f0ce7ee98975ebbdec9c8afdf5445c4d0 (diff) | |
| download | ttyrec-bin-f62f48c4d8f7862de77b20d1ca65e61cc77db6ae.tar.gz ttyrec-bin-f62f48c4d8f7862de77b20d1ca65e61cc77db6ae.zip | |
clippy
Diffstat (limited to 'src/bin/ttyplay/timer.rs')
| -rw-r--r-- | src/bin/ttyplay/timer.rs | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/bin/ttyplay/timer.rs b/src/bin/ttyplay/timer.rs index 0cd66a6..6b4e17f 100644 --- a/src/bin/ttyplay/timer.rs +++ b/src/bin/ttyplay/timer.rs @@ -16,7 +16,8 @@ pub fn spawn_task( event_w .send(crate::event::Event::Paused(true)) .await - .unwrap(); + // event_w is never closed, so this can never fail + .unwrap_or_else(|_| unreachable!()); Some(start_time) } else { None @@ -25,7 +26,7 @@ pub fn spawn_task( let mut playback_ratio = 2_u32.pow(speed); loop { enum Res { - Wait(Option<vt100::Screen>), + Wait(Option<Box<vt100::Screen>>), TimerAction( Result< crate::event::TimerAction, @@ -62,7 +63,7 @@ pub fn spawn_task( ) .await; } - Res::Wait(Some(frame.into_screen())) + Res::Wait(Some(Box::new(frame.into_screen()))) } else { Res::Wait(None) } @@ -75,7 +76,8 @@ pub fn spawn_task( idx, screen, ))) .await - .unwrap(); + // event_w is never closed, so this can never fail + .unwrap_or_else(|_| unreachable!()); idx += 1; } Res::Wait(None) => { @@ -84,7 +86,8 @@ pub fn spawn_task( event_w .send(crate::event::Event::Paused(true)) .await - .unwrap(); + // event_w is never closed, so this can never fail + .unwrap_or_else(|_| unreachable!()); } Res::TimerAction(Ok(action)) => match action { crate::event::TimerAction::Pause => { @@ -99,7 +102,8 @@ pub fn spawn_task( paused_time.is_some(), )) .await - .unwrap(); + // event_w is never closed, so this can never fail + .unwrap_or_else(|_| unreachable!()); } crate::event::TimerAction::FirstFrame => { idx = 0; @@ -128,7 +132,9 @@ pub fn spawn_task( playback_ratio, )) .await - .unwrap(); + // event_w is never closed, so this can never + // fail + .unwrap_or_else(|_| unreachable!()); } } crate::event::TimerAction::SlowDown => { @@ -141,7 +147,9 @@ pub fn spawn_task( playback_ratio, )) .await - .unwrap(); + // event_w is never closed, so this can never + // fail + .unwrap_or_else(|_| unreachable!()); } } crate::event::TimerAction::DefaultSpeed => { @@ -152,7 +160,8 @@ pub fn spawn_task( event_w .send(crate::event::Event::Speed(playback_ratio)) .await - .unwrap(); + // event_w is never closed, so this can never fail + .unwrap_or_else(|_| unreachable!()); } crate::event::TimerAction::Search(s, backwards) => { if let Some(new_idx) = |