---

yaml
---
r: 271376
b: refs/heads/auto
c: 9d0748f
h: refs/heads/master

Author: durka

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: ee4b607dfbc5f857eb1c500f2f2ff84062feb926
+refs/heads/auto: 9d0748f7eb75c422b61446f846251177faffeb45
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/test/compile-fail/enum-discrim-autosizing.rs

@@ -0,0 +1,20 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// With no repr attribute the discriminant will default to isize.
+// On 32-bit architectures this is equivalent to i32 so the variants
+// collide. On other architectures we need compilation to fail anyway,
+// so force the repr.
+#[cfg_attr(not(target_pointer_width = "32"), repr(i32))]
+enum Eu64 {
+    Au64 = 0,
+    Bu64 = 0x8000_0000_0000_0000 //~ERROR already exists
+}
+

branches/auto/src/test/run-pass/enum-discrim-autosizing.rs

@@ -47,12 +47,6 @@ enum Ei64 {
     Bi64 = 0x8000_0000
 }
 
-#[derive(PartialEq)]
-enum Eu64 {
-    Au64 = 0,
-    Bu64 = 0x8000_0000_0000_0000
-}
-
 pub fn main() {
     assert_eq!(size_of::<Ei8>(), 1);
     assert_eq!(size_of::<Eu8>(), 1);
@@ -64,8 +58,4 @@ pub fn main() {
     assert_eq!(size_of::<Ei64>(), 8);
     #[cfg(target_pointer_width = "32")]
     assert_eq!(size_of::<Ei64>(), 4);
-    assert_eq!(size_of::<Eu64>(), 8);
-
-    // ensure no i32 collisions
-    assert!(Eu64::Au64 != Eu64::Bu64);
 }