Move mmap_* modules under src/mmap/

No functional changes, other than the module paths of mmap related
types.

Signed-off-by: Manos Pitsidianakis <[email protected]>

Author: epilys

coverage_config_aarch64.json

@@ -1,5 +1,5 @@
 {
   "coverage_score": 85.2,
-  "exclude_path": "mmap_windows.rs",
+  "exclude_path": "mmap/windows.rs",
   "crate_features": "backend-mmap,backend-atomic,backend-bitmap"
 }

src/lib.rs

@@ -53,15 +53,6 @@ pub use guest_memory::{
 pub mod io;
 pub use io::{ReadVolatile, WriteVolatile};
 
-#[cfg(all(feature = "backend-mmap", not(feature = "xen"), unix))]
-mod mmap_unix;
-
-#[cfg(all(feature = "backend-mmap", feature = "xen", unix))]
-mod mmap_xen;
-
-#[cfg(all(feature = "backend-mmap", windows))]
-mod mmap_windows;
-
 #[cfg(feature = "backend-mmap")]
 pub mod mmap;
 

src/mmap.rs

@@ -29,15 +29,24 @@ use crate::volatile_memory::{VolatileMemory, VolatileSlice};
 use crate::{AtomicAccess, Bytes, ReadVolatile, WriteVolatile};
 
 #[cfg(all(not(feature = "xen"), unix))]
-pub use crate::mmap_unix::{Error as MmapRegionError, MmapRegion, MmapRegionBuilder};
+mod unix;
 
 #[cfg(all(feature = "xen", unix))]
-pub use crate::mmap_xen::{Error as MmapRegionError, MmapRange, MmapRegion, MmapXenFlags};
+pub(crate) mod xen;
 
 #[cfg(windows)]
-pub use crate::mmap_windows::MmapRegion;
+mod windows;
+
+#[cfg(all(not(feature = "xen"), unix))]
+pub use unix::{Error as MmapRegionError, MmapRegion, MmapRegionBuilder};
+
+#[cfg(all(feature = "xen", unix))]
+pub use xen::{Error as MmapRegionError, MmapRange, MmapRegion, MmapXenFlags};
+
 #[cfg(windows)]
 pub use std::io::Error as MmapRegionError;
+#[cfg(windows)]
+pub use windows::MmapRegion;
 
 /// A `Bitmap` that can be created starting from an initial size.
 pub trait NewBitmap: Bitmap + Default {

src/mmap_unix.rs renamed to src/mmap/unix.rs

@@ -248,7 +248,7 @@ mod tests {
 
     use crate::bitmap::AtomicBitmap;
     use crate::guest_memory::FileOffset;
-    use crate::mmap_windows::INVALID_HANDLE_VALUE;
+    use crate::mmap::windows::INVALID_HANDLE_VALUE;
 
     type MmapRegion = super::MmapRegion<()>;
 

src/mmap_windows.rs renamed to src/mmap/windows.rs

@@ -40,7 +40,7 @@ use crate::bitmap::{Bitmap, BitmapSlice, BS};
 use crate::{AtomicAccess, ByteValued, Bytes};
 
 #[cfg(all(feature = "backend-mmap", feature = "xen", unix))]
-use crate::mmap_xen::{MmapXen as MmapInfo, MmapXenSlice};
+use crate::mmap::xen::{MmapXen as MmapInfo, MmapXenSlice};
 
 #[cfg(not(feature = "xen"))]
 type MmapInfo = std::marker::PhantomData<()>;