Implement PartialEq,Eq for all types

Author: Susurrus

Cargo.toml

@@ -27,6 +27,7 @@ default = ["use_std"]
 use_std = []
 align = []
 rustc-dep-of-std = ['align', 'rustc-std-workspace-core']
+extra_traits = ["align"]
 
 [workspace]
 members = ["libc-test"]

README.md

@@ -44,6 +44,15 @@ activate the *align* feature. This requires Rust 1.25 or newer:
 libc = { version = "0.2", features = ["align"] }
 ```
 
+All structs implemented by the libc crate have the `Copy` and `Clone` traits
+implemented for them. The additional traits of `PartialEq` and `Eq` can be
+enabled with the *extra_traits* feature (requires Rust 1.25 or newer):
+
+```toml
+[dependencies]
+libc = { version = "0.2", features = ["extra_traits"] }
+```
+
 ## What is libc?
 
 The primary purpose of this crate is to provide all of the definitions necessary

ci/run.sh

@@ -96,4 +96,8 @@ fi
 if [ "$(rustc --version | sed -E 's/^rustc 1\.([0-9]*)\..*/\1/')" -ge 25 ]; then
   cargo test $opt --features align --manifest-path libc-test/Cargo.toml --target "${TARGET}"
 fi
+# Test the `extra_traits` feature if this is building on Rust >= 1.25
+if [ "$(rustc --version | sed -E 's/^rustc 1\.([0-9]*)\..*/\1/')" -ge 25 ]; then
+  cargo test $opt --features extra_traits --manifest-path libc-test/Cargo.toml --target "${TARGET}"
+fi
 exec cargo test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}"

libc-test/Cargo.toml

@@ -15,6 +15,7 @@ ctest = "0.2.8"
 default = [ "use_std" ]
 use_std = [ "libc/use_std" ]
 align = [ "libc/align" ]
+extra_traits = [ "libc/extra_traits" ]
 
 [[test]]
 name = "main"

src/macros.rs

@@ -35,6 +35,21 @@ macro_rules! __cfg_if_apply {
 }
 
 macro_rules! s {
+    ($($(#[$attr:meta])* pub $t:ident $i:ident { $($field:tt)* })*) => ($(
+        __item! {
+            #[repr(C)]
+            $(#[$attr])*
+            #[cfg_attr(feature = "extra_traits", derive(Eq, PartialEq))]
+            pub $t $i { $($field)* }
+        }
+        impl ::dox::Copy for $i {}
+        impl ::dox::Clone for $i {
+            fn clone(&self) -> $i { *self }
+        }
+    )*)
+}
+
+macro_rules! s_no_extra_traits {
     ($($(#[$attr:meta])* pub $t:ident $i:ident { $($field:tt)* })*) => ($(
         __item! {
             #[repr(C)]

src/unix/bsd/apple/b32.rs

@@ -5,11 +5,6 @@ pub type c_ulong = u32;
 pub type boolean_t = ::c_int;
 
 s! {
-    pub struct pthread_attr_t {
-        __sig: c_long,
-        __opaque: [::c_char; 36]
-    }
-
     pub struct if_data {
         pub ifi_type: ::c_uchar,
         pub ifi_typelen: ::c_uchar,
@@ -50,6 +45,26 @@ s! {
     }
 }
 
+s_no_extra_traits!{
+    pub struct pthread_attr_t {
+        __sig: c_long,
+        __opaque: [::c_char; 36]
+    }
+}
+
+#[cfg(feature = "extra_traits")]
+impl PartialEq for pthread_attr_t {
+    fn eq(&self, other: &pthread_attr_t) -> bool {
+        self.__sig == other.__sig
+            && self.__opaque
+                .iter()
+                .zip(other.__opaque.iter())
+                .all(|(a,b)| a == b)
+    }
+}
+#[cfg(feature = "extra_traits")]
+impl Eq for pthread_attr_t {}
+
 pub const __PTHREAD_MUTEX_SIZE__: usize = 40;
 pub const __PTHREAD_COND_SIZE__: usize = 24;
 pub const __PTHREAD_CONDATTR_SIZE__: usize = 4;

src/unix/bsd/apple/b64.rs

@@ -5,11 +5,6 @@ pub type c_ulong = u64;
 pub type boolean_t = ::c_uint;
 
 s! {
-    pub struct pthread_attr_t {
-        __sig: c_long,
-        __opaque: [::c_char; 56]
-    }
-
     pub struct timeval32 {
         pub tv_sec: i32,
         pub tv_usec: i32,
@@ -55,6 +50,26 @@ s! {
     }
 }
 
+s_no_extra_traits!{
+    pub struct pthread_attr_t {
+        __sig: c_long,
+        __opaque: [::c_char; 56]
+    }
+}
+
+#[cfg(feature = "extra_traits")]
+impl PartialEq for pthread_attr_t {
+    fn eq(&self, other: &pthread_attr_t) -> bool {
+        self.__sig == other.__sig
+            && self.__opaque
+                .iter()
+                .zip(other.__opaque.iter())
+                .all(|(a,b)| a == b)
+    }
+}
+#[cfg(feature = "extra_traits")]
+impl Eq for pthread_attr_t {}
+
 pub const __PTHREAD_MUTEX_SIZE__: usize = 56;
 pub const __PTHREAD_COND_SIZE__: usize = 40;
 pub const __PTHREAD_CONDATTR_SIZE__: usize = 8;