Merge branch 'master' of github.com:Lymia/enumset

[enumset.git] / enumset_derive / src / lib.rs

diff --git a/enumset_derive/src/lib.rs b/enumset_derive/src/lib.rs
index bc479496ae7ba5c4a7947477c77b5794cbcd6f94..597b4cb2cad76eb650d2a382f74664989fa871f5 100644 (file)
--- a/enumset_derive/src/lib.rs
+++ b/enumset_derive/src/lib.rs
@@ -350,7 +350,7 @@ fn enum_set_type_impl(info: EnumSetInfo) -> SynTokenStream {
             fn serialize<S: #serde::Serializer>(
                 set: #enumset::EnumSet<#name>, ser: S,
             ) -> #core::result::Result<S::Ok, S::Error> {
-                #serde::Serialize::serialize(&(set.__enumset_underlying as #serialize_repr), ser)
+                #serde::Serialize::serialize(&(set.__priv_repr as #serialize_repr), ser)
             }
             fn deserialize<'de, D: #serde::Deserializer<'de>>(
                 de: D,
@@ -358,7 +358,7 @@ fn enum_set_type_impl(info: EnumSetInfo) -> SynTokenStream {
                 let value = <#serialize_repr as #serde::Deserialize>::deserialize(de)?;
                 #check_unknown
                 #core::prelude::v1::Ok(#enumset::EnumSet {
-                    __enumset_underlying: (value & #all_variants) as #repr,
+                    __priv_repr: (value & #all_variants) as #repr,
                 })
             }
         }
@@ -431,6 +431,13 @@ fn enum_set_type_impl(info: EnumSetInfo) -> SynTokenStream {
         quote!((*self as u32) == (*other as u32))
     };
 
+    // used in the enum_set! macro `const fn`s.
+    let self_as_repr_mask = if is_uninhabited {
+        quote! { 0 } // impossible anyway
+    } else {
+        quote! { 1 << self as #repr }
+    };
+
     quote! {
         unsafe impl #enumset::__internal::EnumSetTypePrivate for #name {
             type Repr = #repr;
@@ -454,6 +461,28 @@ fn enum_set_type_impl(info: EnumSetInfo) -> SynTokenStream {
         }
         impl #core::marker::Copy for #name { }
 
+        impl #name {
+            /// Creates a new enumset with only this variant.
+            #[deprecated(note = "This method is an internal implementation detail generated by \
+                                 the `enumset` crate's procedural macro. It should not be used \
+                                 directly. Use `EnumSet::only` instead.")]
+            #[doc(hidden)]
+            pub const fn __impl_enumset_internal__const_only(self) -> EnumSet<#name> {
+                EnumSet { __priv_repr: #self_as_repr_mask }
+            }
+
+            /// Creates a new enumset with this variant added.
+            #[deprecated(note = "This method is an internal implementation detail generated by \
+                                 the `enumset` crate's procedural macro. It should not be used \
+                                 directly. Use the `|` operator instead.")]
+            #[doc(hidden)]
+            pub const fn __impl_enumset_internal__const_merge(
+                self, chain: EnumSet<#name>,
+            ) -> EnumSet<#name> {
+                EnumSet { __priv_repr: chain.__priv_repr | #self_as_repr_mask }
+            }
+        }
+
         #ops
     }
 }