From 0f20b2801b8716a13f804708051563a6a63839fc Mon Sep 17 00:00:00 2001
From: Kevin Hamacher <kevin.hamacher@ruhr-uni-bochum.de>
Date: Thu, 20 Feb 2020 19:31:41 +0100
Subject: [PATCH] Ongoing cleanup

---
 src/cartridge.rs | 2 +-
 src/cpu.rs       | 6 +++---
 src/display.rs   | 6 +++---
 src/main.rs      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cartridge.rs b/src/cartridge.rs
index 1989013..44bd475 100644
--- a/src/cartridge.rs
+++ b/src/cartridge.rs
@@ -78,7 +78,7 @@ impl Cartridge {
             RamSize::Ram32KB => 16 * 2048,
         };
 
-        if let &Some(ref filename) = savefile {
+        if let Some(ref filename) = *savefile {
             let data = super::read_file(&filename);
             if let Ok(data) = data {
                 if data.len() != size {
diff --git a/src/cpu.rs b/src/cpu.rs
index 5c6eef1..bc82d7d 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -58,8 +58,8 @@ enum Args {
 
 impl Args {
     fn single_val(&self) -> u8 {
-        match self {
-            &Args::Single(x) => x,
+        match *self {
+            Args::Single(x) => x,
             _ => panic!("single_val only works with Args::Single"),
         }
     }
@@ -72,7 +72,7 @@ impl CPU {
             regs: [0, 0, 0, 0, 0, 0, 0],
             ip: 0,
             sp: 0xFFFE,
-            interconnect: interconnect,
+            interconnect,
             ime: false,
             debug: false,
             halted: false,
diff --git a/src/display.rs b/src/display.rs
index da08e8b..eca92bf 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -262,13 +262,13 @@ impl Display {
             vram1: vec![0; VRAM_SIZE].into_boxed_slice(),
             vram_bank: 0,
             oam: vec![0; OAM_SIZE].into_boxed_slice(),
-            renderer: renderer,
+            renderer,
 
-            event_pump: event_pump,
+            event_pump,
 
             vblank_interrupt: false,
             stat_interrupt: false,
-            pixels: pixels,
+            pixels,
             frameskip: 0,
             frame_no: 0,
 
diff --git a/src/main.rs b/src/main.rs
index 885511c..fe47268 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,7 +47,7 @@ pub fn read_file<P: AsRef<Path>>(rom_path: P) -> Result<Box<[u8]>, io::Error> {
     Ok(buf.into_boxed_slice())
 }
 
-pub fn write_file<P: AsRef<Path>>(path: P, data: &Box<[u8]>) -> Result<(), io::Error> {
+pub fn write_file<P: AsRef<Path>>(path: P, data: &[u8]) -> Result<(), io::Error> {
     let mut file = fs::File::create(path)?;
     file.write_all(&data)?;
     Ok(())