From da22ba9a17621f253bd796d2ccbde9756ee950db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Fri, 4 Aug 2023 01:17:29 +0100
Subject: [PATCH] fix: clippy fixes
---
src/genie.rs | 40 ++++++++++++++++++++--------------------
src/ppu.rs | 12 ++++++------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/genie.rs b/src/genie.rs
index 9d220933..e6084041 100644
--- a/src/genie.rs
+++ b/src/genie.rs
@@ -207,10 +207,10 @@ mod tests {
assert_eq!(game_genie_code.addr, 0x4a17);
assert_eq!(game_genie_code.new_data, 0x00);
assert_eq!(game_genie_code.old_data, 0xc8);
- assert_eq!(game_genie_code.additive, false);
- assert_eq!(game_genie_code.condensed, false);
- assert_eq!(game_genie_code.is_valid(0xc8), true);
- assert_eq!(game_genie_code.is_valid(0xc9), false);
+ assert!(!game_genie_code.additive);
+ assert!(!game_genie_code.condensed);
+ assert!(game_genie_code.is_valid(0xc8));
+ assert!(!game_genie_code.is_valid(0xc9));
assert_eq!(game_genie_code.patch_data(0x12), 0x00);
game_genie_code = GameGenieCode::from_code("00A+17B+C49", None).unwrap();
@@ -218,10 +218,10 @@ mod tests {
assert_eq!(game_genie_code.addr, 0x4a17);
assert_eq!(game_genie_code.new_data, 0x00);
assert_eq!(game_genie_code.old_data, 0xc8);
- assert_eq!(game_genie_code.additive, false);
- assert_eq!(game_genie_code.condensed, false);
- assert_eq!(game_genie_code.is_valid(0xc8), true);
- assert_eq!(game_genie_code.is_valid(0xc9), false);
+ assert!(!game_genie_code.additive);
+ assert!(!game_genie_code.condensed);
+ assert!(game_genie_code.is_valid(0xc8));
+ assert!(!game_genie_code.is_valid(0xc9));
assert_eq!(game_genie_code.patch_data(0x12), 0x00);
game_genie_code = GameGenieCode::from_code("00A+17B+C49", Some(true)).unwrap();
@@ -229,10 +229,10 @@ mod tests {
assert_eq!(game_genie_code.addr, 0x4a17);
assert_eq!(game_genie_code.new_data, 0x00);
assert_eq!(game_genie_code.old_data, 0xc8);
- assert_eq!(game_genie_code.additive, true);
- assert_eq!(game_genie_code.condensed, false);
- assert_eq!(game_genie_code.is_valid(0xc8), true);
- assert_eq!(game_genie_code.is_valid(0xc9), false);
+ assert!(game_genie_code.additive);
+ assert!(!game_genie_code.condensed);
+ assert!(game_genie_code.is_valid(0xc8));
+ assert!(!game_genie_code.is_valid(0xc9));
assert_eq!(game_genie_code.patch_data(0x12), 0x12);
game_genie_code = GameGenieCode::from_code("00A+17B", None).unwrap();
@@ -240,10 +240,10 @@ mod tests {
assert_eq!(game_genie_code.addr, 0x4a17);
assert_eq!(game_genie_code.new_data, 0x00);
assert_eq!(game_genie_code.old_data, 0x00);
- assert_eq!(game_genie_code.additive, false);
- assert_eq!(game_genie_code.condensed, true);
- assert_eq!(game_genie_code.is_valid(0xc8), true);
- assert_eq!(game_genie_code.is_valid(0xc9), true);
+ assert!(!game_genie_code.additive);
+ assert!(game_genie_code.condensed);
+ assert!(game_genie_code.is_valid(0xc8));
+ assert!(game_genie_code.is_valid(0xc9));
assert_eq!(game_genie_code.patch_data(0x12), 0x00);
game_genie_code = GameGenieCode::from_code("00A+17B", Some(true)).unwrap();
@@ -251,10 +251,10 @@ mod tests {
assert_eq!(game_genie_code.addr, 0x4a17);
assert_eq!(game_genie_code.new_data, 0x00);
assert_eq!(game_genie_code.old_data, 0x00);
- assert_eq!(game_genie_code.additive, true);
- assert_eq!(game_genie_code.condensed, true);
- assert_eq!(game_genie_code.is_valid(0xc8), true);
- assert_eq!(game_genie_code.is_valid(0xc9), true);
+ assert!(game_genie_code.additive);
+ assert!(game_genie_code.condensed);
+ assert!(game_genie_code.is_valid(0xc8));
+ assert!(game_genie_code.is_valid(0xc9));
assert_eq!(game_genie_code.patch_data(0x12), 0x012);
}
}
diff --git a/src/ppu.rs b/src/ppu.rs
index 6abf7199..9443a014 100644
--- a/src/ppu.rs
+++ b/src/ppu.rs
@@ -941,13 +941,13 @@ impl Ppu {
pub fn frame_buffer_xrgb8888_u32(&self) -> [u32; FRAME_BUFFER_SIZE] {
let mut buffer = [0u32; FRAME_BUFFER_SIZE];
- for index in 0..DISPLAY_SIZE {
+ for (index, pixel) in buffer.iter_mut().enumerate().take(DISPLAY_SIZE) {
let (r, g, b) = (
self.frame_buffer[index * RGB_SIZE],
self.frame_buffer[index * RGB_SIZE + 1],
self.frame_buffer[index * RGB_SIZE + 2],
);
- buffer[index] = ((r as u32) << 16) | ((g as u32) << 8) | b as u32;
+ *pixel = ((r as u32) << 16) | ((g as u32) << 8) | b as u32;
}
buffer
}
@@ -969,13 +969,13 @@ impl Ppu {
pub fn frame_buffer_rgb1555_u16(&self) -> [u16; FRAME_BUFFER_SIZE] {
let mut buffer = [0u16; FRAME_BUFFER_SIZE];
- for index in 0..DISPLAY_SIZE {
+ for (index, pixel) in buffer.iter_mut().enumerate().take(DISPLAY_SIZE) {
let (r, g, b) = (
self.frame_buffer[index * RGB_SIZE],
self.frame_buffer[index * RGB_SIZE + 1],
self.frame_buffer[index * RGB_SIZE + 2],
);
- buffer[index] = Self::rgb888_to_rgb1555_u16(r, g, b);
+ *pixel = Self::rgb888_to_rgb1555_u16(r, g, b);
}
buffer
}
@@ -997,13 +997,13 @@ impl Ppu {
pub fn frame_buffer_rgb565_u16(&self) -> [u16; FRAME_BUFFER_SIZE] {
let mut buffer = [0u16; FRAME_BUFFER_SIZE];
- for index in 0..DISPLAY_SIZE {
+ for (index, pixel) in buffer.iter_mut().enumerate().take(DISPLAY_SIZE) {
let (r, g, b) = (
self.frame_buffer[index * RGB_SIZE],
self.frame_buffer[index * RGB_SIZE + 1],
self.frame_buffer[index * RGB_SIZE + 2],
);
- buffer[index] = Self::rgb888_to_rgb565_u16(r, g, b);
+ *pixel = Self::rgb888_to_rgb565_u16(r, g, b);
}
buffer
}
--
GitLab