diff --git a/module/core/former/tests/inc/enum_unit_tests/generic_unit_variant_derive.rs b/module/core/former/tests/inc/enum_unit_tests/generic_unit_variant_derive.rs index 6be9de752b..7f8b8c2bb5 100644 --- a/module/core/former/tests/inc/enum_unit_tests/generic_unit_variant_derive.rs +++ b/module/core/former/tests/inc/enum_unit_tests/generic_unit_variant_derive.rs @@ -6,7 +6,7 @@ use former::Former; /// Generic enum with a unit variant, using Former. #[derive(Debug, PartialEq, Former)] -#[former(standalone_constructors)] +#[former(standalone_constructors, debug)] pub enum GenericOption // Minimal bounds for T { #[scalar] // Treat Value(T) as a scalar constructor for the enum diff --git a/module/core/former/tests/inc/enum_unit_tests/keyword_variant_derive.rs b/module/core/former/tests/inc/enum_unit_tests/keyword_variant_derive.rs index 076671e9ad..f9343256f9 100644 --- a/module/core/former/tests/inc/enum_unit_tests/keyword_variant_derive.rs +++ b/module/core/former/tests/inc/enum_unit_tests/keyword_variant_derive.rs @@ -2,7 +2,7 @@ use former::Former; // Ensure derive is in scope use super::*; // Needed for the include #[derive(Debug, PartialEq, Former)] -#[former(standalone_constructors)] +#[former(standalone_constructors, debug)] #[allow(non_camel_case_types)] // Explicitly allowing for testing keyword-like names pub enum KeywordTest { r#fn, diff --git a/module/core/former/tests/inc/enum_unit_tests/mixed_enum_unit_derive.rs b/module/core/former/tests/inc/enum_unit_tests/mixed_enum_unit_derive.rs index c72706994f..e0ea8bf661 100644 --- a/module/core/former/tests/inc/enum_unit_tests/mixed_enum_unit_derive.rs +++ b/module/core/former/tests/inc/enum_unit_tests/mixed_enum_unit_derive.rs @@ -5,7 +5,7 @@ use super::*; /// Enum with a unit variant and a struct-like variant, using Former. #[derive(Debug, PartialEq, former::Former)] -#[former(standalone_constructors)] // Attribute present, added debug +#[former(standalone_constructors, debug)] // Attribute present, added debug pub enum MixedEnum { SimpleUnit, diff --git a/module/core/former/tests/inc/enum_unnamed_tests/tuple_zero_fields_derive.rs b/module/core/former/tests/inc/enum_unnamed_tests/tuple_zero_fields_derive.rs index fa2eeb985a..6ca6b66486 100644 --- a/module/core/former/tests/inc/enum_unnamed_tests/tuple_zero_fields_derive.rs +++ b/module/core/former/tests/inc/enum_unnamed_tests/tuple_zero_fields_derive.rs @@ -27,7 +27,7 @@ pub struct InnerForSubform // The enum under test for zero-field tuple variants with #[derive(Former)] #[ derive( Debug, PartialEq, Former ) ] -#[former(standalone_constructors)] // debug attribute commented out // Added standalone_constructors and debug +#[former(standalone_constructors, debug)] // Added standalone_constructors and debug // #[ derive( Default ) ] // Do not derive Default here, it caused issues before. pub enum EnumWithZeroFieldTuple { diff --git a/module/core/former_meta/src/derive_former/former_enum.rs b/module/core/former_meta/src/derive_former/former_enum.rs index 6ea85b5f54..660fa60cc6 100644 --- a/module/core/former_meta/src/derive_former/former_enum.rs +++ b/module/core/former_meta/src/derive_former/former_enum.rs @@ -167,9 +167,9 @@ pub(super) fn former_for_enum // Diagnostic print for has_debug status (has_debug is now correctly determined by the caller) if has_debug { - diag::report_print("DEBUG former_for_enum: has_debug is TRUE at start (passed in).", original_input, "e!{ struct DebugFlagWasTrue; }); + // diag::report_print("DEBUG former_for_enum: has_debug is TRUE at start (passed in).", original_input, "e!{ struct DebugFlagWasTrue; }); } else { - diag::report_print("DEBUG former_for_enum: has_debug is FALSE at start (passed in).", original_input, "e!{ struct DebugFlagWasFalse; }); + // diag::report_print("DEBUG former_for_enum: has_debug is FALSE at start (passed in).", original_input, "e!{ struct DebugFlagWasFalse; }); } let mut methods = Vec::new();