cc <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id=

pub(restricted) is now stable. But I think it is still blocked by <code class="notrans

pub(restricted) bitflags about bitflags HOT 2 CLOSED

bitflags commented on May 25, 2024

pub(restricted) bitflags

from bitflags.

Comments (2)

kennytm commented on May 25, 2024

pub(restricted) is now stable. But I think it is still blocked by :vis matcher (rust-lang/rust#41022) to allow a proper fix.

Currently the straightforward fix using :vis causes an error in example_generated.rs

error: local ambiguity: multiple parsing options: built-in NTs vis ('vis') or 1 other option.
  --> src/example_generated.rs:5:5
   |
4  | / bitflags! {
5  | |     /// This is the same `Flags` struct defined in the [crate level example](../index.html#example).
   | |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6  | |     /// Note that this struct is just for documentation purposes only, it must not be used outside
7  | |     /// this crate.
...  |
15 | |     }
16 | | }
   | |_- in this macro invocation

error: Could not compile `bitflags`.

(diff)

diff --git a/src/lib.rs b/src/lib.rs
index 1694837..356fba1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![feature(macro_vis_matcher)]
+
 //! A typesafe bitmask flag generator useful for sets of C-style bitmask flags.
 //! It can be used for creating typesafe wrappers around C APIs.
 //!
@@ -305,16 +307,16 @@ pub extern crate core as _core;
 /// ```
 #[macro_export]
 macro_rules! bitflags {
-    ($(#[$attr:meta])* pub struct $BitFlags:ident: $T:ty {
+    ($(#[$attr:meta])* $vis:vis struct $BitFlags:ident: $T:ty {
         $($(#[$Flag_attr:meta])* const $Flag:ident = $value:expr;)+
     }) => {
         #[derive(Copy, PartialEq, Eq, Clone, PartialOrd, Ord, Hash)]
         $(#[$attr])*
-        pub struct $BitFlags {
+        $vis struct $BitFlags {
             bits: $T,
         }
 
-        $($(#[$Flag_attr])* pub const $Flag: $BitFlags = $BitFlags { bits: $value };)+
+        $($(#[$Flag_attr])* $vis const $Flag: $BitFlags = $BitFlags { bits: $value };)+
 
         __impl_bitflags! {
             struct $BitFlags: $T {
@@ -322,24 +324,6 @@ macro_rules! bitflags {
             }
         }
     };
-    ($(#[$attr:meta])* struct $BitFlags:ident: $T:ty {
-        $($(#[$Flag_attr:meta])* const $Flag:ident = $value:expr;)+
-    }) => {
-        #[derive(Copy, PartialEq, Eq, Clone, PartialOrd, Ord, Hash)]
-        $(#[$attr])*
-        struct $BitFlags {
-            bits: $T,
-        }
-
-        $($(#[$Flag_attr])* const $Flag: $BitFlags = $BitFlags { bits: $value };)+
-
-        __impl_bitflags! {
-            struct $BitFlags: $T {
-                $($(#[$Flag_attr])* const $Flag = $value;)+
-            }
-        }
-
-    };
 }