[PLATFORM-861]: Fix borked enum variant name formatting

veil-macros/src/enums.rs

@@ -168,7 +168,7 @@ pub(super) fn derive_redact(
     for (variant, flags) in e.variants.iter().zip(variant_flags.into_iter()) {
         // Variant name redacting
         let variant_name = variant.ident.to_string();
-        let variant_name = if let Some(flags) = &flags.variant_flags {
+        let variant_name = if let Some(flags @ FieldFlags { skip: false, .. }) = &flags.variant_flags {
             // The variant name must always be formatted with the Display impl.
             let flags = FieldFlags {
                 display: true,

veil-tests/src/redaction_tests.rs

@@ -195,3 +195,81 @@ fn test_enum_display_redaction() {
         "Foo { foo: ***** \"*******\"!\n*** ****'* *** *******..., bar: \"***** \\\"*******\\\"!\\**** ****'* *** *******...\" }"
     );
 }
+
+#[test]
+fn test_enum_variant_names() {
+    #[derive(Debug)]
+    enum Control {
+        Foo(String),
+        Bar,
+    }
+
+    #[derive(Redact)]
+    enum Redacted {
+        #[redact(variant)]
+        Foo(#[redact] String),
+        Bar,
+    }
+
+    #[derive(Redact)]
+    #[redact(all, variant)]
+    enum RedactedAll {
+        #[redact(skip, variant)]
+        Foo(#[redact] String),
+        #[redact(skip, variant)]
+        Bar,
+    }
+
+    assert_eq!(format!("{:?}", RedactedAll::Bar), format!("{:?}", Redacted::Bar));
+    assert_ne!(
+        format!("{:?}", Redacted::Foo("Hello".to_string())),
+        format!("{:?}", RedactedAll::Foo("Hello".to_string()))
+    );
+    assert_eq!(
+        format!("{:?} {:?}", Control::Foo("Hello".to_string()), Control::Bar),
+        "Foo(\"Hello\") Bar"
+    );
+    assert_eq!(
+        format!("{:?} {:?}", Redacted::Foo("Hello".to_string()), Redacted::Bar),
+        "***(\"*****\") Bar"
+    );
+    assert_eq!(format!("{:?}", Control::Bar), format!("{:?}", Redacted::Bar));
+    assert_ne!(
+        format!("{:?}", Control::Foo("Hello".to_string())),
+        format!("{:?}", Redacted::Foo("Hello".to_string()))
+    );
+}
+
+#[test]
+fn test_struct_name() {
+    #[derive(Debug)]
+    struct Control {
+        #[allow(dead_code)]
+        foo: String,
+    }
+
+    #[derive(Redact)]
+    struct Redacted {
+        #[redact]
+        foo: String,
+    }
+
+    assert_eq!(
+        format!(
+            "{:?}",
+            Control {
+                foo: "Hello".to_string()
+            }
+        ),
+        "Control { foo: \"Hello\" }"
+    );
+    assert_eq!(
+        format!(
+            "{:?}",
+            Redacted {
+                foo: "Hello".to_string()
+            }
+        ),
+        "Redacted { foo: \"*****\" }"
+    );
+}