From 7652cc223eeeae0a7041f44a012ec92d9562cbc8 Mon Sep 17 00:00:00 2001
From: github-actions <${GITHUB_ACTOR}@users.noreply.github.com>
Date: Mon, 27 Sep 2021 13:39:52 +0000
Subject: [PATCH] fixup! Format Rust code with rustfmt

---
 src/ata.rs        |  4 ++--
 src/interrupts.rs | 30 +++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/ata.rs b/src/ata.rs
index ea0294c..07e5c2b 100644
--- a/src/ata.rs
+++ b/src/ata.rs
@@ -208,10 +208,10 @@ fn disk_size(sectors: u32) -> (u32, String) {
 }
 
 pub fn info() -> Vec<(u8, String, String, u32, String)> {
-    use x86_64::registers::control::{Cr0Flags, Cr0};
+    use x86_64::registers::control::{Cr0, Cr0Flags};
     let mut flags = Cr0::read();
     flags.set(Cr0Flags::WRITE_PROTECT, false);
-    unsafe {Cr0::write(flags)};
+    unsafe { Cr0::write(flags) };
     let mut bus = BUS.lock();
     let mut res = Vec::new();
     for drive in 0..2 {
diff --git a/src/interrupts.rs b/src/interrupts.rs
index ed69dff..1d5c7bd 100644
--- a/src/interrupts.rs
+++ b/src/interrupts.rs
@@ -18,9 +18,12 @@ lazy_static! {
         idt.page_fault.set_handler_fn(page_fault_handler);
         idt[InterruptIndex::Timer.as_usize()].set_handler_fn(timer_interrupt_handler);
         idt[InterruptIndex::Keyboard.as_usize()].set_handler_fn(keyboard_interrupt_handler);
-        idt.stack_segment_fault.set_handler_fn(stack_segment_fault_handler);
-        idt.segment_not_present.set_handler_fn(segment_not_present_handler);
-        idt.general_protection_fault.set_handler_fn(general_protection_fault_handler);
+        idt.stack_segment_fault
+            .set_handler_fn(stack_segment_fault_handler);
+        idt.segment_not_present
+            .set_handler_fn(segment_not_present_handler);
+        idt.general_protection_fault
+            .set_handler_fn(general_protection_fault_handler);
         idt
     };
 }
@@ -152,16 +155,25 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
     }
 }
 
-extern "x86-interrupt" fn general_protection_fault_handler(stack_frame: InterruptStackFrame, _error_code: u64) {
-        panic!("EXCEPTION: GENERAL PROTECTION FAULT\n{:#?}", stack_frame);
+extern "x86-interrupt" fn general_protection_fault_handler(
+    stack_frame: InterruptStackFrame,
+    _error_code: u64,
+) {
+    panic!("EXCEPTION: GENERAL PROTECTION FAULT\n{:#?}", stack_frame);
 }
 
-extern "x86-interrupt" fn stack_segment_fault_handler(stack_frame: InterruptStackFrame, _error_code: u64) {
-        panic!("EXCEPTION: STACK SEGMENT FAULT\n{:#?}", stack_frame);
+extern "x86-interrupt" fn stack_segment_fault_handler(
+    stack_frame: InterruptStackFrame,
+    _error_code: u64,
+) {
+    panic!("EXCEPTION: STACK SEGMENT FAULT\n{:#?}", stack_frame);
 }
 
-extern "x86-interrupt" fn segment_not_present_handler(stack_frame: InterruptStackFrame, _error_code: u64) {
-        panic!("EXCEPTION: SEGMENT NOT PRESENT\n{:#?}", stack_frame);
+extern "x86-interrupt" fn segment_not_present_handler(
+    stack_frame: InterruptStackFrame,
+    _error_code: u64,
+) {
+    panic!("EXCEPTION: SEGMENT NOT PRESENT\n{:#?}", stack_frame);
 }
 
 pub const PIC_1_OFFSET: u8 = 32;