misc; apply clippy lints

Author: aurelilia

Cargo.lock

@@ -53,6 +53,7 @@ impl ButtonState {
     }
 }
 
+#[derive(Default)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct Input {
     external: ButtonState,
@@ -82,17 +83,12 @@ impl Input {
     pub fn load_replay(&mut self, file: Vec<u8>) {
         self.replay = ReplayState::Playback(InputReplay::load(String::from_utf8(file).unwrap()));
     }
-
-    pub fn new() -> Self {
-        Self {
-            external: ButtonState::default(),
-            replay: ReplayState::None,
-        }
-    }
 }
 
+#[derive(Default)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub enum ReplayState {
+    #[default]
     None,
     Recording(InputReplay),
     Playback(InputReplay),
@@ -142,7 +138,7 @@ impl InputReplay {
             .unwrap_or_default()
     }
 
-    pub fn to_string(&self) -> String {
+    pub fn serialize(&self) -> String {
         self.states.iter().fold(
             format!("{}\n", self.file.to_str().unwrap()),
             |mut acc, e| {

common/src/components/input.rs

@@ -31,7 +31,7 @@ impl Default for EmulateOptions {
             rom_loaded: false,
             invert_audio_samples: false,
             speed_multiplier: 1,
-            input: Input::new(),
+            input: Input::default(),
         }
     }
 }

common/src/misc.rs

@@ -20,7 +20,7 @@ mod lut;
 pub mod registers;
 mod waitloop;
 
-use std::{sync::Arc, u8};
+use std::sync::Arc;
 
 use access::{CODE, NONSEQ, SEQ};
 use common::{components::debugger::Severity, numutil::NumExt};
@@ -76,17 +76,17 @@ impl<S: ArmSystem> Cpu<S> {
             return;
         }
 
-        let mut gg = SysWrapper::new(gg);
+        let gg = SysWrapper::new(gg);
         if gg.cpu().cache.enabled {
             if let Some(cache) = gg.cpu().cache.get(pc) {
-                Cpu::run_cache(&mut gg, cache);
+                Cpu::run_cache(gg, cache);
                 return;
             } else if S::can_cache_at(pc) {
-                Cpu::try_make_cache(&mut gg);
+                Cpu::try_make_cache(gg);
                 return;
             }
         }
-        Self::execute_next_inst(&mut gg);
+        Self::execute_next_inst(gg);
     }
 
     /// Execute the next instruction and advance the scheduler.
@@ -266,8 +266,7 @@ impl<S: ArmSystem> Cpu<S> {
     pub fn check_if_interrupt(gg: &mut S) {
         if gg.cpur().is_interrupt_pending() {
             gg.cpu().inc_pc_by(4);
-            let mut wrapper = SysWrapper::new(gg);
-            Cpu::exception_occurred(&mut wrapper, Exception::Irq);
+            Cpu::exception_occurred(SysWrapper::new(gg), Exception::Irq);
         }
     }
 

components/arm-cpu/src/lib.rs

@@ -133,8 +133,8 @@ impl Apu {
             a = (mplayer[0] * 512.) as i16 * a_vol_mul;
             b = (mplayer[1] * 512.) as i16 * b_vol_mul;
         } else {
-            a = self.current_samples[0] as i16 * a_vol_mul * 2;
-            b = self.current_samples[1] as i16 * b_vol_mul * 2;
+            a = self.current_samples[0] * a_vol_mul * 2;
+            b = self.current_samples[1] * b_vol_mul * 2;
         }
 
         if cnt.a_right_en() {
@@ -167,11 +167,7 @@ impl Apu {
 
     fn bias(mut sample: i16, bias: i16) -> i16 {
         sample += bias;
-        if sample > 0x3ff {
-            sample = 0x3ff;
-        } else if sample < 0 {
-            sample = 0;
-        }
+        sample = sample.clamp(0, 0x3ff);
         sample -= bias;
         sample
     }

cores/gga/src/audio/mod.rs

@@ -58,7 +58,7 @@ pub fn find_mp2k(rom: &[u8]) -> Option<u32> {
             }
         }
 
-        return !crc;
+        !crc
     }
 
     const CRC32: u32 = 0x27EA7FCF;
@@ -393,21 +393,19 @@ impl MusicPlayer {
                     sampler.should_fetch_sample = false;
                 }
 
-                let sample;
                 let mu = sampler.resample_phase;
-
-                if self.use_cubic_filter {
+                let sample = if self.use_cubic_filter {
                     // http://paulbourke.net/miscellaneous/interpolation/
                     let mu2 = mu * mu;
                     let a0 = sample_history[0] - sample_history[1] - sample_history[3]
                         + sample_history[2];
                     let a1 = sample_history[3] - sample_history[2] - a0;
                     let a2 = sample_history[1] - sample_history[3];
                     let a3 = sample_history[2];
-                    sample = a0 * mu * mu2 + a1 * mu2 + a2 * mu + a3;
+                    a0 * mu * mu2 + a1 * mu2 + a2 * mu + a3
                 } else {
-                    sample = sample_history[0] * mu + sample_history[1] * (1.0 - mu);
-                }
+                    sample_history[0] * mu + sample_history[1] * (1.0 - mu)
+                };
 
                 self.buffer[destination + (j * 2 + 0) as usize] += sample * volume_r;
                 self.buffer[destination + (j * 2 + 1) as usize] += sample * volume_l;
@@ -495,7 +493,7 @@ impl MusicPlayer {
             self.buffer_read_index = 0;
         }
 
-        return [sample[0], sample[1]];
+        [sample[0], sample[1]]
     }
 }
 

cores/gga/src/audio/mplayer.rs

@@ -402,9 +402,9 @@ impl GameGirlAdv {
 
             // Treat as halfword
             _ if addr.is_bit(0) => {
-                self.set::<u16>(addr, Self::get::<u16>(&self, addr).set_high(value));
+                self.set::<u16>(addr, Self::get::<u16>(self, addr).set_high(value));
             }
-            _ => self.set::<u16>(addr, Self::get::<u16>(&self, addr).set_low(value)),
+            _ => self.set::<u16>(addr, Self::get::<u16>(self, addr).set_low(value)),
         }
     }
 

cores/gga/src/memory.rs

@@ -43,7 +43,7 @@ type Layer = [Colour; WIDTH];
 pub enum PpuRendererKind {
     #[default]
     Invalid,
-    SingleCore(PpuRender),
+    SingleCore(Box<PpuRender>),
     Threaded {
         sender: Sender<PpuRegisters>,
         last: Arc<Mutex<Option<Vec<Colour>>>>,
@@ -88,7 +88,7 @@ impl PpuRendererKind {
 
             Self::Threaded { sender, last }
         } else {
-            Self::SingleCore(render)
+            Self::SingleCore(Box::new(render))
         }
     }
 }

cores/gga/src/ppu/render/mod.rs

@@ -110,8 +110,8 @@ impl PpuRender {
 
             if !point.inbounds(160, 127) {
                 if wrap {
-                    point.0 = point.0.rem_euclid(160 as i32);
-                    point.1 = point.1.rem_euclid(127 as i32);
+                    point.0 = point.0.rem_euclid(160);
+                    point.1 = point.1.rem_euclid(127);
                 } else {
                     continue;
                 }

cores/gga/src/ppu/render/modes.rs

@@ -145,7 +145,7 @@ impl PpuRender {
 
         let rotscal = self.get_rotscal(obj.rotscal());
         let (half_w, half_h) = (bounds_w / 2, bounds_h / 2);
-        let iy = line - (position.1 + half_h as i32);
+        let iy = line - (position.1 + half_h);
 
         for ix in (-half_w)..half_w {
             let screen_x = position.0 + half_w + ix;