Auto merge of #1531 - gnzlbg:fixs, r=gnzlbg

bors · bors · commit 44a063abff37 · 2019-09-25T22:12:22.000Z
Fix max_align_t
diff --git a/src/unix/bsd/apple/b32/align.rs b/src/unix/bsd/apple/b32/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f64; 2]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 2]
+    }
+}
diff --git a/src/unix/bsd/apple/b64/align.rs b/src/unix/bsd/apple/b64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f64; 2]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 2]
+    }
+}
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs b/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f64; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
+}
diff --git a/src/unix/linux_like/android/b32/x86/align.rs b/src/unix/linux_like/android/b32/x86/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(8))]
-pub struct max_align_t([f64; 2]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(8))]
+    pub struct max_align_t {
+        priv_: [f64; 2]
+    }
+}
diff --git a/src/unix/linux_like/android/b64/aarch64/align.rs b/src/unix/linux_like/android/b64/aarch64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f32; 8]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f32; 8]
+    }
+}
diff --git a/src/unix/linux_like/android/b64/x86_64/align.rs b/src/unix/linux_like/android/b64/x86_64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f64; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
+}
diff --git a/src/unix/linux_like/emscripten/align.rs b/src/unix/linux_like/emscripten/align.rs
@@ -1,10 +1,7 @@
 macro_rules! expand_align {
     () => {
-        #[derive(Copy, Clone, Debug, PartialEq)]
-        #[repr(C, align(8))]
-        pub struct max_align_t([f64; 2]);
-
         s! {
+            #[allow(missing_debug_implementations)]
             #[repr(align(4))]
             pub struct pthread_mutex_t {
                 size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
@@ -39,6 +36,13 @@ macro_rules! expand_align {
             pub struct pthread_cond_t {
                 size: [u8; ::__SIZEOF_PTHREAD_COND_T],
             }
+
+            #[allow(missing_debug_implementations)]
+            #[repr(align(8))]
+            pub struct max_align_t {
+                priv_: [f64; 2]
+            }
+
         }
 
         cfg_if! {
diff --git a/src/unix/linux_like/linux/gnu/b32/arm/align.rs b/src/unix/linux_like/linux/gnu/b32/arm/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(8))]
-pub struct max_align_t([i64; 2]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(8))]
+    pub struct max_align_t {
+        priv_: [i64; 2]
+    }
+}
diff --git a/src/unix/linux_like/linux/gnu/b32/mips/align.rs b/src/unix/linux_like/linux/gnu/b32/mips/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(8))]
-pub struct max_align_t([f32; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(8))]
+    pub struct max_align_t {
+        priv_: [f32; 4]
+    }
+}
diff --git a/src/unix/linux_like/linux/gnu/b32/x86/align.rs b/src/unix/linux_like/linux/gnu/b32/x86/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f64; 6]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 6]
+    }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f32; 8]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f32; 8]
+    }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/mips64/align.rs b/src/unix/linux_like/linux/gnu/b64/mips64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f64; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([i64; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [i64; 4]
+    }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([i64; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [i64; 4]
+    }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f64; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
+}
diff --git a/src/unix/linux_like/linux/musl/b32/arm/align.rs b/src/unix/linux_like/linux/musl/b32/arm/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(8))]
-pub struct max_align_t(i64, i64);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(8))]
+    pub struct max_align_t {
+        priv_: (i64, i64)
+    }
+}
diff --git a/src/unix/linux_like/linux/musl/b32/mips/align.rs b/src/unix/linux_like/linux/musl/b32/mips/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(8))]
-pub struct max_align_t([f32; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(8))]
+    pub struct max_align_t {
+        priv_: [f32; 4]
+    }
+}
diff --git a/src/unix/linux_like/linux/musl/b32/x86/align.rs b/src/unix/linux_like/linux/musl/b32/x86/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(8))]
-pub struct max_align_t([f64; 3]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(8))]
+    pub struct max_align_t {
+        priv_: [f64; 3]
+    }
+}
diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/align.rs b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f32; 8]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f32; 8]
+    }
+}
diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/align.rs b/src/unix/linux_like/linux/musl/b64/x86_64/align.rs
@@ -1,3 +1,7 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C, align(16))]
-pub struct max_align_t([f64; 4]);
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
+}
diff --git a/src/windows/gnu/align.rs b/src/windows/gnu/align.rs
@@ -1,9 +1,19 @@
 cfg_if! {
     if #[cfg(target_pointer_width = "64")] {
-        #[derive(Copy, Clone, Debug, PartialEq)]
-        #[repr(C, align(16))] pub struct max_align_t([f64; 4]);
+        s_no_extra_traits! {
+            #[allow(missing_debug_implementations)]
+            #[repr(align(16))]
+            pub struct max_align_t {
+                priv_: [f64; 4]
+            }
+        }
     } else if #[cfg(target_pointer_width = "32")] {
-        #[derive(Copy, Clone, Debug, PartialEq)]
-        #[repr(C, align(16))] pub struct max_align_t([i64; 6]);
+        s_no_extra_traits! {
+            #[allow(missing_debug_implementations)]
+            #[repr(align(16))]
+            pub struct max_align_t {
+                priv_: [i64; 6]
+            }
+        }
     }
 }
