Formatting: cargo fmt

src/cartridge.rs

@@ -10,20 +10,19 @@ pub struct Cartridge {
 
 impl Cartridge {
     pub fn new(filename: &str) -> Self {
-	let mut file = File::open(filename).expect("Error while opening file!");
-	let mut buffer = [0u8; BUFFER_SIZE];
+        let mut file = File::open(filename).expect("Error while opening file!");
+        let mut buffer = [0u8; BUFFER_SIZE];
 
-	// either read a byte, or noting (0)
-	let bytes = if let Ok(bytes) = file.read(&mut buffer) {
-	    bytes
-	}
-	else {
-	    0
-	};
+        // either read a byte, or noting (0)
+        let bytes = if let Ok(bytes) = file.read(&mut buffer) {
+            bytes
+        } else {
+            0
+        };
 
-	Cartridge {
-	    rom: buffer,
-	    size: bytes,
-	}
+        Cartridge {
+            rom: buffer,
+            size: bytes,
+        }
     }
 }

src/display.rs

@@ -1,5 +1,5 @@
 use sdl2;
-use sdl2::{render::Canvas, video::Window, pixels, rect::Rect};
+use sdl2::{pixels, rect::Rect, render::Canvas, video::Window};
 
 pub struct Display {
     canvas: Canvas<Window>,
@@ -7,49 +7,43 @@ pub struct Display {
 
 impl Display {
     pub fn new(sdl_ctx: &sdl2::Sdl) -> Self {
-	let video = sdl_ctx.video().unwrap();
-	let window = video
-	    .window(
-		"chip8-rs",
-		(crate::SCREEN_WIDTH * crate::SCREEN_SCALE) as u32,
-		(crate::SCREEN_HEIGHT * crate::SCREEN_SCALE) as u32)
+        let video = sdl_ctx.video().unwrap();
+        let window = video
+            .window(
+                "chip8-rs",
+                (crate::SCREEN_WIDTH * crate::SCREEN_SCALE) as u32,
+                (crate::SCREEN_HEIGHT * crate::SCREEN_SCALE) as u32,
+            )
             .position_centered()
             .opengl()
             .build()
             .unwrap();
 
-	let mut canvas = window
-	    .into_canvas()
-	    .build()
-	    .unwrap();
+        let mut canvas = window.into_canvas().build().unwrap();
 
-	canvas.set_draw_color(pixels::Color::RGB(0, 0, 0));
-	canvas.clear();
-	canvas.present();
+        canvas.set_draw_color(pixels::Color::RGB(0, 0, 0));
+        canvas.clear();
+        canvas.present();
 
-	Display {
-	    canvas,
-	}
+        Display { canvas }
     }
 
     pub fn draw(&mut self, pixel: &[[u8; crate::SCREEN_WIDTH]; crate::SCREEN_HEIGHT]) {
-	for (y, &row) in pixel.iter().enumerate() {
-	    for (x, &column) in row.iter().enumerate() {
-		self.canvas.set_draw_color(
-		    if column == 1 {
-			pixels::Color::RGB(255, 255, 255)
-		    }
-		    else {
-			pixels::Color::RGB(0, 0, 0)
-		    });
-		let _ = self.canvas
-		    .fill_rect(
-			Rect::new((x * crate::SCREEN_SCALE) as i32,
-				  (y * crate::SCREEN_SCALE) as i32,
-				  crate::SCREEN_SCALE as u32,
-				  crate::SCREEN_SCALE as u32));
-	    }
-	}
-	self.canvas.present();
+        for (y, &row) in pixel.iter().enumerate() {
+            for (x, &column) in row.iter().enumerate() {
+                self.canvas.set_draw_color(if column == 1 {
+                    pixels::Color::RGB(255, 255, 255)
+                } else {
+                    pixels::Color::RGB(0, 0, 0)
+                });
+                let _ = self.canvas.fill_rect(Rect::new(
+                    (x * crate::SCREEN_SCALE) as i32,
+                    (y * crate::SCREEN_SCALE) as i32,
+                    crate::SCREEN_SCALE as u32,
+                    crate::SCREEN_SCALE as u32,
+                ));
+            }
+        }
+        self.canvas.present();
     }
 }

src/fontset.rs

@@ -1,4 +1,4 @@
-pub (crate) const FONT: [u8; 80] = [
+pub(crate) const FONT: [u8; 80] = [
     0xF0, 0x90, 0x90, 0x90, 0xF0, // 0
     0x20, 0x60, 0x20, 0x20, 0x70, // 1
     0xF0, 0x10, 0xF0, 0x80, 0xF0, // 2

src/input.rs

@@ -21,7 +21,8 @@ impl Input {
         }
 
         // get all inputs
-        let input: Vec<Keycode> = self.events
+        let input: Vec<Keycode> = self
+            .events
             .keyboard_state()
             .pressed_scancodes()
             .filter_map(Keycode::from_scancode)

src/main.rs

@@ -3,14 +3,14 @@ extern crate sdl2;
 
 use std::env;
 
-mod processor;
-mod fontset;
-mod display;
-mod input;
 mod cartridge;
+mod display;
+mod fontset;
+mod input;
+mod processor;
 
-use crate::processor::Processor;
 use crate::cartridge::Cartridge;
+use crate::processor::Processor;
 
 const MEMORY_SIZE: usize = 4096;
 const GAME_ENTRY: usize = 0x200; // most games load into 0x200