From: Alissa Rao <lymia@lymiahugs.com>
Date: Mon, 8 Feb 2021 05:16:08 +0000 (-0800)
Subject: Fully qualify all references to `EnumSet` in `enumset_derive`. Fixes #20.
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=4aed48b27f0f49eb19a8f0c69437cfb4fba6fed3;p=enumset.git

Fully qualify all references to `EnumSet` in `enumset_derive`. Fixes #20.
---

diff --git a/enumset/tests/compile-pass/no_imports.rs b/enumset/tests/compile-pass/no_imports.rs
new file mode 100644
index 0000000..ce5bbd1
--- /dev/null
+++ b/enumset/tests/compile-pass/no_imports.rs
@@ -0,0 +1,50 @@
+#![no_std]
+#![allow(dead_code)]
+
+extern crate std as __renamed_std; // so we don't have compile issues, but ::std still errors.
+
+use enumset::EnumSetType;
+
+#[derive(EnumSetType)]
+pub enum EmptyEnum { }
+
+#[derive(EnumSetType)]
+pub enum Enum1 {
+    A,
+}
+
+#[derive(EnumSetType)]
+pub enum SmallEnum {
+    A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,
+}
+#[derive(EnumSetType)]
+pub enum Enum128 {
+    A, B, C, D, E, F, G, H, _8, _9, _10, _11, _12, _13, _14, _15,
+    _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31,
+    _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47,
+    _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63,
+    _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75, _76, _77, _78, _79,
+    _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, _92, _93, _94, _95,
+    _96, _97, _98, _99, _100, _101, _102, _103, _104, _105, _106, _107, _108, _109,
+    _110, _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, _121, _122,
+    _123, _124,  _125, _126, _127,
+}
+#[derive(EnumSetType)]
+pub enum SparseEnum {
+    A = 0xA, B = 20, C = 30, D = 40, E = 50, F = 60, G = 70, H = 80,
+}
+
+#[repr(u32)]
+#[derive(EnumSetType)]
+pub enum ReprEnum {
+    A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,
+}
+#[repr(C)]
+#[derive(EnumSetType)]
+pub enum ReprEnum4 {
+    A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,
+}
+
+pub fn main() {
+
+}
diff --git a/enumset_derive/src/lib.rs b/enumset_derive/src/lib.rs
index 597b4cb..a25e94e 100644
--- a/enumset_derive/src/lib.rs
+++ b/enumset_derive/src/lib.rs
@@ -467,8 +467,8 @@ fn enum_set_type_impl(info: EnumSetInfo) -> SynTokenStream {
                                  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 }
+            pub const fn __impl_enumset_internal__const_only(self) -> #enumset::EnumSet<#name> {
+                #enumset::EnumSet { __priv_repr: #self_as_repr_mask }
             }
 
             /// Creates a new enumset with this variant added.
@@ -477,9 +477,9 @@ fn enum_set_type_impl(info: EnumSetInfo) -> SynTokenStream {
                                  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 }
+                self, chain: #enumset::EnumSet<#name>,
+            ) -> #enumset::EnumSet<#name> {
+                #enumset::EnumSet { __priv_repr: chain.__priv_repr | #self_as_repr_mask }
             }
         }