From dbc89082d9d80176f25b8717156bf7c7a724a3d3 Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Wed, 25 Sep 2019 20:11:51 +0200 Subject: use no-extra-traits --- src/unix/bsd/apple/b32/align.rs | 2 +- src/unix/bsd/apple/b64/align.rs | 2 +- src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs | 2 +- src/unix/linux_like/android/b32/x86/align.rs | 2 +- src/unix/linux_like/android/b64/aarch64/align.rs | 2 +- src/unix/linux_like/android/b64/x86_64/align.rs | 2 +- src/unix/linux_like/emscripten/align.rs | 11 ++++++----- src/unix/linux_like/linux/gnu/b32/arm/align.rs | 2 +- src/unix/linux_like/linux/gnu/b32/mips/align.rs | 2 +- src/unix/linux_like/linux/gnu/b32/x86/align.rs | 2 +- src/unix/linux_like/linux/gnu/b64/aarch64/align.rs | 2 +- src/unix/linux_like/linux/gnu/b64/mips64/align.rs | 2 +- src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs | 2 +- src/unix/linux_like/linux/gnu/b64/sparc64/align.rs | 2 +- src/unix/linux_like/linux/gnu/b64/x86_64/align.rs | 2 +- src/unix/linux_like/linux/musl/b32/arm/align.rs | 2 +- src/unix/linux_like/linux/musl/b32/mips/align.rs | 2 +- src/unix/linux_like/linux/musl/b32/x86/align.rs | 2 +- src/unix/linux_like/linux/musl/b64/aarch64/align.rs | 2 +- src/unix/linux_like/linux/musl/b64/x86_64/align.rs | 2 +- src/windows/gnu/align.rs | 4 ++-- 21 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/unix/bsd/apple/b32/align.rs b/src/unix/bsd/apple/b32/align.rs index 3750130a1f..903806659d 100644 --- 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 index 3750130a1f..903806659d 100644 --- 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 index 340ad79821..6570c75354 100644 --- 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 index 50c7998373..3835f14fc9 100644 --- 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 index 265118d83c..0b39c4b29e 100644 --- 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 index 340ad79821..6570c75354 100644 --- 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 index c00a6fbd05..07fe9d7957 100644 --- 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 index 52fffb7bc7..95873dcf66 100644 --- 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 index 7bf5665c2f..69e17c529c 100644 --- 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 index a1afce4c96..a36312f355 100644 --- 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 index 265118d83c..0b39c4b29e 100644 --- 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 index 340ad79821..6570c75354 100644 --- 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 index 67e0f07817..bee1157061 100644 --- 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 index 67e0f07817..bee1157061 100644 --- 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 index 340ad79821..6570c75354 100644 --- 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 index cb1ab5d22a..45daecde4e 100644 --- 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 index 7bf5665c2f..69e17c529c 100644 --- 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 index 6caf90b391..c59299dbc3 100644 --- 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 index 265118d83c..0b39c4b29e 100644 --- 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 index 340ad79821..6570c75354 100644 --- 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 index d519b181be..3635f20f09 100644 --- 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] -- cgit v1.2.1