Reformat after the rename

Signed-off-by: Paolo Bonzini <[email protected]>

Author: bonzini

src/atomic.rs

@@ -151,7 +151,7 @@ impl<M: GuestMemory> GuestMemoryExclusiveGuard<'_, M> {
 mod tests {
     use super::*;
     use crate::region::tests::{new_guest_memory_collection_from_regions, Collection, MockRegion};
-    use crate::{GuestAddress, GuestMemoryBackend, GuestMemoryRegion, GuestUsize, GuestMemory};
+    use crate::{GuestAddress, GuestMemory, GuestMemoryBackend, GuestMemoryRegion, GuestUsize};
 
     type GuestMemoryMmapAtomic = GuestMemoryAtomic<Collection>;
 

src/iommu.rs

@@ -18,8 +18,8 @@ use crate::guest_memory::{
     Result as GuestMemoryResult,
 };
 use crate::{
-    Address, GuestAddress, GuestMemoryBackend, GuestMemoryRegion, GuestUsize, GuestMemory, Permissions,
-    VolatileSlice,
+    Address, GuestAddress, GuestMemory, GuestMemoryBackend, GuestMemoryRegion, GuestUsize,
+    Permissions, VolatileSlice,
 };
 use rangemap::RangeMap;
 use std::cmp;
@@ -373,7 +373,12 @@ impl TryFrom<Range<u64>> for IovaRange {
 
 impl<M: GuestMemoryBackend, I: Iommu> IommuMemory<M, I> {
     /// Create a new `IommuMemory` instance.
-    pub fn new(backend: M, iommu: I, use_iommu: bool, bitmap: <Self as GuestMemory>::Bitmap) -> Self {
+    pub fn new(
+        backend: M,
+        iommu: I,
+        use_iommu: bool,
+        bitmap: <Self as GuestMemory>::Bitmap,
+    ) -> Self {
         IommuMemory {
             backend,
             iommu: Arc::new(iommu),
@@ -670,7 +675,7 @@ mod tests {
     use crate::GuestMemoryRegion;
     #[cfg(feature = "backend-mmap")]
     use crate::{
-        Bytes, GuestMemoryError, GuestMemoryMmap, GuestMemoryResult, GuestMemory, IommuMemory,
+        Bytes, GuestMemory, GuestMemoryError, GuestMemoryMmap, GuestMemoryResult, IommuMemory,
     };
     use crate::{GuestAddress, Iommu, Iotlb, Permissions};
     use std::fmt::Debug;

src/lib.rs

@@ -52,8 +52,8 @@ pub use endian::{Be16, Be32, Be64, BeSize, Le16, Le32, Le64, LeSize};
 
 pub mod guest_memory;
 pub use guest_memory::{
-    Error as GuestMemoryError, FileOffset, GuestAddress, GuestAddressSpace, GuestMemoryBackend,
-    GuestUsize, GuestMemory, MemoryRegionAddress, Permissions, Result as GuestMemoryResult,
+    Error as GuestMemoryError, FileOffset, GuestAddress, GuestAddressSpace, GuestMemory,
+    GuestMemoryBackend, GuestUsize, MemoryRegionAddress, Permissions, Result as GuestMemoryResult,
 };
 
 pub mod region;

src/region.rs

@@ -476,7 +476,8 @@ impl<R: GuestMemoryRegionBytes> Bytes<MemoryRegionAddress> for R {
 pub(crate) mod tests {
     use crate::region::{GuestMemoryRegionBytes, GuestRegionCollectionError};
     use crate::{
-        Address, GuestAddress, GuestMemoryBackend, GuestMemoryRegion, GuestRegionCollection, GuestUsize,
+        Address, GuestAddress, GuestMemoryBackend, GuestMemoryRegion, GuestRegionCollection,
+        GuestUsize,
     };
     use matches::assert_matches;
     use std::sync::Arc;