Skip to content

Commit d0a46d5

Browse files
committed
---
yaml --- r: 41565 b: refs/heads/master c: 8f8b417 h: refs/heads/master i: 41563: 79899be v: v3
1 parent 2e89beb commit d0a46d5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 7b245d46ed5fc93d3251e9e07f50e9b09b1f42c4
2+
refs/heads/master: 8f8b4178111edccd2772946c965272142cdaa374
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
55
refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/trans/type_of.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ fn fill_type_of_enum(cx: @crate_ctxt, did: ast::def_id, t: ty::t,
230230
debug!("type_of_enum %?: %?", t, ty::get(t));
231231

232232
let lltys = {
233-
let degen = (*ty::enum_variants(cx.tcx, did)).len() == 1u;
233+
let degen = ty::enum_is_univariant(cx.tcx, did);
234234
let size = shape::static_size_of_enum(cx, t);
235235
if !degen {
236236
~[T_enum_discrim(cx), T_array(T_i8(), size)]

0 commit comments

Comments
 (0)