undo @ changes

Author: tgross35

src/macros.rs

@@ -218,7 +218,7 @@ 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, `$crate`, or `@`. See inline
+// FIXME(ctest): ctest doesn't like `?` kleenes, `literal` fragments, or `$crate`. See inline
 // comments for what eventually should be fixed.
 macro_rules! c_enum {
     (
@@ -227,13 +227,13 @@ macro_rules! c_enum {
             $($variant:ident $(= $value:tt /* literal */)* /* ? */,)+
         }
     ) => {
-        pub type $ty_name = c_enum!(__ty $($repr)*);
-        c_enum!(__one; $ty_name; 0; $($variant $(= $value)*,)+);
+        pub type $ty_name = c_enum!(@ty $($repr)*);
+        c_enum!(@one; $ty_name; 0; $($variant $(= $value)*,)+);
     };
     // Matcher for a single variant
-    (__one /* @one */; $_ty_name:ident; $_idx:expr;) => {};
+    (@one; $_ty_name:ident; $_idx:expr;) => {};
     (
-        __one /* @one */; $ty_name:ident; $default_val:expr;
+        @one; $ty_name:ident; $default_val:expr;
         $variant:ident $(= $value:tt /* literal */)* /* ? */,
         $($tail:tt)*
     ) => {
@@ -246,12 +246,12 @@ macro_rules! c_enum {
 
         // The next value is always one more than the previous value, unless
         // set explicitly.
-        c_enum!(__one; $ty_name; $variant + 1; $($tail)*);
+        c_enum!(@one; $ty_name; $variant + 1; $($tail)*);
     };
 
     // Use a specific type if provided, otherwise default to `c_uint`
-    (__ty /* @ty */ $repr:ty) => { $repr };
-    (__ty /* @ty */) => { /* $crate:: */ c_uint };
+    (@ty $repr:ty) => { $repr };
+    (@ty) => { /* $crate:: */ c_uint };
 }
 
 // This is a pretty horrible hack to allow us to conditionally mark some functions as 'const',