apply of clippy.

fixed missing imports and builds and tests as expected again

gemma/tests/computer_tests.rs

@@ -34,7 +34,7 @@ fn reset_clears_video() {
 fn level1_test() {
     let mut x = Chip8Computer::new();
     let level_1_rom = load_rom("1-chip8-logo.ch8");
-    x.load_bytes_to_memory(0x200, (&level_1_rom).into());
+    x.load_bytes_to_memory(0x200, (&level_1_rom));
 
     // run for 0x40 cycles
     while x.num_cycles < 0x40 {
@@ -49,7 +49,7 @@ fn level2_test() {
     // Load the IBM rom and run it.
     // it takes 39 cycles to get to the end so lets run it 40.
     let test_rom_to_run = load_rom("2-ibm-logo.ch8");
-    x.load_bytes_to_memory(0x200, (&test_rom_to_run).into());
+    x.load_bytes_to_memory(0x200, (&test_rom_to_run));
     for _ in 0..40 {
         x.step_system();
     }
@@ -64,7 +64,7 @@ fn level3_test() {
     let mut x = Chip8Computer::new();
 
      x.load_bytes_to_memory(
-         0x200, (&load_rom("3-corax+.ch8")).into()
+         0x200, (&load_rom("3-corax+.ch8"))
      );
     for i in 0..0x180 {
         x.step_system();
@@ -76,7 +76,7 @@ fn level3_test() {
 #[test]
 fn rps_test() {
     let mut x = Chip8Computer::new();
-    x.load_bytes_to_memory(0x200, &load_rom("RPS.ch8").into());
+    x.load_bytes_to_memory(0x200, &load_rom("RPS.ch8"));
     for _ in 0..0xF0 {
         x.step_system();
     }
@@ -92,7 +92,7 @@ fn rps_test() {
 fn level4_test() {
     // flags
     let mut x = Chip8Computer::new();
-    x.load_bytes_to_memory(0x200, &load_rom("4-flags.ch8").into());
+    x.load_bytes_to_memory(0x200, &load_rom("4-flags.ch8"));
     for _ in 0..0x400 {
         x.step_system();
     }

gemma/tests/unit_tests.rs

@@ -1,12 +1,10 @@
-use std::collections::{BTreeMap, BTreeSet};
 use log::debug;
 use rand::random;
 use gemma::chip8::computer::Chip8Computer;
 use gemma::chip8::delay_timer::DelayTimer;
 use gemma::chip8::instructions::Chip8CpuInstructions;
-use gemma::chip8::instructions::Chip8CpuInstructions::JPA;
 use gemma::chip8::keypad::Keypad;
-use gemma::chip8::quirk_modes::QuirkMode::{Chip8, SChipModern, XOChip};
+use gemma::chip8::quirk_modes::QuirkMode::Chip8;
 use gemma::chip8::registers::Chip8Registers;
 use gemma::chip8::sound_timer::SoundTimer;
 use gemma::chip8::stack::Chip8Stack;
@@ -300,7 +298,7 @@ fn cls_test() {
     Chip8CpuInstructions::CLS.execute(&mut x);
     assert_eq!(x.registers.peek_pc(), 0x202);
     for i in 0..CHIP8_VIDEO_MEMORY {
-        assert_eq!(x.video_memory.peek(i as u16), false);
+        assert!(!x.video_memory.peek(i as u16));
     }
     // draw some thing to the video memory
     x.video_memory.poke(0x01, true);
@@ -310,7 +308,7 @@ fn cls_test() {
     Chip8CpuInstructions::CLS.execute(&mut x);
 
     for i in 0..CHIP8_VIDEO_MEMORY {
-        assert_eq!(x.video_memory.peek(i as u16), false);
+        assert!(!x.video_memory.peek(i as u16));
     }
 }
 
@@ -778,7 +776,7 @@ fn keypad_keys_check() {
 
 #[test]
 fn keypad_string_format_test() {
-    let mut k = Keypad::new();
+    let k = Keypad::new();
 
 
     assert_eq!(k.format_as_string(), read_test_result("gemma_keypad_string_result.asc"));
@@ -998,7 +996,7 @@ fn video_default_test() {
     for i in 0..CHIP8_VIDEO_MEMORY {
         assert!(!x.clone().peek(i as u16));
         // then flip the value and test again.
-        &x.poke(i as u16, true);
+        x.poke(i as u16, true);
         assert!(x.clone().peek(i as u16));
     }
 }
@@ -1050,7 +1048,7 @@ fn video_poke_2byte_test() {
     let mut expected = String::new();
     expected = "**  ****  ****  ".to_string() + &*" ".repeat(64 - 16).to_string() + "\n";
     for i in 0..31 {
-        expected += &*((&*" ".repeat(64)).to_string() + "\n");
+        expected += &*((*" ".repeat(64)).to_string() + "\n");
     }
 
     assert_eq!(expected, x.format_as_string());
@@ -1065,7 +1063,7 @@ fn video_poke_multirow_2_byte_sprite() {
 fn video_cls_stddef() {
     let width = 64;
     let height = 32;
-    let mut initial_memory = vec![];
+    let initial_memory = vec![];
     let mut ws = String::new();
     let mut set_x = Chip8Video::new(initial_memory.into());
     for cbr in 0..32 {
@@ -1186,7 +1184,7 @@ fn video_verify_change_registered() {
 
 #[test]
 fn video_write_checkboard() {
-    let mut v = build_checkerboard();
+    let v = build_checkerboard();
     assert_eq!(v.clone().format_as_string(), read_test_result("test_video_write_checkerboard.asc"));
 }
 
@@ -1234,23 +1232,23 @@ fn video_collision_test() {
     // set the cell thats already set...
     x.poke(0x00, true);
     // it becomes unset and theres a frame changed
-    assert_eq!(false, x.peek(0x00));
+    assert!(!x.peek(0x00));
 
-    assert_eq!(true, x.clone().has_frame_changed);
+    assert!(x.clone().has_frame_changed);
 }
 
 #[test]
 fn video_collision_test2() {
     let mut x = Chip8Video::default();
     x.poke_byte(0x00, 0b11110000);
-    assert_eq!(true, x.has_frame_changed);
+    assert!(x.has_frame_changed);
     x.tick();
-    assert_eq!(false, x.has_frame_changed);
+    assert!(!x.has_frame_changed);
     // clear the 'has changed' flag
 
     // now set a no-collision value
     x.poke_byte(0x00, 0b00001111);
-    assert_eq!(true, x.has_frame_changed);
+    assert!(x.has_frame_changed);
 }
 
 #[test]
@@ -1280,7 +1278,7 @@ fn video_scroll_down_10_row_test() {
 
 #[test]
 fn video_high_res_has_right_resolution() {
-    let mut x = build_checkboard_hd();
+    let x = build_checkboard_hd();
     println!("[{}]", x.format_as_string());
     assert_eq!(read_test_result("test_video_highdef.asc"), x.format_as_string());
 }