use alternate flag to swap between simple and hyphenated

uuid-rs · Nov 1, 2021 · 5edf9ca · 5edf9ca
1 parent 60b5317
commit 5edf9ca
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 20 deletions.
diff --git a/src/fmt.rs b/src/fmt.rs
@@ -42,14 +42,22 @@ impl fmt::Display for Variant {
 
 impl fmt::LowerHex for Uuid {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::LowerHex::fmt(&self.to_hyphenated_ref(), f)
+        if f.alternate() {
+            fmt::LowerHex::fmt(&self.to_simple_ref(), f)
+        } else {
+            fmt::LowerHex::fmt(&self.to_hyphenated_ref(), f)
+        }
     }
 }
 
 impl fmt::UpperHex for Uuid {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::UpperHex::fmt(&self.to_hyphenated_ref(), f)
+        if f.alternate() {
+            fmt::UpperHex::fmt(&self.to_simple_ref(), f)
+        } else {
+            fmt::UpperHex::fmt(&self.to_hyphenated_ref(), f)
+        }
     }
 }
 
@@ -974,15 +982,13 @@ macro_rules! impl_fmt_traits {
 
         impl<$($a),*> fmt::LowerHex for $T<$($a),*> {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                // TODO: Self doesn't work https://github.com/rust-lang/rust/issues/52808
-                f.write_str(self.encode_lower(&mut [0; $T::LENGTH]))
+                f.write_str(self.encode_lower(&mut [0; Self::LENGTH]))
             }
         }
 
         impl<$($a),*> fmt::UpperHex for $T<$($a),*> {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                // TODO: Self doesn't work https://github.com/rust-lang/rust/issues/52808
-                f.write_str(self.encode_upper(&mut [0; $T::LENGTH]))
+                f.write_str(self.encode_upper(&mut [0; Self::LENGTH]))
             }
         }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -818,19 +818,6 @@ mod tests {
             || c == '-');
     }
 
-    #[test]
-    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
-    fn test_uuid_upperhex() {
-        use crate::std::fmt::Write;
-
-        let mut buffer = String::new();
-        let uuid = new();
-
-        check!(buffer, "{:X}", uuid, 36, |c| c.is_uppercase()
-            || c.is_digit(10)
-            || c == '-');
-    }
-
     #[test]
     #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
     fn test_nil() {
@@ -936,25 +923,43 @@ mod tests {
             ($buf:ident, $format:expr, $target:expr, $len:expr, $cond:expr) => {
                 $buf.clear();
                 write!($buf, $format, $target).unwrap();
-                assert!(buf.len() == $len);
+                assert_eq!($len, buf.len());
                 assert!($buf.chars().all($cond), "{}", $buf);
             };
         }
 
+        check!(buf, "{:x}", u, 36, |c| c.is_lowercase()
+            || c.is_digit(10)
+            || c == '-');
         check!(buf, "{:X}", u, 36, |c| c.is_uppercase()
             || c.is_digit(10)
             || c == '-');
+        check!(buf, "{:#x}", u, 32, |c| c.is_lowercase()
+            || c.is_digit(10));
+        check!(buf, "{:#X}", u, 32, |c| c.is_uppercase()
+            || c.is_digit(10));
+
         check!(buf, "{:X}", u.to_hyphenated(), 36, |c| c.is_uppercase()
             || c.is_digit(10)
             || c == '-');
         check!(buf, "{:X}", u.to_simple(), 32, |c| c.is_uppercase()
             || c.is_digit(10));
+        check!(buf, "{:#X}", u.to_hyphenated(), 36, |c| c.is_uppercase()
+            || c.is_digit(10)
+            || c == '-');
+        check!(buf, "{:#X}", u.to_simple(), 32, |c| c.is_uppercase()
+            || c.is_digit(10));
 
         check!(buf, "{:x}", u.to_hyphenated(), 36, |c| c.is_lowercase()
             || c.is_digit(10)
             || c == '-');
         check!(buf, "{:x}", u.to_simple(), 32, |c| c.is_lowercase()
             || c.is_digit(10));
+        check!(buf, "{:#x}", u.to_hyphenated(), 36, |c| c.is_lowercase()
+            || c.is_digit(10)
+            || c == '-');
+        check!(buf, "{:#x}", u.to_simple(), 32, |c| c.is_lowercase()
+            || c.is_digit(10));
     }
 
     #[test]