Merge pull request #429 from mulkieran/master-display

Add implementation of Display to range! macro

Author: mergify[bot]

src/range_macros.rs

@@ -4,7 +4,7 @@
 
 // An omnibus macro that includes all simple macros.
 macro_rules! range {
-    ($T: ident) => {
+    ($T: ident, $display_name: expr) => {
         macro_attr! {
             #[derive(Clone, Copy, Default, Eq, Ord, PartialEq, PartialOrd)]
             /// A type for $T
@@ -21,6 +21,7 @@ macro_rules! range {
         NewtypeSubAssign! { () pub struct $T(u64); }
 
         debug_macro!($T);
+        display!($T, $display_name);
         serde!($T);
         sum!($T);
 
@@ -52,6 +53,16 @@ macro_rules! debug_macro {
     };
 }
 
+macro_rules! display {
+    ($T:ident, $display_name:expr) => {
+        impl fmt::Display for $T {
+            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                write!(f, "{} {}", self.0, $display_name)
+            }
+        }
+    };
+}
+
 macro_rules! serde {
     ($T:ident) => {
         impl serde::Serialize for $T {
@@ -232,7 +243,7 @@ mod tests {
     use std::ops::{Add, Div, Mul, Rem};
     use std::u64;
 
-    range!(Units);
+    range!(Units, "units");
 
     #[test]
     /// Test implicit derivations for Units
@@ -268,6 +279,9 @@ mod tests {
 
         // Test Debug
         assert_eq!(format!("{:?}", Units(3)), "Units(3)");
+
+        // Test Display
+        assert_eq!(format!("{:}", Units(3)), "3 units");
     }
 
     #[test]

src/types.rs

@@ -28,15 +28,9 @@ const META_BLOCK_SIZE: Sectors = Sectors(8);
 #[allow(dead_code)]
 const MAX_META_DEV_SIZE: MetaBlocks = MetaBlocks(255 * ((1 << 14) - 64));
 
-range!(DataBlocks);
+range!(DataBlocks, "data blocks");
 
-impl fmt::Display for DataBlocks {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} data blocks", self.0)
-    }
-}
-
-range!(MetaBlocks);
+range!(MetaBlocks, "meta blocks");
 
 impl MetaBlocks {
     /// Return the number of Sectors in the MetaBlocks.
@@ -45,13 +39,7 @@ impl MetaBlocks {
     }
 }
 
-impl fmt::Display for MetaBlocks {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} meta blocks", self.0)
-    }
-}
-
-range!(Bytes);
+range!(Bytes, "bytes");
 
 impl Bytes {
     /// Return the number of Sectors fully contained in these bytes.
@@ -60,13 +48,7 @@ impl Bytes {
     }
 }
 
-impl fmt::Display for Bytes {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} bytes", self.0)
-    }
-}
-
-range!(Sectors);
+range!(Sectors, "sectors");
 
 impl Sectors {
     /// The number of bytes in these sectors.
@@ -80,12 +62,6 @@ impl Sectors {
     }
 }
 
-impl fmt::Display for Sectors {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} sectors", self.0)
-    }
-}
-
 /// Returns an error if value is unsuitable.
 fn str_check(value: &str, max_allowed_chars: usize) -> DmResult<()> {
     if !value.is_ascii() {