Skip to content

Commit

Permalink
Make alignment-forcing case work the same on 64 and 32-bit platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
Aatch committed Dec 23, 2014
1 parent fe7adfe commit b473311
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/test/run-pass/type-sizes.rs
Expand Up @@ -26,7 +26,7 @@ enum e2 {
}

enum e3 {
a([u64, ..0], u32), b
a([u16, ..0], u8), b
}

pub fn main() {
Expand All @@ -51,5 +51,5 @@ pub fn main() {

assert_eq!(size_of::<e1>(), 8 as uint);
assert_eq!(size_of::<e2>(), 8 as uint);
assert_eq!(size_of::<e3>(), 16 as uint);
assert_eq!(size_of::<e3>(), 4 as uint);
}

13 comments on commit b473311

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at Aatch@b473311

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging Aatch/rust/enum-repr = b473311 into auto

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

status: {"merge_sha": "7f748d8483f92f9d750563059c3e4a694796c8b1"}

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aatch/rust/enum-repr = b473311 merged ok, testing candidate = 7f748d84

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@erickt
Copy link
Contributor

@erickt erickt commented on b473311 Dec 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors: retry

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at Aatch@b473311

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging Aatch/rust/enum-repr = b473311 into auto

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

status: {"merge_sha": "29ad8539b9c408eebbe7252f74c754f4e0a41d46"}

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aatch/rust/enum-repr = b473311 merged ok, testing candidate = 29ad853

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 29ad853

@bors
Copy link
Contributor

@bors bors commented on b473311 Dec 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 29ad853

Please sign in to comment.