Clean up structure after refactoring

Author: jasoncouture

src/bios/mod.rs

@@ -5,9 +5,9 @@ An experimental x86_64 bootloader that works on both BIOS and UEFI systems.
 #![warn(missing_docs)]
 
 #[cfg(feature = "bios")]
-mod bios;
+mod mbr;
 #[cfg(feature = "uefi")]
-mod uefi;
+mod gpt;
 
 mod fat;
 
@@ -99,7 +99,7 @@ impl<'a> DiskImageBuilder<'a> {
         let fat_partition = self
             .create_fat_filesystem_image(internal_files)
             .context("failed to create FAT partition")?;
-        bios::mbr::create_mbr_disk(
+        mbr::create_mbr_disk(
             bootsector_path,
             stage_2_path,
             fat_partition.path(),
@@ -123,7 +123,7 @@ impl<'a> DiskImageBuilder<'a> {
         let fat_partition = self
             .create_fat_filesystem_image(internal_files)
             .context("failed to create FAT partition")?;
-        uefi::gpt::create_gpt_disk(fat_partition.path(), image_filename)
+        gpt::create_gpt_disk(fat_partition.path(), image_filename)
             .context("failed to create UEFI GPT disk image")?;
         fat_partition
             .close()

src/uefi/gpt.rs renamed to src/gpt.rs

@@ -1,6 +1,6 @@
 use std::{
     io::Write,
-    path::{Path, PathBuf},
+    path::Path,
     process::Command,
 };