Skip to content

Commit

Permalink
Allow repr attribute on single variant enum.
Browse files Browse the repository at this point in the history
  • Loading branch information
luqmana committed May 13, 2016
1 parent a581c82 commit f3e1d57
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
4 changes: 1 addition & 3 deletions src/librustc_trans/adt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,8 @@ fn represent_type_uncached<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
cx.tcx().item_path_str(def.did));
}

if cases.len() == 1 {
if cases.len() == 1 && hint == attr::ReprAny {
// Equivalent to a struct/tuple/newtype.
// (Typechecking will reject discriminant-sizing attrs.)
assert_eq!(hint, attr::ReprAny);
let mut ftys = cases[0].tys.clone();
if dtor { ftys.push(cx.tcx().dtor_type()); }
return Univariant(mk_struct(cx, &ftys[..], false, t),
Expand Down
18 changes: 18 additions & 0 deletions src/test/run-pass/issue-33202.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// 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.

#[repr(C)]
pub enum CPOption<T> {
PSome(T),
}

fn main() {
println!("sizeof CPOption<i32> {}", std::mem::size_of::<CPOption<i32>>());
}

0 comments on commit f3e1d57

Please sign in to comment.