rustfmtmain

2 files changed, 35 insertions, 16 deletions

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}"));
     }