From 98eb121b7a748fd2668bf03ace8307be2880955f Mon Sep 17 00:00:00 2001 From: Austin Hicks Date: Mon, 20 Mar 2017 14:07:46 -0400 Subject: [PATCH] We have to use u16 to test field reordering because u64's alignment changes based on 32-bit or 64-bit architecture. --- src/test/run-pass/type-sizes.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs index 9d1a3500a582..2f50e63153ea 100644 --- a/src/test/run-pass/type-sizes.rs +++ b/src/test/run-pass/type-sizes.rs @@ -33,13 +33,13 @@ enum e3 { struct ReorderedStruct { a: u8, - b: u64, + b: u16, c: u8 } enum ReorderedEnum { - A(u8, u64, u8), - B(u8, u64, u8), + A(u8, u16, u8), + B(u8, u16, u8), } pub fn main() { @@ -65,6 +65,6 @@ pub fn main() { assert_eq!(size_of::(), 8 as usize); assert_eq!(size_of::(), 8 as usize); assert_eq!(size_of::(), 4 as usize); - assert_eq!(size_of::(), 16); - assert_eq!(size_of::(), 16); + assert_eq!(size_of::(), 4); + assert_eq!(size_of::(), 6); }