smallest change

Author: tgross35

src/macros.rs

@@ -218,20 +218,28 @@ macro_rules! e {
 /// purpose is to calculate the correct enum values.
 ///
 /// See <https://github.com/rust-lang/libc/issues/4419> for more.
-// FIXME(ctest): ctest doesn't like `?` kleenes, `literal` fragments, or `$crate`. See inline
-// comments for what eventually should be fixed.
 macro_rules! c_enum {
+    (
+        $(#[repr($repr:ty)])?
+        $ty_name:ident {
+            $($variant:ident $(= $value:expr)?,)+
+        }
+    ) => {
+        pub type $ty_name = c_enum!(@ty $($repr)?);
+        c_enum!(@one; $ty_name; 0; $($variant $(= $value)?,)+);
+    };
+
     // Matcher for a single variant
     (@one; $_ty_name:ident; $_idx:expr;) => {};
     (
         @one; $ty_name:ident; $default_val:expr;
-        $variant:ident $(= $value:tt /* literal */)* /* ? */,
+        $variant:ident $(= $value:expr)?,
         $($tail:tt)*
     ) => {
         pub const $variant: $ty_name = {
             #[allow(unused_variables)]
             let r = $default_val;
-            $(let r = $value;)*
+            $(let r = $value;)?
             r
         };
 
@@ -241,17 +249,8 @@ macro_rules! c_enum {
     };
 
     // Use a specific type if provided, otherwise default to `c_uint`
-    (@_ty $repr:ty) => { $repr };
-    (@_ty) => { /* $crate */ crate::c_uint };
-    (
-        $(#[repr($repr:ty)])* /* ? */
-        $ty_name:ident {
-            $($variant:ident $(= $value:tt /* literal */)* /* ? */,)+
-        }
-    ) => {
-        pub type $ty_name = c_enum!(@_ty $($repr)*);
-        c_enum!(@one; $ty_name; 0; $($variant $(= $value)*,)+);
-    };
+    (@ty $repr:ty) => { $repr };
+    (@ty) => { $crate::c_uint };
 }
 
 // This is a pretty horrible hack to allow us to conditionally mark some functions as 'const',