bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #32253 - durka:derive-31886, r=alexcrichton

Browse source 
derive: assume enum repr defaults to isize

derive: assume enum repr defaults to isize

Fixes #31886.

Spawned from #32139.

r? @alexcrichton
This commit is contained in:
bors 2016-03-21 21:07:28 -07:00
commit 6cc502c986
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax_ext/deriving/generic/mod.rs
View file

@ -758,7 +758,7 @@ impl<'a> TraitDef<'a> {
fn find_repr_type_name(diagnostic: &Handler, fn find_repr_type_name(diagnostic: &Handler,
type_attrs: &[ast::Attribute]) -> &'static str { type_attrs: &[ast::Attribute]) -> &'static str {
let mut repr_type_name = "i32"; let mut repr_type_name = "isize";
for a in type_attrs { for a in type_attrs {
for r in &attr::find_repr_attrs(diagnostic, a) { for r in &attr::find_repr_attrs(diagnostic, a) {
repr_type_name = match *r { repr_type_name = match *r {

20
src/test/compile-fail/enum-discrim-autosizing.rs Normal file
View file

@ -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
}