style: format imports

Signed-off-by: Changyuan Lyu <[email protected]>

alioth/src/arch/aarch64/reg.rs

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::c_enum;
 use bitfield::bitfield;
 use bitflags::bitflags;
 
+use crate::c_enum;
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum Reg {
     X0,

alioth/src/arch/arch.rs

@@ -20,6 +20,6 @@ mod aarch64;
 mod x86_64;
 
 #[cfg(target_arch = "aarch64")]
-pub use aarch64::*;
+pub use self::aarch64::*;
 #[cfg(target_arch = "x86_64")]
-pub use x86_64::*;
+pub use self::x86_64::*;

alioth/src/board/board.rs

@@ -54,9 +54,9 @@ use crate::vfio::container::Container;
 use crate::vfio::iommu::Ioas;
 
 #[cfg(target_arch = "aarch64")]
-pub(crate) use aarch64::ArchBoard;
+pub(crate) use self::aarch64::ArchBoard;
 #[cfg(target_arch = "x86_64")]
-pub(crate) use x86_64::ArchBoard;
+pub(crate) use self::x86_64::ArchBoard;
 
 #[trace_error]
 #[derive(Snafu, DebugTrace)]

alioth/src/device/fw_cfg/fw_cfg.rs

@@ -15,8 +15,8 @@
 #[cfg(target_arch = "x86_64")]
 pub mod acpi;
 
-use core::fmt;
 use std::ffi::CString;
+use std::fmt;
 use std::fs::File;
 use std::io::{ErrorKind, Read, Result, Seek, SeekFrom};
 #[cfg(target_arch = "x86_64")]
@@ -51,7 +51,7 @@ use crate::mem::mapped::RamBus;
 use crate::mem::{MemRegionEntry, MemRegionType};
 
 #[cfg(target_arch = "x86_64")]
-use acpi::create_acpi_loader;
+use self::acpi::create_acpi_loader;
 
 pub const SELECTOR_WR: u16 = 1 << 14;
 

alioth/src/firmware/acpi/acpi.rs

@@ -26,14 +26,14 @@ use crate::arch::layout::{
 };
 use crate::utils::wrapping_sum;
 
-use bindings::{
+use self::bindings::{
     AcpiGenericAddress, AcpiMadtIoApic, AcpiMadtLocalX2apic, AcpiMcfgAllocation,
     AcpiSubtableHeader, AcpiTableFadt, AcpiTableHeader, AcpiTableMadt, AcpiTableMcfg1,
     AcpiTableRsdp, AcpiTableXsdt3, FADT_MAJOR_VERSION, FADT_MINOR_VERSION, MADT_IO_APIC,
     MADT_LOCAL_X2APIC, MADT_REVISION, MCFG_REVISION, RSDP_REVISION, SIG_FADT, SIG_MADT, SIG_MCFG,
     SIG_RSDP, SIG_XSDT, XSDT_REVISION,
 };
-use reg::FADT_RESET_VAL;
+use self::reg::FADT_RESET_VAL;
 
 const OEM_ID: [u8; 6] = *b"ALIOTH";
 

alioth/src/hv/hv.rs

@@ -42,9 +42,9 @@ use crate::arch::sev::{SevPolicy, SnpPageType, SnpPolicy};
 use crate::errors::{trace_error, DebugTrace};
 
 #[cfg(target_os = "macos")]
-pub use hvf::Hvf;
+pub use self::hvf::Hvf;
 #[cfg(target_os = "linux")]
-pub use kvm::{Kvm, KvmConfig, KvmError};
+pub use self::kvm::{Kvm, KvmConfig, KvmError};
 
 #[trace_error]
 #[derive(Snafu, DebugTrace)]

alioth/src/hv/hvf/hvf.rs

@@ -21,13 +21,13 @@ use std::collections::HashMap;
 use std::fmt::{Display, Formatter};
 use std::ptr::null_mut;
 
-use bindings::hv_vm_create;
 use parking_lot::Mutex;
 use snafu::ResultExt;
 
 use crate::hv::{error, Hypervisor, Result, VmConfig};
 
-use vm::HvfVm;
+use self::bindings::hv_vm_create;
+use self::vm::HvfVm;
 
 #[derive(Debug, Clone, Copy)]
 #[repr(transparent)]

alioth/src/hv/kvm/kvm.rs

@@ -41,6 +41,7 @@ use std::ptr::null_mut;
 use std::sync::atomic::AtomicU32;
 use std::sync::Arc;
 
+use libc::SIGRTMIN;
 use parking_lot::lock_api::RwLock;
 use parking_lot::Mutex;
 use serde::Deserialize;
@@ -54,15 +55,14 @@ use crate::ffi;
 use crate::hv::{error, Hypervisor, MemMapOption, Result, VmConfig};
 
 #[cfg(target_arch = "aarch64")]
-use bindings::KvmDevType;
-use bindings::KVM_API_VERSION;
+use self::bindings::KvmDevType;
+use self::bindings::KVM_API_VERSION;
 #[cfg(target_arch = "x86_64")]
-use bindings::{KvmCpuid2, KvmCpuid2Flag, KvmCpuidEntry2, KVM_MAX_CPUID_ENTRIES};
+use self::bindings::{KvmCpuid2, KvmCpuid2Flag, KvmCpuidEntry2, KVM_MAX_CPUID_ENTRIES};
 #[cfg(target_arch = "x86_64")]
-use ioctls::kvm_get_supported_cpuid;
-use ioctls::{kvm_create_vm, kvm_get_api_version, kvm_get_vcpu_mmap_size};
-use libc::SIGRTMIN;
-use vm::{KvmVm, VmInner};
+use self::ioctls::kvm_get_supported_cpuid;
+use self::ioctls::{kvm_create_vm, kvm_get_api_version, kvm_get_vcpu_mmap_size};
+use self::vm::{KvmVm, VmInner};
 
 #[trace_error]
 #[derive(DebugTrace, Snafu)]

alioth/src/hv/kvm/sev/sev.rs

@@ -21,12 +21,13 @@ use std::fs::File;
 use std::os::fd::{AsFd, BorrowedFd, OwnedFd};
 use std::path::Path;
 
+use snafu::ResultExt;
+
 use crate::hv::kvm::kvm_error;
 use crate::hv::Result;
 use crate::ioctl_writeread;
 
-use bindings::{SevIssueCmd, SEV_RET_SUCCESS};
-use snafu::ResultExt;
+use self::bindings::{SevIssueCmd, SEV_RET_SUCCESS};
 
 const SEV_IOC_TYPE: u8 = b'S';
 

alioth/src/hv/kvm/vcpu/x86_64.rs

@@ -323,10 +323,10 @@ impl KvmVcpu {
 
 #[cfg(test)]
 mod test {
-    use assert_matches::assert_matches;
     use std::mem::size_of_val;
     use std::ptr::null_mut;
 
+    use assert_matches::assert_matches;
     use libc::{mmap, MAP_ANONYMOUS, MAP_FAILED, MAP_SHARED, PROT_EXEC, PROT_READ, PROT_WRITE};
 
     use crate::arch::msr::Efer;

alioth/src/hv/kvm/vm/vm.rs

@@ -55,7 +55,7 @@ use crate::hv::{
 };
 
 #[cfg(target_arch = "x86_64")]
-pub use x86_64::VmArch;
+pub use self::x86_64::VmArch;
 
 #[derive(Debug)]
 pub(super) struct VmInner {
@@ -756,9 +756,9 @@ impl Vm for KvmVm {
 
 #[cfg(test)]
 mod test {
-    use assert_matches::assert_matches;
     use std::ptr::null_mut;
 
+    use assert_matches::assert_matches;
     use libc::{mmap, MAP_ANONYMOUS, MAP_FAILED, MAP_PRIVATE, PROT_EXEC, PROT_READ, PROT_WRITE};
 
     use super::*;

alioth/src/hv/kvm/vmentry.rs

@@ -13,8 +13,7 @@
 // limitations under the License.
 
 use crate::hv::kvm::bindings::{KvmExit, KvmExitIo};
-
-use super::vcpu::KvmVcpu;
+use crate::hv::kvm::vcpu::KvmVcpu;
 
 impl KvmVcpu {
     #[cfg(target_endian = "little")]

alioth/src/hv/kvm/vmexit.rs

@@ -15,10 +15,9 @@
 use crate::hv::kvm::bindings::{
     KvmExitIo, KvmMapGpaRangeFlag, KvmSystemEvent, KVM_HC_MAP_GPA_RANGE,
 };
+use crate::hv::kvm::vcpu::KvmVcpu;
 use crate::hv::{Error, VmExit};
 
-use super::vcpu::KvmVcpu;
-
 impl KvmVcpu {
     #[cfg(target_endian = "little")]
     pub(super) fn handle_mmio(&mut self) -> Result<VmExit, Error> {

alioth/src/loader/firmware/firmware.rs

@@ -18,6 +18,6 @@ mod aarch64;
 mod x86_64;
 
 #[cfg(target_arch = "aarch64")]
-pub use aarch64::load;
+pub use self::aarch64::load;
 #[cfg(target_arch = "x86_64")]
-pub use x86_64::load;
+pub use self::x86_64::load;

alioth/src/loader/linux/linux.rs

@@ -20,6 +20,6 @@ pub mod bootparams;
 mod x86_64;
 
 #[cfg(target_arch = "aarch64")]
-pub use aarch64::load;
+pub use self::aarch64::load;
 #[cfg(target_arch = "x86_64")]
-pub use x86_64::load;
+pub use self::x86_64::load;

alioth/src/loader/linux/x86_64.rs

@@ -17,19 +17,19 @@ use std::io::{BufReader, Read, Seek, SeekFrom};
 use std::mem::{size_of, size_of_val};
 use std::path::Path;
 
-use crate::arch::msr::Efer;
-use crate::arch::paging::Entry;
-use crate::arch::reg::{
-    Cr0, Cr4, DtReg, DtRegVal, Reg, Rflags, SReg, SegAccess, SegReg, SegRegVal,
-};
-use crate::mem::mapped::RamBus;
 use snafu::ResultExt;
 use zerocopy::{FromZeros, IntoBytes};
 
 use crate::arch::layout::{
     BOOT_GDT_START, BOOT_PAGING_START, EBDA_START, KERNEL_CMD_LINE_LIMIT, KERNEL_CMD_LINE_START,
     KERNEL_IMAGE_START, LINUX_BOOT_PARAMS_START,
 };
+use crate::arch::msr::Efer;
+use crate::arch::paging::Entry;
+use crate::arch::reg::{
+    Cr0, Cr4, DtReg, DtRegVal, Reg, Rflags, SReg, SegAccess, SegReg, SegRegVal,
+};
+use crate::mem::mapped::RamBus;
 use crate::mem::{MemRegionEntry, MemRegionType};
 
 use crate::loader::linux::bootparams::{

alioth/src/loader/loader.rs

@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub mod elf;
+#[path = "firmware/firmware.rs"]
+pub mod firmware;
+#[path = "linux/linux.rs"]
+pub mod linux;
+#[cfg(target_arch = "x86_64")]
+#[path = "xen/xen.rs"]
+pub mod xen;
+
 use std::ops::Range;
 use std::path::PathBuf;
 
@@ -23,15 +32,6 @@ use crate::arch::reg::{Reg, SReg};
 use crate::errors::{trace_error, DebugTrace};
 use crate::mem::{MemRegionEntry, MemRegionType};
 
-pub mod elf;
-#[path = "firmware/firmware.rs"]
-pub mod firmware;
-#[path = "linux/linux.rs"]
-pub mod linux;
-#[cfg(target_arch = "x86_64")]
-#[path = "xen/xen.rs"]
-pub mod xen;
-
 #[derive(Debug)]
 pub struct Payload {
     pub executable: PathBuf,

alioth/src/loader/xen/xen.rs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub mod start_info;
+
 use std::fs::File;
 use std::io::{BufReader, Read, Seek, SeekFrom};
 use std::mem::{offset_of, size_of, size_of_val};
@@ -37,9 +39,7 @@ use crate::loader::{error, search_initramfs_address, InitState, Result};
 use crate::mem::mapped::RamBus;
 use crate::mem::{MemRegionEntry, MemRegionType};
 
-pub mod start_info;
-
-use start_info::{HvmMemmapTableEntry, HvmModlistEntry, HvmStartInfo};
+use self::start_info::{HvmMemmapTableEntry, HvmModlistEntry, HvmStartInfo};
 
 pub const XEN_ELFNOTE_PHYS32_ENTRY: u32 = 18;
 

alioth/src/mem/mapped.rs

@@ -507,10 +507,10 @@ impl RamBus {
 
 #[cfg(test)]
 mod test {
-    use assert_matches::assert_matches;
     use std::io::{Read, Write};
     use std::mem::size_of;
 
+    use assert_matches::assert_matches;
     use libc::{PROT_READ, PROT_WRITE};
     use zerocopy::{FromBytes, Immutable, IntoBytes};
 

alioth/src/mem/mem.rs

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub mod addressable;
+pub mod emulated;
+pub mod mapped;
+
 use std::any::type_name;
 use std::fmt::Debug;
 use std::sync::Arc;
@@ -24,13 +28,9 @@ use snafu::Snafu;
 use crate::errors::{trace_error, DebugTrace};
 use crate::hv::{MemMapOption, VmEntry, VmMemory};
 
-pub mod addressable;
-pub mod emulated;
-pub mod mapped;
-
-use addressable::{Addressable, SlotBackend};
-use emulated::{Action, MmioBus, MmioRange};
-use mapped::{ArcMemPages, Ram, RamBus};
+use self::addressable::{Addressable, SlotBackend};
+use self::emulated::{Action, MmioBus, MmioRange};
+use self::mapped::{ArcMemPages, Ram, RamBus};
 
 #[trace_error]
 #[derive(Snafu, DebugTrace)]

alioth/src/pci/pci.rs

@@ -12,6 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub mod bus;
+pub mod cap;
+pub mod config;
+pub mod host_bridge;
+pub mod segment;
+
 use std::fmt::{Debug, Display, Formatter};
 use std::sync::Arc;
 
@@ -23,13 +29,7 @@ use crate::errors::{trace_error, DebugTrace};
 use crate::mem;
 use crate::mem::{IoRegion, MemRegion, MemRegionCallback};
 
-pub mod bus;
-pub mod cap;
-pub mod config;
-pub mod host_bridge;
-pub mod segment;
-
-use config::{HeaderData, PciConfig, BAR_MEM64};
+use self::config::{HeaderData, PciConfig, BAR_MEM64};
 
 bitfield! {
     #[derive(Copy, Clone, Default, PartialEq, Eq, Hash, PartialOrd, Ord)]

alioth/src/utils/utils.rs

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::atomic::{AtomicU64, Ordering};
-
 pub mod endian;
 #[cfg(target_os = "linux")]
 pub mod ioctls;
 
+use std::sync::atomic::{AtomicU64, Ordering};
+
 pub fn truncate_u64(val: u64, size: u64) -> u64 {
     val & u64::MAX >> (64 - (size << 3))
 }

alioth/src/vfio/vfio.rs

@@ -23,13 +23,14 @@ pub mod pci;
 
 use std::path::{Path, PathBuf};
 
-use bindings::VfioIommu;
 use serde::Deserialize;
 use serde_aco::Help;
 use snafu::Snafu;
 
 use crate::errors::{trace_error, DebugTrace};
 
+use self::bindings::VfioIommu;
+
 #[trace_error]
 #[derive(Snafu, DebugTrace)]
 #[snafu(module, context(suffix(false)))]