rustfmtmain

9 files changed, 68 insertions, 32 deletions

diff --git a/kernel/src/init.rs b/kernel/src/init.rs
index cb125ba..18a6634 100644
--- a/kernel/src/init.rs
+++ b/kernel/src/init.rs
@@ -1,9 +1,7 @@
-use crate::init::cpu::int;
-
 pub mod acpi;
-pub mod earlyprintk;
 pub mod cpu;
+pub mod earlyprintk;
 
 pub fn init() {
-    int::init();
+    cpu::int::init();
 }
diff --git a/kernel/src/init/acpi.rs b/kernel/src/init/acpi.rs
index e69de29..8b13789 100644
--- a/kernel/src/init/acpi.rs
+++ b/kernel/src/init/acpi.rs
@@ -0,0 +1 @@
+
diff --git a/kernel/src/io/input.rs b/kernel/src/io/input.rs
index e69de29..8b13789 100644
--- a/kernel/src/io/input.rs
+++ b/kernel/src/io/input.rs
@@ -0,0 +1 @@
+
diff --git a/kernel/src/io/output/render.rs b/kernel/src/io/output/render.rs
index e69de29..8b13789 100644
--- a/kernel/src/io/output/render.rs
+++ b/kernel/src/io/output/render.rs
@@ -0,0 +1 @@
+
diff --git a/kernel/src/io/output/serial/uart_16550.rs b/kernel/src/io/output/serial/uart_16550.rs
index 2df3668..d94398a 100644
--- a/kernel/src/io/output/serial/uart_16550.rs
+++ b/kernel/src/io/output/serial/uart_16550.rs
@@ -41,13 +41,24 @@ impl Uart16550 {
     ) -> Result<Self, Uart16550TtyError<PortIoAddress>> {
         let mut addrs = SerialPortAddress::iter();
 
-        Ok(Self {
-            coms: array::try_from_fn(|i| {
-                config[i]
-                    .take()
-                    .map(|c| unsafe { Uart16550Tty::new_port(addrs.next().unwrap().into(), c) })
-                    .transpose()
-            })?,
-        })
+        Ok(
+            Self {
+                coms: array::try_from_fn(
+                    |i| {
+                        config[i]
+                            .take()
+                            .map(
+                                |c| unsafe {
+                                    Uart16550Tty::new_port(
+                                        addrs.next().unwrap().into(),
+                                        c,
+                                    )
+                                },
+                            )
+                            .transpose()
+                    },
+                )?,
+            },
+        )
     }
 }
diff --git a/kernel/src/mm/addr.rs b/kernel/src/mm/addr.rs
index 0e848a6..a56fb39 100644
--- a/kernel/src/mm/addr.rs
+++ b/kernel/src/mm/addr.rs
@@ -6,7 +6,10 @@ use bytemuck::{Pod, Zeroable};
 static KERNEL_VIRTUAL_BASE: Atomic<PhysicalMemoryAddress> = Atomic::new(PhysicalMemoryAddress(0));
 
 pub fn init(kernel_virtual_base: PhysicalMemoryAddress) {
-    KERNEL_VIRTUAL_BASE.store(kernel_virtual_base, Ordering::Relaxed);
+    KERNEL_VIRTUAL_BASE.store(
+        kernel_virtual_base,
+        Ordering::Relaxed,
+    );
 }
 
 #[derive(Clone, Copy, Pod, Zeroable)]
diff --git a/rustfmt.toml b/rustfmt.toml
index 9324380..04ff5de 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,4 +1,4 @@
-max_width = 104400000000
+# max_width = 104400000000
 use_small_heuristics = "Max"
 
 # chain_width = 0
@@ -9,5 +9,7 @@ struct_lit_width = 0
 struct_variant_width = 0
 # single_line_if_else_max_width = 0
 
-# wrap_comments = true
-# format_code_in_doc_comments = true
+wrap_comments = true
+format_code_in_doc_comments = true
+
+imports_granularity = "Crate"
diff --git a/x/build.rs b/x/build.rs
index 37200d3..58ac7cc 100644
--- a/x/build.rs
+++ b/x/build.rs
@@ -9,17 +9,19 @@ fn main() {
 
     // create an UEFI disk image (optional)
     let uefi_path = out_dir.join("uefi.img");
-    bootloader::UefiBoot::new(&kernel)
-        .create_disk_image(&uefi_path)
-        .unwrap();
+    bootloader::UefiBoot::new(&kernel).create_disk_image(&uefi_path).unwrap();
 
     // create a BIOS disk image
     let bios_path = out_dir.join("bios.img");
-    bootloader::BiosBoot::new(&kernel)
-        .create_disk_image(&bios_path)
-        .unwrap();
+    bootloader::BiosBoot::new(&kernel).create_disk_image(&bios_path).unwrap();
 
     // pass the disk image paths as env variables to the
-    println!("cargo:rustc-env=UEFI_PATH={}", uefi_path.display());
-    println!("cargo:rustc-env=BIOS_PATH={}", bios_path.display());
+    println!(
+        "cargo:rustc-env=UEFI_PATH={}",
+        uefi_path.display()
+    );
+    println!(
+        "cargo:rustc-env=BIOS_PATH={}",
+        bios_path.display()
+    );
 }
diff --git a/x/src/main.rs b/x/src/main.rs
index f2eabf9..ef31f9d 100644
--- a/x/src/main.rs
+++ b/x/src/main.rs
@@ -35,19 +35,36 @@ fn main() {
     cmd.arg("-device").arg("isa-debug-exit,iobase=0xf4,iosize=0x04");
 
     if uefi {
-        let prebuilt =
-            Prebuilt::fetch(Source::LATEST, "target/ovmf").expect("failed to update prebuilt");
+        let prebuilt = Prebuilt::fetch(
+            Source::LATEST,
+            "target/ovmf",
+        )
+        .expect("failed to update prebuilt");
 
-        let code = prebuilt.get_file(Arch::X64, FileType::Code);
-        let vars = prebuilt.get_file(Arch::X64, FileType::Vars);
+        let code = prebuilt.get_file(
+            Arch::X64,
+            FileType::Code,
+        );
+        let vars = prebuilt.get_file(
+            Arch::X64,
+            FileType::Vars,
+        );
 
         cmd.arg("-drive").arg(format!("format=raw,file={uefi_path}"));
-        cmd.arg("-drive")
-            .arg(format!("if=pflash,format=raw,unit=0,file={},readonly=on", code.display()));
+        cmd.arg("-drive").arg(
+            format!(
+                "if=pflash,format=raw,unit=0,file={},readonly=on",
+                code.display()
+            ),
+        );
         // copy vars and enable rw instead of snapshot if you want to store data
         // (e.g. enroll secure boot keys)
-        cmd.arg("-drive")
-            .arg(format!("if=pflash,format=raw,unit=1,file={},snapshot=on", vars.display()));
+        cmd.arg("-drive").arg(
+            format!(
+                "if=pflash,format=raw,unit=1,file={},snapshot=on",
+                vars.display()
+            ),
+        );
     } else {
         cmd.arg("-drive").arg(format!("format=raw,file={bios_path}"));
     }