From 1ecadfb0adf839c719ba50914c7336488ca55a47 Mon Sep 17 00:00:00 2001
From: Rose Hogenson <rosehogenson@posteo.net>
Date: Fri, 21 Jul 2023 22:42:51 -0700
Subject: Fix clippy warnings.

---
 src/main.rs | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index ba79811..1b73059 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -41,11 +41,8 @@ fn frame<T: state::Enemy<U>, U: state::Bullet>(
     for bullet in state.player_bullets.iter_mut() {
         bullet.act();
     }
-    match state.player.act(events) {
-        Err(_) => {
-            return FResult::Exit;
-        }
-        Ok(_) => {}
+    if state.player.act(events).is_err() {
+        return FResult::Exit;
     }
     if count % state.player.fire_rate as u64 == 0 {
         state.player_bullets.push(state::PBullet::new(
@@ -76,7 +73,7 @@ fn frame<T: state::Enemy<U>, U: state::Bullet>(
     state
         .enemies
         .retain(|enemy| state::Enemy::health(enemy) > 0.);
-    if state.enemies.len() == 0 {
+    if state.enemies.is_empty() {
         return FResult::Win;
     }
     state.bullets.retain(|bullet| !U::outside(bullet));
@@ -175,9 +172,8 @@ fn generic_message(
                 _ => {}
             }
         }
-        match frame_duration.checked_sub(start.elapsed()) {
-            Some(t) => std::thread::sleep(t),
-            None => (),
+        if let Some(t) = frame_duration.checked_sub(start.elapsed()) {
+            std::thread::sleep(t)
         }
     }
 }
@@ -186,39 +182,39 @@ fn introduction(
     canvas: &mut sdl2::render::WindowCanvas,
     event_pump: &mut sdl2::EventPump,
 ) -> Result<(), ()> {
-    return generic_message(
+    generic_message(
         canvas,
         event_pump,
         include_bytes!("assets/introduction.png"),
         sdl2::keyboard::Keycode::Return,
         sdl2::keyboard::Keycode::Escape,
-    );
+    )
 }
 
 fn loss(
     canvas: &mut sdl2::render::WindowCanvas,
     event_pump: &mut sdl2::EventPump,
 ) -> Result<(), ()> {
-    return generic_message(
+    generic_message(
         canvas,
         event_pump,
         include_bytes!("assets/loss.png"),
         sdl2::keyboard::Keycode::R,
         sdl2::keyboard::Keycode::Escape,
-    );
+    )
 }
 
 fn victory(
     canvas: &mut sdl2::render::WindowCanvas,
     event_pump: &mut sdl2::EventPump,
 ) -> Result<(), ()> {
-    return generic_message(
+    generic_message(
         canvas,
         event_pump,
         include_bytes!("assets/victory.png"),
         sdl2::keyboard::Keycode::R,
         sdl2::keyboard::Keycode::Escape,
-    );
+    )
 }
 
 fn main() {
@@ -302,9 +298,8 @@ fn main() {
                 }
             }
             /* Make sure this iteration took a whole frame */
-            match frame_duration.checked_sub(start.elapsed()) {
-                Some(t) => std::thread::sleep(t),
-                None => (),
+            if let Some(t) = frame_duration.checked_sub(start.elapsed()) {
+                std::thread::sleep(t);
             }
         }
     }
-- 
cgit v1.3.1