Have TargetType error types be outer-layer types

Extend the macro to allow this variation.

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

Author: mulkieran

src/core/types.rs

@@ -11,14 +11,19 @@ use crate::result::{DmError, DmResult};
 use crate::core::deviceinfo::{DM_NAME_LEN, DM_UUID_LEN};
 use crate::core::errors::ErrorKind;
 
+/// An error function to construct an error when creating a new string id.
+fn err_func(err_msg: &str) -> DmError {
+    DmError::Core(ErrorKind::InvalidArgument(err_msg.into()).into())
+}
+
 /// A devicemapper name. Really just a string, but also the argument type of
 /// DevId::Name. Used in function arguments to indicate that the function
 /// takes only a name, not a devicemapper uuid.
-str_id!(DmName, DmNameBuf, DM_NAME_LEN);
+str_id!(DmName, DmNameBuf, DM_NAME_LEN, err_func);
 
 /// A devicemapper uuid. A devicemapper uuid has a devicemapper-specific
 /// format.
-str_id!(DmUuid, DmUuidBuf, DM_UUID_LEN);
+str_id!(DmUuid, DmUuidBuf, DM_UUID_LEN, err_func);
 
 /// Used as a parameter for functions that take either a Device name
 /// or a Device UUID.

src/id_macros.rs

@@ -33,7 +33,7 @@ macro_rules! str_check {
 // This implementation follows the example of Path/PathBuf as closely as
 // possible.
 macro_rules! str_id {
-    ($B:ident, $O:ident, $MAX:ident) => {
+    ($B:ident, $O:ident, $MAX:ident, $err_func:ident) => {
         /// The borrowed version of the DM identifier.
         #[derive(Debug, PartialEq, Eq, Hash)]
         pub struct $B {
@@ -51,9 +51,7 @@ macro_rules! str_id {
             #[allow(clippy::new_ret_no_self)]
             pub fn new(value: &str) -> DmResult<&$B> {
                 if let Some(err_msg) = str_check!(value, $MAX - 1) {
-                    return Err(DmError::Core(
-                        ErrorKind::InvalidArgument(err_msg.into()).into(),
-                    ));
+                    return Err($err_func(&err_msg));
                 }
                 Ok(unsafe { &*(value as *const str as *const $B) })
             }
@@ -84,9 +82,7 @@ macro_rules! str_id {
             #[allow(clippy::new_ret_no_self)]
             pub fn new(value: String) -> DmResult<$O> {
                 if let Some(err_msg) = str_check!(&value, $MAX - 1) {
-                    return Err(DmError::Core(
-                        ErrorKind::InvalidArgument(err_msg.into()).into(),
-                    ));
+                    return Err($err_func(&err_msg));
                 }
                 Ok($O { inner: value })
             }
@@ -124,8 +120,12 @@ mod tests {
 
     use crate::core::errors::{Error, ErrorKind};
 
+    fn err_func(err_msg: &str) -> DmError {
+        DmError::Core(ErrorKind::InvalidArgument(err_msg.into()).into())
+    }
+
     const TYPE_LEN: usize = 12;
-    str_id!(Id, IdBuf, TYPE_LEN);
+    str_id!(Id, IdBuf, TYPE_LEN, err_func);
 
     #[test]
     /// Test for errors on an empty name.

src/shared.rs

@@ -18,12 +18,14 @@ use crate::core::{
 use crate::result::{DmError, DmResult, ErrorEnum};
 use crate::units::Sectors;
 
-use crate::core::errors::ErrorKind;
+fn err_func(err_msg: &str) -> DmError {
+    DmError::Dm(ErrorEnum::Invalid, err_msg.into())
+}
 
 /// Number of bytes in Struct_dm_target_spec::target_type field.
 const DM_TARGET_TYPE_LEN: usize = 16;
 
-str_id!(TargetType, TargetTypeBuf, DM_TARGET_TYPE_LEN);
+str_id!(TargetType, TargetTypeBuf, DM_TARGET_TYPE_LEN, err_func);
 
 /// The trait for properties of the params string of TargetType
 pub trait TargetParams: Clone + fmt::Debug + fmt::Display + Eq + FromStr + PartialEq {