Make discriminant enum generated by VariantDiscriminant derive macro match its source item

Author: regexident

CHANGELOG.md

@@ -22,7 +22,7 @@ Please make sure to add your changes to the appropriate categories:
 
 - Added enum-level `#[enumcapsulate(discriminant(…))]` helper attribute for `VariantDiscriminant` derive macro, allowing for customizing `repr = …` and `name = …` for the generated enum.
 - Added variant-level `#[enumcapsulate(discriminant(…))]` helper attribute for `VariantDiscriminant` derive macro, allowing for customizing `value = …` and `name = …` for the generated variant.
-- Made enum generate by `VariantDiscriminant` derive macro implement `Ord + PartialOrd`.
+- Made enum generated by `VariantDiscriminant` derive macro implement `Ord + PartialOrd`.
 
 ### Changed
 
@@ -31,6 +31,7 @@ Please make sure to add your changes to the appropriate categories:
 - Made `Encapsulate` derive macro no longer derive `VariantDiscriminant`.
 - Removed potentially confusing `#[enumcapsulate(include(…))]` helper attributes.
 - Merged `#[enumcapsulate(field(index = …))]` and `#[enumcapsulate(field(name = "…"))]` into a single polymorph `#[enumcapsulate(field = …)]`
+- Made enum generated by `VariantDiscriminant` derive macro have the same level of visibility as its source item.
 
 ### Deprecated
 

macros/src/enum_deriver.rs

@@ -554,6 +554,8 @@ impl EnumDeriver {
 
         let enum_config = VariantDiscriminantDeriveEnumConfig::from_enum(&self.item)?;
 
+        let visibility = &self.item.vis;
+
         let mut discriminant_enum_ident = quote::format_ident!("{enum_ident}Discriminant");
         let mut repr_attr: Option<TokenStream2> = None;
 
@@ -619,7 +621,7 @@ impl EnumDeriver {
         let discriminant_enum = quote! {
             #repr_attr
             #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
-            pub enum #discriminant_enum_ident {
+            #visibility enum #discriminant_enum_ident {
                 #(#discriminant_variants)*
             }
         };

tests/derive-tests/variant_discriminant/pass/enum/visibility.out.rs

@@ -0,0 +1,200 @@
+use enumcapsulate::VariantDiscriminant;
+pub enum PubEnum {}
+pub enum PubEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::marker::Copy for PubEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::clone::Clone for PubEnumDiscriminant {
+    #[inline]
+    fn clone(&self) -> PubEnumDiscriminant {
+        *self
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::Ord for PubEnumDiscriminant {
+    #[inline]
+    fn cmp(&self, other: &PubEnumDiscriminant) -> ::core::cmp::Ordering {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::PartialOrd for PubEnumDiscriminant {
+    #[inline]
+    fn partial_cmp(
+        &self,
+        other: &PubEnumDiscriminant,
+    ) -> ::core::option::Option<::core::cmp::Ordering> {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::Eq for PubEnumDiscriminant {
+    #[inline]
+    #[doc(hidden)]
+    #[coverage(off)]
+    fn assert_receiver_is_total_eq(&self) -> () {}
+}
+#[automatically_derived]
+impl ::core::marker::StructuralPartialEq for PubEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::cmp::PartialEq for PubEnumDiscriminant {
+    #[inline]
+    fn eq(&self, other: &PubEnumDiscriminant) -> bool {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::hash::Hash for PubEnumDiscriminant {
+    #[inline]
+    fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::fmt::Debug for PubEnumDiscriminant {
+    #[inline]
+    fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
+        match *self {}
+    }
+}
+impl ::enumcapsulate::VariantDiscriminant for PubEnum {
+    type Discriminant = PubEnumDiscriminant;
+    fn variant_discriminant(&self) -> Self::Discriminant {
+        match self {
+            _ => ::core::panicking::panic("internal error: entered unreachable code"),
+        }
+    }
+}
+pub(crate) enum PubCrateEnum {}
+pub(crate) enum PubCrateEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::marker::Copy for PubCrateEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::clone::Clone for PubCrateEnumDiscriminant {
+    #[inline]
+    fn clone(&self) -> PubCrateEnumDiscriminant {
+        *self
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::Ord for PubCrateEnumDiscriminant {
+    #[inline]
+    fn cmp(&self, other: &PubCrateEnumDiscriminant) -> ::core::cmp::Ordering {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::PartialOrd for PubCrateEnumDiscriminant {
+    #[inline]
+    fn partial_cmp(
+        &self,
+        other: &PubCrateEnumDiscriminant,
+    ) -> ::core::option::Option<::core::cmp::Ordering> {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::Eq for PubCrateEnumDiscriminant {
+    #[inline]
+    #[doc(hidden)]
+    #[coverage(off)]
+    fn assert_receiver_is_total_eq(&self) -> () {}
+}
+#[automatically_derived]
+impl ::core::marker::StructuralPartialEq for PubCrateEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::cmp::PartialEq for PubCrateEnumDiscriminant {
+    #[inline]
+    fn eq(&self, other: &PubCrateEnumDiscriminant) -> bool {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::hash::Hash for PubCrateEnumDiscriminant {
+    #[inline]
+    fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::fmt::Debug for PubCrateEnumDiscriminant {
+    #[inline]
+    fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
+        match *self {}
+    }
+}
+impl ::enumcapsulate::VariantDiscriminant for PubCrateEnum {
+    type Discriminant = PubCrateEnumDiscriminant;
+    fn variant_discriminant(&self) -> Self::Discriminant {
+        match self {
+            _ => ::core::panicking::panic("internal error: entered unreachable code"),
+        }
+    }
+}
+pub(self) enum PubSelfEnum {}
+pub(self) enum PubSelfEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::marker::Copy for PubSelfEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::clone::Clone for PubSelfEnumDiscriminant {
+    #[inline]
+    fn clone(&self) -> PubSelfEnumDiscriminant {
+        *self
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::Ord for PubSelfEnumDiscriminant {
+    #[inline]
+    fn cmp(&self, other: &PubSelfEnumDiscriminant) -> ::core::cmp::Ordering {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::PartialOrd for PubSelfEnumDiscriminant {
+    #[inline]
+    fn partial_cmp(
+        &self,
+        other: &PubSelfEnumDiscriminant,
+    ) -> ::core::option::Option<::core::cmp::Ordering> {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::cmp::Eq for PubSelfEnumDiscriminant {
+    #[inline]
+    #[doc(hidden)]
+    #[coverage(off)]
+    fn assert_receiver_is_total_eq(&self) -> () {}
+}
+#[automatically_derived]
+impl ::core::marker::StructuralPartialEq for PubSelfEnumDiscriminant {}
+#[automatically_derived]
+impl ::core::cmp::PartialEq for PubSelfEnumDiscriminant {
+    #[inline]
+    fn eq(&self, other: &PubSelfEnumDiscriminant) -> bool {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::hash::Hash for PubSelfEnumDiscriminant {
+    #[inline]
+    fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
+        match *self {}
+    }
+}
+#[automatically_derived]
+impl ::core::fmt::Debug for PubSelfEnumDiscriminant {
+    #[inline]
+    fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
+        match *self {}
+    }
+}
+impl ::enumcapsulate::VariantDiscriminant for PubSelfEnum {
+    type Discriminant = PubSelfEnumDiscriminant;
+    fn variant_discriminant(&self) -> Self::Discriminant {
+        match self {
+            _ => ::core::panicking::panic("internal error: entered unreachable code"),
+        }
+    }
+}
+fn main() {}

tests/derive-tests/variant_discriminant/pass/enum/visibility.rs

@@ -0,0 +1,12 @@
+use enumcapsulate::VariantDiscriminant;
+
+#[derive(VariantDiscriminant)]
+pub enum PubEnum {}
+
+#[derive(VariantDiscriminant)]
+pub(crate) enum PubCrateEnum {}
+
+#[derive(VariantDiscriminant)]
+pub(self) enum PubSelfEnum {}
+
+fn main() {}