use no-extra-traits

gnzlbg · gnzlbg · commit dbc89082d9d8 · 2019-09-25T20:11:51.000+02:00
diff --git a/src/unix/bsd/apple/b32/align.rs b/src/unix/bsd/apple/b32/align.rs
@@ -1,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,11 +1,6 @@
 macro_rules! expand_align {
     () => {
         s! {
-            #[repr(align(8))]
-            pub struct max_align_t {
-                priv_: f64; 2]
-            }
-
             #[repr(align(4))]
             pub struct pthread_mutex_t {
                 size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
@@ -40,6 +35,12 @@ macro_rules! expand_align {
             pub struct pthread_cond_t {
                 size: [u8; ::__SIZEOF_PTHREAD_COND_T],
             }
+
+            #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,4 +1,4 @@
-s! {
+s_no_extra_traits! {
     #[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,13 +1,13 @@
 cfg_if! {
     if #[cfg(target_pointer_width = "64")] {
-        s! {
+        s_no_extra_traits! {
             #[repr(align(16))]
             pub struct max_align_t {
                 priv_: [f64; 4]
             }
         }
     } else if #[cfg(target_pointer_width = "32")] {
-        s! {
+        s_no_extra_traits! {
             #[repr(align(16))]
             pub struct max_align_t {
                 priv_: [i64; 6]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-s! {`
	`1`	`+s_no_extra_traits! {`
`2`	`2`	`#[repr(align(16))]`
`3`	`3`	`pub struct max_align_t {`
`4`	`4`	`priv_: [f64; 2]`