Fix Display macro to handle fill/align (Peternator7#95)

tjdev7 · Jun 12, 2020 · 95645ca · 95645ca
1 parent a20ee16
commit 95645ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/strum_macros/src/macros/strings/display.rs b/strum_macros/src/macros/strings/display.rs
@@ -47,7 +47,7 @@ pub fn display_inner(ast: &syn::DeriveInput) -> TokenStream {
             Named(..) => quote! { {..} },
         };
 
-        arms.push(quote! { #name::#ident #params => f.write_str(#output) });
+        arms.push(quote! { #name::#ident #params => f.pad(#output) });
     }
 
     if arms.len() < variants.len() {

diff --git a/strum_tests/tests/display.rs b/strum_tests/tests/display.rs
@@ -19,6 +19,14 @@ fn to_blue_string() {
     assert_eq!(String::from("blue"), format!("{}", Color::Blue { hue: 0 }));
 }
 
+#[test]
+fn test_formatters() {
+    assert_eq!(String::from("  blue"), format!("{:>6}", Color::Blue { hue: 0 }));
+    assert_eq!(String::from("blue  "), format!("{:<6}", Color::Blue { hue: 0 }));
+    assert_eq!(String::from(" blue "), format!("{:^6}", Color::Blue { hue: 0 }));
+    assert_eq!(String::from("bl"), format!("{:.2}", Color::Blue { hue: 0 }));
+}
+
 #[test]
 fn to_yellow_string() {
     assert_eq!(String::from("yellow"), format!("{}", Color::Yellow));