Move a bunch of core modules into a core sub-module

For better encapsulation.

Signed-off-by: mulhern <amulhern@redhat.com>

Author: mulkieran

src/cachedev.rs

@@ -7,18 +7,17 @@ use std::fmt;
 use std::path::PathBuf;
 use std::str::FromStr;
 
-use crate::device::Device;
-use crate::deviceinfo::DeviceInfo;
-use crate::dm::DM;
-use crate::dm_options::DmOptions;
+use crate::core::{
+    DataBlocks, DevId, Device, DeviceInfo, DmName, DmOptions, DmUuid, MetaBlocks, Sectors,
+    TargetTypeBuf, DM,
+};
 use crate::lineardev::{LinearDev, LinearDevTargetParams};
 use crate::result::{DmError, DmResult, ErrorEnum};
 use crate::shared::{
     device_create, device_exists, device_match, get_status_line_fields,
     make_unexpected_value_error, parse_device, parse_value, DmDevice, TargetLine, TargetParams,
     TargetTable,
 };
-use crate::types::{DataBlocks, DevId, DmName, DmUuid, MetaBlocks, Sectors, TargetTypeBuf};
 
 const CACHE_TARGET_NAME: &str = "cache";
 
@@ -737,7 +736,7 @@ use std::path::Path;
 #[cfg(test)]
 use crate::consts::IEC;
 #[cfg(test)]
-use crate::device::devnode_to_devno;
+use crate::core::devnode_to_devno;
 #[cfg(test)]
 use crate::lineardev::LinearTargetParams;
 #[cfg(test)]

src/device.rs src/core/device.rssrc/device.rs renamed to src/core/device.rs

@@ -10,9 +10,10 @@ use std::{fmt, io};
 use libc::{dev_t, major, makedev, minor};
 use nix::sys::stat::SFlag;
 
-use crate::errors::ErrorKind;
 use crate::result::{DmError, DmResult};
 
+use crate::core::errors::ErrorKind;
+
 /// A struct containing the device's major and minor numbers
 ///
 /// Also allows conversion to/from a single 64bit dev_t value.

src/deviceinfo.rs src/core/deviceinfo.rssrc/deviceinfo.rs renamed to src/core/deviceinfo.rs

@@ -3,11 +3,10 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 use std::str::from_utf8;
 
-use crate::device::Device;
-use crate::dm_flags::DmFlags;
-use crate::dm_ioctl as dmi;
-use crate::types::{DmName, DmUuid};
-use crate::util::slice_to_null;
+use crate::core::{Device, DmFlags, DmName, DmUuid};
+
+use crate::core::dm_ioctl as dmi;
+use crate::core::util::slice_to_null;
 
 /// Name max length
 pub const DM_NAME_LEN: usize = 128;

src/dm.rs src/core/dm.rssrc/dm.rs renamed to src/core/dm.rs

@@ -10,16 +10,16 @@ use std::{cmp, slice, u32};
 use nix::libc::c_ulong;
 use nix::libc::ioctl as nix_ioctl;
 
-use crate::device::Device;
-use crate::deviceinfo::{DeviceInfo, DM_NAME_LEN, DM_UUID_LEN};
-use crate::dm_flags::DmFlags;
-use crate::dm_ioctl as dmi;
-use crate::dm_options::DmOptions;
-use crate::errors::ErrorKind;
+use crate::core::{
+    DevId, Device, DeviceInfo, DmFlags, DmName, DmNameBuf, DmOptions, DmUuid, Sectors,
+    TargetTypeBuf,
+};
 use crate::result::{DmError, DmResult};
 
-use crate::types::{DevId, DmName, DmNameBuf, DmUuid, Sectors, TargetTypeBuf};
-use crate::util::{align_to, slice_to_null};
+use crate::core::deviceinfo::{DM_NAME_LEN, DM_UUID_LEN};
+use crate::core::dm_ioctl as dmi;
+use crate::core::errors::ErrorKind;
+use crate::core::util::{align_to, slice_to_null};
 
 /// Indicator to send IOCTL to DM
 const DM_IOCTL: u8 = 0xfd;
@@ -723,10 +723,11 @@ impl DM {
 #[cfg(test)]
 mod tests {
 
-    use crate::errors::Error;
     use crate::result::DmError;
     use crate::test_lib::{test_name, test_uuid};
 
+    use crate::core::errors::Error;
+
     use super::*;
 
     #[test]

src/dm_flags.rs src/core/dm_flags.rssrc/dm_flags.rs renamed to src/core/dm_flags.rs

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-use crate::dm_ioctl as dmi;
+use crate::core::dm_ioctl as dmi;
 
 bitflags! {
     /// Flags used by devicemapper.

src/dm_ioctl.rs src/core/dm_ioctl.rssrc/dm_ioctl.rs renamed to src/core/dm_ioctl.rs

@@ -10,8 +10,9 @@
 use std::borrow::Cow;
 use std::fmt;
 
-use crate::device::Device;
-use crate::util::slice_to_null;
+use crate::core::Device;
+
+use crate::core::util::slice_to_null;
 
 pub type __s8 = ::libc::c_char;
 pub type __u8 = ::libc::c_uchar;

src/dm_options.rs src/core/dm_options.rssrc/dm_options.rs renamed to src/core/dm_options.rs

@@ -1,7 +1,7 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
-use crate::dm_flags::{DmCookie, DmFlags};
+use crate::core::{DmCookie, DmFlags};
 
 /// Encapsulates options for device mapper calls
 #[derive(Debug, Default, Clone)]

src/errors.rs src/core/errors.rssrc/errors.rs renamed to src/core/errors.rs

@@ -7,7 +7,7 @@ use std::path::PathBuf;
 
 use nix;
 
-use crate::deviceinfo::DeviceInfo;
+use crate::core::DeviceInfo;
 
 error_chain! {
     errors {

src/core/mod.rs

@@ -0,0 +1,25 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! Modules that support handling of devicemapper ioctls at a low-level.
+
+mod device;
+pub(self) mod deviceinfo;
+mod dm;
+mod dm_flags;
+pub(self) mod dm_ioctl;
+mod dm_options;
+pub mod errors;
+mod types;
+pub(self) mod util;
+
+pub use self::device::{devnode_to_devno, Device};
+pub use self::deviceinfo::DeviceInfo;
+pub use self::dm::DM;
+pub use self::dm_flags::{DmCookie, DmFlags};
+pub use self::dm_options::DmOptions;
+pub use self::types::{
+    Bytes, DataBlocks, DevId, DmName, DmNameBuf, DmUuid, DmUuidBuf, MetaBlocks, Sectors,
+    TargetType, TargetTypeBuf,
+};

src/types.rs src/core/types.rssrc/types.rs renamed to src/core/types.rs

@@ -10,10 +10,11 @@ use std::ops::{Add, Deref, Div, Mul, Rem};
 use serde;
 
 use crate::consts::SECTOR_SIZE;
-use crate::deviceinfo::{DM_NAME_LEN, DM_UUID_LEN};
-use crate::errors::ErrorKind;
 use crate::result::{DmError, DmResult};
 
+use crate::core::deviceinfo::{DM_NAME_LEN, DM_UUID_LEN};
+use crate::core::errors::ErrorKind;
+
 /// a kernel defined block size constant for any DM meta device
 /// a DM meta device may store cache device or thinpool device metadata
 /// defined in drivers/md/persistent-data/dm-space-map-metadata.h as