From 700b8a4e00346638a6f7d241bf374a0e0b69fae3 Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@crans.org>
Date: Sun, 15 Apr 2018 11:50:13 +0200
Subject: [PATCH] rustfmt

---
 kernel-rs/src/acpi/dsdt.rs |  2 +-
 kernel-rs/src/acpi/fadt.rs |  9 ++++++---
 kernel-rs/src/acpi/mod.rs  |  2 +-
 kernel-rs/src/console.rs   | 10 +++++-----
 kernel-rs/src/keyboard.rs  |  3 +--
 kernel-rs/src/lib.rs       |  2 --
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kernel-rs/src/acpi/dsdt.rs b/kernel-rs/src/acpi/dsdt.rs
index e20cd3d8..d0612519 100644
--- a/kernel-rs/src/acpi/dsdt.rs
+++ b/kernel-rs/src/acpi/dsdt.rs
@@ -1,6 +1,6 @@
 use super::{check_signature, ACPISDTHeader};
 use core::mem;
-use io::{Pio,Io};
+use io::{Io, Pio};
 
 static mut DSDT: DSDT = DSDT {
     valid: false,
diff --git a/kernel-rs/src/acpi/fadt.rs b/kernel-rs/src/acpi/fadt.rs
index 94105bcb..22135d29 100644
--- a/kernel-rs/src/acpi/fadt.rs
+++ b/kernel-rs/src/acpi/fadt.rs
@@ -1,5 +1,5 @@
 use super::{ACPISDTHeader, ACPISDTIter};
-use io::{Io,Pio};
+use io::{Io, Pio};
 
 #[repr(C)]
 #[derive(Debug, Clone)]
@@ -131,7 +131,7 @@ pub fn is_enable() -> Result<bool, &'static str> {
     let pin: Pio<u16> = Pio::new(pm1_cnt[0]);
     if pm1_cnt[1] == 0 {
         Ok(pin.read() & 0x1 == 0x1)
-        // Ok(cpuio::inw(pm1_cnt[0]) & 0x1 == 0x1)
+    // Ok(cpuio::inw(pm1_cnt[0]) & 0x1 == 0x1)
     } else {
         let pin2: Pio<u8> = Pio::new(pm1_cnt[1]);
         Ok(pin.read() & 0x1 == 0x1 || pin2.read() & 0x1 == 0x1)
@@ -153,7 +153,10 @@ pub fn reboot() -> Result<(), &'static str> {
         Err("ACPI is not enabled")
     } else {
         let fadt = is_init()?;
-        println!("fadt on {} ({}), value is {}", fadt.resetreg.address as u32, fadt.resetreg.address as u16, fadt.resetvalue);
+        println!(
+            "fadt on {} ({}), value is {}",
+            fadt.resetreg.address as u32, fadt.resetreg.address as u16, fadt.resetvalue
+        );
         let mut pin: Pio<u8> = Pio::new(fadt.resetreg.address as u16);
         pin.write(fadt.resetvalue);
         // cpuio::outb(fadt.resetreg.address as u16, fadt.resetvalue); //TODO do it work
diff --git a/kernel-rs/src/acpi/mod.rs b/kernel-rs/src/acpi/mod.rs
index b1ab85ca..55f86984 100644
--- a/kernel-rs/src/acpi/mod.rs
+++ b/kernel-rs/src/acpi/mod.rs
@@ -161,7 +161,7 @@ pub fn shutdown() -> Result<(), &'static str> {
 /// This function need ACPI in v2
 pub fn reboot() -> Result<(), &'static str> {
     is_init()?;
-    if unsafe {ACPI.v2} {
+    if unsafe { ACPI.v2 } {
         fadt::reboot()
     } else {
         Err("ACPI reboot only available in ACPI v2+")
diff --git a/kernel-rs/src/console.rs b/kernel-rs/src/console.rs
index f44b444e..9ec181d7 100644
--- a/kernel-rs/src/console.rs
+++ b/kernel-rs/src/console.rs
@@ -61,11 +61,11 @@ fn help() -> Result<(), &'static str> {
 ///
 fn reboot() -> ! {
     match acpi::reboot() {
-        Err(msg)    => println!("{}", msg),
-        _           => println!("Unable to perform ACPI reboot."),
+        Err(msg) => println!("{}", msg),
+        _ => println!("Unable to perform ACPI reboot."),
     }
     flush!();
-    unsafe {PS2.ps2_8042_reset()};// TODO unsafe
+    unsafe { PS2.ps2_8042_reset() }; // TODO unsafe
     println!("Unable to perform 8042 reboot. Kernel will be halted");
     flush!();
     io::halt();
@@ -78,8 +78,8 @@ fn reboot() -> ! {
 ///
 fn shutdown() -> ! {
     match acpi::shutdown() {
-        Err(msg)    => println!("{}", msg),
-        _           => println!("Unable to perform ACPI shutdown. Kernel will be halted"),
+        Err(msg) => println!("{}", msg),
+        _ => println!("Unable to perform ACPI shutdown. Kernel will be halted"),
     }
     flush!();
     io::halt();
diff --git a/kernel-rs/src/keyboard.rs b/kernel-rs/src/keyboard.rs
index 8151114b..d4b77828 100644
--- a/kernel-rs/src/keyboard.rs
+++ b/kernel-rs/src/keyboard.rs
@@ -1,7 +1,7 @@
 extern crate core;
 
 use vga;
-use io::{self,Pio,Io};
+use io::{self, Io, Pio};
 
 const MAX_KEYS: usize = 59;
 const KEYMAP_US: [[u8; 2]; MAX_KEYS] = [
@@ -66,7 +66,6 @@ const KEYMAP_US: [[u8; 2]; MAX_KEYS] = [
     *b"\0\0",//capslock
     ];
 
-
 pub static mut PS2: Ps2 = Ps2::new();
 
 pub struct Ps2 {
diff --git a/kernel-rs/src/lib.rs b/kernel-rs/src/lib.rs
index 9995b3b4..9fe8e091 100644
--- a/kernel-rs/src/lib.rs
+++ b/kernel-rs/src/lib.rs
@@ -61,8 +61,6 @@ pub fn kmain() -> ! {
     //     *(0xdead as *mut u32) = 42;
     // };
 
-    println!("tss: {:?}");
-
     // vga is *not* cpu specific
     vga::init();