Refactor code

vinc · Jan 11, 2024 · 8bd3c4c · 8bd3c4c
1 parent 8923d17
commit 8bd3c4c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/sys/serial.rs b/src/sys/serial.rs
@@ -52,17 +52,15 @@ impl fmt::Write for Serial {
 impl Perform for Serial {
     fn csi_dispatch(&mut self, params: &Params, _: &[u8], _: bool, c: char) {
         match c {
-            'h' => {
-                // Enable
+            'h' => { // Enable
                 for param in params.iter() {
                     match param[0] {
                         12 => sys::console::enable_echo(),
                         _ => return,
                     }
                 }
             }
-            'l' => {
-                // Disable
+            'l' => { // Disable
                 for param in params.iter() {
                     match param[0] {
                         12 => sys::console::disable_echo(),
@@ -77,9 +75,9 @@ impl Perform for Serial {
 
 #[doc(hidden)]
 pub fn print_fmt(args: fmt::Arguments) {
-    interrupts::without_interrupts(|| {
-        SERIAL.lock().write_fmt(args).expect("Could not print to serial");
-    })
+    interrupts::without_interrupts(||
+        SERIAL.lock().write_fmt(args).expect("Could not print to serial")
+    )
 }
 
 pub fn init() {
@@ -89,8 +87,7 @@ pub fn init() {
 
 fn interrupt_handler() {
     let b = SERIAL.lock().read_byte();
-    if b == 0xFF {
-        // Ignore invalid bytes
+    if b == 0xFF { // Ignore invalid bytes
         return;
     }
     let c = match b as char {

diff --git a/src/sys/vga.rs b/src/sys/vga.rs
@@ -452,9 +452,9 @@ impl fmt::Write for Writer {
 
 #[doc(hidden)]
 pub fn print_fmt(args: fmt::Arguments) {
-    interrupts::without_interrupts(|| {
-        WRITER.lock().write_fmt(args).expect("Could not print to VGA");
-    });
+    interrupts::without_interrupts(||
+        WRITER.lock().write_fmt(args).expect("Could not print to VGA")
+    )
 }
 
 pub fn cols() -> usize {