Merge pull request #188 from Freax13/enhancement/clean-up-modules

clean up modules

Author: Freax13

common/loader/src/lib.rs

@@ -10,9 +10,10 @@ mod input;
 mod kernel;
 mod supervisor;
 
-pub use input::Input;
 pub use io::input::HashType;
 
+pub use self::input::Input;
+
 #[derive(Debug)]
 pub struct LoadCommand {
     pub physical_address: PhysFrame,

common/snp-types/src/id_block.rs

@@ -4,9 +4,8 @@ use bytemuck::{AnyBitPattern, CheckedBitPattern, NoUninit};
 #[cfg(feature = "p384")]
 use p384::ecdsa::VerifyingKey;
 
-use crate::guest_policy::GuestPolicy;
-
 pub use crate::attestation::EcdsaP384Sha384Signature;
+use crate::guest_policy::GuestPolicy;
 
 #[derive(Debug, Clone, Copy, CheckedBitPattern, NoUninit)]
 #[repr(C)]

common/snp-types/src/vmsa.rs

@@ -1,5 +1,10 @@
 //! Related to the VMSA. The VMSA type is aware of VMSA register protection.
 
+use core::{
+    fmt::{self, Debug},
+    mem::{offset_of, size_of},
+};
+
 use bit_field::BitArray;
 use bitflags::bitflags;
 use bytemuck::{CheckedBitPattern, Pod, Zeroable, bytes_of_mut};
@@ -14,11 +19,6 @@ use x86_64::registers::{
 
 use crate::{Reserved, Uninteresting};
 
-use core::{
-    fmt::{self, Debug},
-    mem::{offset_of, size_of},
-};
-
 macro_rules! vmsa_field_accessor {
     ($ident:ident: $ty:ty) => {
         // Don't emit anything if $vis is empty (default -> private).

common/tdx-types/src/td_quote.rs

@@ -7,10 +7,12 @@ use bytemuck::{
     bytes_of,
     checked::{CheckedCastError, try_pod_read_unaligned},
 };
-use p256::EncodedPoint;
-use p256::ecdsa::{
-    DerSignature, Signature, VerifyingKey,
-    signature::{DigestVerifier, Verifier},
+use p256::{
+    EncodedPoint,
+    ecdsa::{
+        DerSignature, Signature, VerifyingKey,
+        signature::{DigestVerifier, Verifier},
+    },
 };
 pub use raw::{
     AttestationType, Attributes, Body, EnclaveReportBody, Header, QeVendorId, TeeType, Version,

host/mushroom-verify/src/lib.rs

@@ -1,16 +1,15 @@
 use std::fmt::{self, Display};
 
-use io::input::{Header, MAX_HASH_SIZE};
-use sha2::{Digest, Sha256};
-use thiserror::Error;
-
 #[cfg(feature = "insecure")]
 pub use insecure::forge_insecure_attestation_report;
+use io::input::{Header, MAX_HASH_SIZE};
 pub use loader::{HashType, Input};
+use sha2::{Digest, Sha256};
 #[cfg(feature = "snp")]
 pub use snp_types::{attestation::TcbVersion, guest_policy::GuestPolicy};
 #[cfg(feature = "tdx")]
 pub use tdx_types::td_quote::TeeTcbSvn;
+use thiserror::Error;
 
 #[cfg(feature = "serde")]
 mod hex;

host/mushroom/src/kvm.rs

@@ -30,7 +30,8 @@ use snp_types::{
 use tracing::debug;
 use volatile::VolatilePtr;
 
-use crate::{kvm::hidden::KvmCpuid2, slot::Slot};
+use self::hidden::KvmCpuid2;
+use crate::slot::Slot;
 
 const KVMIO: u8 = 0xAE;
 pub const KVM_HC_MAP_GPA_RANGE: u64 = 12;
@@ -1419,7 +1420,7 @@ pub struct KvmTdxExit {
 }
 
 mod hidden {
-    use super::KvmCpuidEntry2;
+    use crate::kvm::KvmCpuidEntry2;
 
     #[repr(C)]
     pub struct KvmCpuid2<const N: usize> {

host/mushroom/src/main.rs

@@ -10,8 +10,7 @@ use bytemuck::checked::try_pod_read_unaligned;
 use clap::{Args, Parser, Subcommand, ValueEnum};
 use loader::{HashType, Input};
 use mushroom::{KvmHandle, MushroomResult, Tee, profiler::ProfileFolder};
-use mushroom_verify::{Configuration, HashedInput};
-use mushroom_verify::{InputHash, OutputHash};
+use mushroom_verify::{Configuration, HashedInput, InputHash, OutputHash};
 #[cfg(feature = "snp")]
 use snp_types::{attestation::TcbVersion, guest_policy::GuestPolicy};
 #[cfg(feature = "tdx")]

host/mushroom/src/snp.rs

@@ -19,11 +19,13 @@ use constants::{
 use loader::Input;
 use mushroom_verify::snp::{LaunchDigest, create_signature, id_block};
 use nix::sys::pthread::pthread_kill;
+pub use snp_types::guest_policy::GuestPolicy;
 use snp_types::{
     PageType,
     id_block::{EcdsaP384PublicKey, EcdsaP384Sha384Signature, IdAuthInfo, KeyAlgo, PublicKey},
 };
 use tracing::{debug, info};
+pub use vcek_kds::Vcek;
 use x86_64::{
     PhysAddr,
     structures::paging::{PageSize, PhysFrame, Size2MiB, Size4KiB},
@@ -41,9 +43,6 @@ use crate::{
     slot::Slot,
 };
 
-pub use snp_types::guest_policy::GuestPolicy;
-pub use vcek_kds::Vcek;
-
 #[allow(clippy::too_many_arguments)]
 pub fn main(
     kvm_handle: &KvmHandle,

rustfmt.toml

@@ -0,0 +1,2 @@
+imports_granularity = "crate"
+group_imports = "StdExternalCrate"

tee/kernel/src/char_dev.rs

@@ -1,4 +1,5 @@
 use alloc::sync::Arc;
+
 use linkme::distributed_slice;
 
 use crate::{
@@ -8,7 +9,7 @@ use crate::{
         fd::StrongFileDescriptor,
         node::{FileAccessContext, LinkLocation},
     },
-    user::process::syscall::args::{OpenFlags, Stat},
+    user::syscall::args::{OpenFlags, Stat},
 };
 
 pub mod char;