libc: remove uses of enum as per #4419

Author: mbyx

src/macros.rs

@@ -223,10 +223,24 @@ macro_rules! e {
 ///
 /// See <https://github.com/rust-lang/libc/issues/4419> for more.
 macro_rules! c_enum {
-    (
+    ($(
+        $(#[repr($repr:ty)])?
+        pub enum $ty_name:ident {
+            $($variant:ident $(= $value:expr)?,)+
+        }
+    )+) => {
+        $(c_enum!(@expand;
+            $(#[repr($repr)])?
+            pub enum $ty_name {
+                $($variant $(= $value)?,)+
+            }
+        );)+
+    };
+
+    (@expand;
         $(#[repr($repr:ty)])?
-        enum $ty_name:ident {
-            $($variant:ident $(= $value:literal)?,)+
+        pub enum $ty_name:ident {
+            $($variant:ident $(= $value:expr)?,)+
         }
     ) => {
         pub type $ty_name = c_enum!(@ty $($repr)?);
@@ -237,7 +251,7 @@ macro_rules! c_enum {
     (@one; $_ty_name:ident; $_idx:expr;) => {};
     (
         @one; $ty_name:ident; $default_val:expr;
-        $variant:ident $(= $value:literal)?,
+        $variant:ident $(= $value:expr)?,
         $($tail:tt)*
     ) => {
         pub const $variant: $ty_name = {
@@ -379,7 +393,7 @@ mod tests {
     fn c_enumbasic() {
         // By default, variants get sequential values.
         c_enum! {
-            enum e {
+            pub enum e {
                 VAR0,
                 VAR1,
                 VAR2,
@@ -396,7 +410,7 @@ mod tests {
         // By default, variants get sequential values.
         c_enum! {
             #[repr(u16)]
-            enum e {
+            pub enum e {
                 VAR0,
             }
         }
@@ -408,7 +422,7 @@ mod tests {
     fn c_enumset_value() {
         // Setting an explicit value resets the count.
         c_enum! {
-            enum e {
+            pub enum e {
                 VAR2 = 2,
                 VAR3,
                 VAR4,
@@ -425,7 +439,7 @@ mod tests {
         // C enums always take one more than the previous value, unless set to a specific
         // value. Duplicates are allowed.
         c_enum! {
-            enum e {
+            pub enum e {
                 VAR0,
                 VAR2_0 = 2,
                 VAR3_0,

src/unix/aix/mod.rs

@@ -58,7 +58,7 @@ pub type pthread_barrierattr_t = *mut c_void;
 pub type posix_spawn_file_actions_t = *mut c_char;
 pub type iconv_t = *mut c_void;
 
-e! {
+c_enum! {
     #[repr(u32)]
     pub enum uio_rw {
         UIO_READ = 0,
@@ -67,6 +67,7 @@ e! {
         UIO_WRITE_NO_MOVE,
         UIO_PWRITE,
     }
+
     #[repr(u32)]
     pub enum ACTION {
         FIND = 0,

src/unix/bsd/apple/mod.rs

@@ -184,71 +184,52 @@ impl Clone for timezone {
     }
 }
 
-#[cfg_attr(feature = "extra_traits", derive(Debug))]
-#[repr(u32)]
-pub enum qos_class_t {
-    QOS_CLASS_USER_INTERACTIVE = 0x21,
-    QOS_CLASS_USER_INITIATED = 0x19,
-    QOS_CLASS_DEFAULT = 0x15,
-    QOS_CLASS_UTILITY = 0x11,
-    QOS_CLASS_BACKGROUND = 0x09,
-    QOS_CLASS_UNSPECIFIED = 0x00,
-}
-impl Copy for qos_class_t {}
-impl Clone for qos_class_t {
-    fn clone(&self) -> qos_class_t {
-        *self
-    }
-}
-
-#[cfg_attr(feature = "extra_traits", derive(Debug))]
-#[repr(u32)]
-pub enum sysdir_search_path_directory_t {
-    SYSDIR_DIRECTORY_APPLICATION = 1,
-    SYSDIR_DIRECTORY_DEMO_APPLICATION = 2,
-    SYSDIR_DIRECTORY_DEVELOPER_APPLICATION = 3,
-    SYSDIR_DIRECTORY_ADMIN_APPLICATION = 4,
-    SYSDIR_DIRECTORY_LIBRARY = 5,
-    SYSDIR_DIRECTORY_DEVELOPER = 6,
-    SYSDIR_DIRECTORY_USER = 7,
-    SYSDIR_DIRECTORY_DOCUMENTATION = 8,
-    SYSDIR_DIRECTORY_DOCUMENT = 9,
-    SYSDIR_DIRECTORY_CORESERVICE = 10,
-    SYSDIR_DIRECTORY_AUTOSAVED_INFORMATION = 11,
-    SYSDIR_DIRECTORY_DESKTOP = 12,
-    SYSDIR_DIRECTORY_CACHES = 13,
-    SYSDIR_DIRECTORY_APPLICATION_SUPPORT = 14,
-    SYSDIR_DIRECTORY_DOWNLOADS = 15,
-    SYSDIR_DIRECTORY_INPUT_METHODS = 16,
-    SYSDIR_DIRECTORY_MOVIES = 17,
-    SYSDIR_DIRECTORY_MUSIC = 18,
-    SYSDIR_DIRECTORY_PICTURES = 19,
-    SYSDIR_DIRECTORY_PRINTER_DESCRIPTION = 20,
-    SYSDIR_DIRECTORY_SHARED_PUBLIC = 21,
-    SYSDIR_DIRECTORY_PREFERENCE_PANES = 22,
-    SYSDIR_DIRECTORY_ALL_APPLICATIONS = 100,
-    SYSDIR_DIRECTORY_ALL_LIBRARIES = 101,
-}
-impl Copy for sysdir_search_path_directory_t {}
-impl Clone for sysdir_search_path_directory_t {
-    fn clone(&self) -> sysdir_search_path_directory_t {
-        *self
-    }
-}
-
-#[cfg_attr(feature = "extra_traits", derive(Debug))]
-#[repr(u32)]
-pub enum sysdir_search_path_domain_mask_t {
-    SYSDIR_DOMAIN_MASK_USER = (1 << 0),
-    SYSDIR_DOMAIN_MASK_LOCAL = (1 << 1),
-    SYSDIR_DOMAIN_MASK_NETWORK = (1 << 2),
-    SYSDIR_DOMAIN_MASK_SYSTEM = (1 << 3),
-    SYSDIR_DOMAIN_MASK_ALL = 0x0ffff,
-}
-impl Copy for sysdir_search_path_domain_mask_t {}
-impl Clone for sysdir_search_path_domain_mask_t {
-    fn clone(&self) -> sysdir_search_path_domain_mask_t {
-        *self
+c_enum! {
+    #[repr(u32)]
+    pub enum qos_class_t {
+        QOS_CLASS_USER_INTERACTIVE = 0x21,
+        QOS_CLASS_USER_INITIATED = 0x19,
+        QOS_CLASS_DEFAULT = 0x15,
+        QOS_CLASS_UTILITY = 0x11,
+        QOS_CLASS_BACKGROUND = 0x09,
+        QOS_CLASS_UNSPECIFIED = 0x00,
+    }
+
+    #[repr(u32)]
+    pub enum sysdir_search_path_directory_t {
+        SYSDIR_DIRECTORY_APPLICATION = 1,
+        SYSDIR_DIRECTORY_DEMO_APPLICATION = 2,
+        SYSDIR_DIRECTORY_DEVELOPER_APPLICATION = 3,
+        SYSDIR_DIRECTORY_ADMIN_APPLICATION = 4,
+        SYSDIR_DIRECTORY_LIBRARY = 5,
+        SYSDIR_DIRECTORY_DEVELOPER = 6,
+        SYSDIR_DIRECTORY_USER = 7,
+        SYSDIR_DIRECTORY_DOCUMENTATION = 8,
+        SYSDIR_DIRECTORY_DOCUMENT = 9,
+        SYSDIR_DIRECTORY_CORESERVICE = 10,
+        SYSDIR_DIRECTORY_AUTOSAVED_INFORMATION = 11,
+        SYSDIR_DIRECTORY_DESKTOP = 12,
+        SYSDIR_DIRECTORY_CACHES = 13,
+        SYSDIR_DIRECTORY_APPLICATION_SUPPORT = 14,
+        SYSDIR_DIRECTORY_DOWNLOADS = 15,
+        SYSDIR_DIRECTORY_INPUT_METHODS = 16,
+        SYSDIR_DIRECTORY_MOVIES = 17,
+        SYSDIR_DIRECTORY_MUSIC = 18,
+        SYSDIR_DIRECTORY_PICTURES = 19,
+        SYSDIR_DIRECTORY_PRINTER_DESCRIPTION = 20,
+        SYSDIR_DIRECTORY_SHARED_PUBLIC = 21,
+        SYSDIR_DIRECTORY_PREFERENCE_PANES = 22,
+        SYSDIR_DIRECTORY_ALL_APPLICATIONS = 100,
+        SYSDIR_DIRECTORY_ALL_LIBRARIES = 101,
+    }
+
+    #[repr(u32)]
+    pub enum sysdir_search_path_domain_mask_t {
+        SYSDIR_DOMAIN_MASK_USER = 1 << 0,
+        SYSDIR_DOMAIN_MASK_LOCAL = 1 << 1,
+        SYSDIR_DOMAIN_MASK_NETWORK = 1 << 2,
+        SYSDIR_DOMAIN_MASK_SYSTEM = 1 << 3,
+        SYSDIR_DOMAIN_MASK_ALL = 0x0ffff,
     }
 }
 

src/unix/bsd/freebsdlike/dragonfly/mod.rs

@@ -54,7 +54,7 @@ impl Clone for sem {
     }
 }
 
-e! {
+c_enum! {
     #[repr(u32)]
     pub enum lwpstat {
         LSRUN = 1,