From 479e3cf99084e7a62142fe4c4444940c3f8c6a73 Mon Sep 17 00:00:00 2001 From: Theis Pieter Hollebeek Date: Wed, 1 Apr 2026 15:37:33 +0200 Subject: [PATCH] clippy --- game/src/engine/sdl_io.rs | 58 +++++++++++++-------------- game/src/event_queue.rs | 2 +- game/src/main.rs | 84 ++++++++++++++++----------------------- game/src/vermiparous.rs | 6 +-- 4 files changed, 67 insertions(+), 83 deletions(-) diff --git a/game/src/engine/sdl_io.rs b/game/src/engine/sdl_io.rs index bbb3c8f..6db0b89 100644 --- a/game/src/engine/sdl_io.rs +++ b/game/src/engine/sdl_io.rs @@ -64,37 +64,35 @@ impl SdlIo { keycode: Some(Keycode::Escape), .. } => break 'running, - Event::KeyDown { keycode, .. } => match keycode { - Some(key) => match key { - Keycode::Left => { - game.event(game::Event::KeyDown { - key: game::Key::Left, - }); - } - Keycode::Right => { - game.event(game::Event::KeyDown { - key: game::Key::Right, - }); - } - _ => {} - }, - None => {} + Event::KeyDown { + keycode: Some(key), .. + } => match key { + Keycode::Left => { + game.event(game::Event::KeyDown { + key: game::Key::Left, + }); + } + Keycode::Right => { + game.event(game::Event::KeyDown { + key: game::Key::Right, + }); + } + _ => {} }, - Event::KeyUp { keycode, .. } => match keycode { - Some(key) => match key { - Keycode::Left => { - game.event(game::Event::KeyUp { - key: game::Key::Left, - }); - } - Keycode::Right => { - game.event(game::Event::KeyUp { - key: game::Key::Right, - }); - } - _ => {} - }, - None => {} + Event::KeyUp { + keycode: Some(key), .. + } => match key { + Keycode::Left => { + game.event(game::Event::KeyUp { + key: game::Key::Left, + }); + } + Keycode::Right => { + game.event(game::Event::KeyUp { + key: game::Key::Right, + }); + } + _ => {} }, _ => {} diff --git a/game/src/event_queue.rs b/game/src/event_queue.rs index 89e40a9..91e59a4 100644 --- a/game/src/event_queue.rs +++ b/game/src/event_queue.rs @@ -1,4 +1,4 @@ -use std::{collections::VecDeque, sync::Mutex}; +use std::collections::VecDeque; pub enum Event { Skateboard { diff --git a/game/src/main.rs b/game/src/main.rs index 1b17f74..87c6b20 100644 --- a/game/src/main.rs +++ b/game/src/main.rs @@ -57,40 +57,25 @@ impl engine::Game for Game { fn update(&mut self, delta_time: Duration) { for object in &mut self.objects { if self.keys_pressed.contains(&Key::Left) == self.keys_pressed.contains(&Key::Right) { - match &mut object.kind { - ObjectKind::SkateBoard { - pivot_deg: pivot_factor, - .. - } => { - let decay_rate = 1.0 - (2.0 * delta_time.as_secs_f64()); - *pivot_factor *= decay_rate; - } - _ => {} + if let ObjectKind::SkateBoard { pivot_deg, .. } = &mut object.kind { + let decay_rate = 1.0 - (2.0 * delta_time.as_secs_f64()); + *pivot_deg *= decay_rate; } } if self.keys_pressed.contains(&Key::Left) { - match &mut object.kind { - ObjectKind::SkateBoard { pivot_deg, .. } => { - *pivot_deg -= 18.0 * delta_time.as_secs_f64(); - if *pivot_deg < -12.5 { - *pivot_deg = -12.5; - } + if let ObjectKind::SkateBoard { pivot_deg, .. } = &mut object.kind { + *pivot_deg -= 18.0 * delta_time.as_secs_f64(); + if *pivot_deg < -12.5 { + *pivot_deg = -12.5; } - _ => {} } } if self.keys_pressed.contains(&Key::Right) { - match &mut object.kind { - ObjectKind::SkateBoard { - pivot_deg: pivot_factor, - .. - } => { - *pivot_factor += 18.0 * delta_time.as_secs_f64(); - if *pivot_factor > 12.5 { - *pivot_factor = 12.5; - } + if let ObjectKind::SkateBoard { pivot_deg, .. } = &mut object.kind { + *pivot_deg += 18.0 * delta_time.as_secs_f64(); + if *pivot_deg > 12.5 { + *pivot_deg = 12.5; } - _ => {} } } @@ -214,8 +199,8 @@ impl Object { } => { *pos += *vel * delta_time.as_secs_f64(); *vel += V3(vel.0, vel.1, vel.0 - 0.01 * delta_time.as_secs_f64()); - if pos.2 <= original_pos.2 - *grid_depth as f64 * *grid_item_size as f64 { - pos.2 += *grid_depth as f64 * *grid_item_size as f64 + if pos.2 <= original_pos.2 - *grid_depth as f64 * *grid_item_size { + pos.2 += *grid_depth as f64 * *grid_item_size } } } @@ -385,27 +370,28 @@ fn main() -> Result<(), Box> { let server = Server::bind("10.133.51.127:5000"); server.start(event_queue); }); - let mut objects: Vec = Vec::new(); - objects.push(ObjectKind::SkateBoard { - pos: V3(0.0, -0.1, -0.7), - vel: V3(0.0, 0.0, 0.0), - rot: V3(0.0, PI * 0.5, 0.0), - nyoom_factor: 0.0, - pivot_deg: 0.0, - }); - objects.push(ObjectKind::Ground { - original_pos: V3(0.0, -0.25, -0.6), - pos: V3(0.0, -0.25, -0.6), - vel: V3(0.0, 0.0, -0.1), - rot: V3(0.0, 0.0, 0.0), - grid_item_size: 0.1, - grid_width: 10, - grid_depth: 10, - }); - objects.push(ObjectKind::Obstacle { - pos: V3(0.5, -0.2, 0.0), - vel: V3(0.0, 0.0, -0.1), - }); + let objects: Vec = vec![ + ObjectKind::SkateBoard { + pos: V3(0.0, -0.1, -0.7), + vel: V3(0.0, 0.0, 0.0), + rot: V3(0.0, PI * 0.5, 0.0), + nyoom_factor: 0.0, + pivot_deg: 0.0, + }, + ObjectKind::Ground { + original_pos: V3(0.0, -0.25, -0.6), + pos: V3(0.0, -0.25, -0.6), + vel: V3(0.0, 0.0, -0.1), + rot: V3(0.0, 0.0, 0.0), + grid_item_size: 0.1, + grid_width: 10, + grid_depth: 10, + }, + ObjectKind::Obstacle { + pos: V3(0.5, -0.2, 0.0), + vel: V3(0.0, 0.0, -0.1), + }, + ]; for object in objects { game.spawn(object) diff --git a/game/src/vermiparous.rs b/game/src/vermiparous.rs index 1cca961..361ae20 100644 --- a/game/src/vermiparous.rs +++ b/game/src/vermiparous.rs @@ -28,7 +28,7 @@ impl Server { fn get_fallible(data: &[f64], idx: usize) -> Result { data.get(idx) - .map(|idx| *idx) + .cloned() .ok_or_else(|| format!("protocol error: {idx}")) } @@ -37,12 +37,12 @@ impl Server { let mut data = String::new(); reader .read_line(&mut data) - .map_err(|err| format!("io error: {}", err.to_string()))?; + .map_err(|err| format!("io error: {err}"))?; let data = data .split(",") .map(|x| x.parse::()) .collect::, _>>(); - let data = data.map_err(|err| format!("protocol error: {}", err.to_string()))?; + let data = data.map_err(|err| format!("protocol error: {err}"))?; Ok(Event::Skateboard { x: Self::get_fallible(&data, 0)?,