---

yaml
---
r: 47846
b: refs/heads/incoming
c: f823d83
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: a4403e5cb8ddc9472a1ec66b02e3727d9f1f052a
+refs/heads/incoming: f823d83718cf84cd9459b68726debd5463e31d97
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/_match.rs

@@ -1368,8 +1368,8 @@ pub fn compile_submatch(bcx: block,
     let mut test_val = val;
     if opts.len() > 0u {
         match opts[0] {
-            var(_, vdef) => {
-                let variants = ty::enum_variants(tcx, vdef.enm);
+            var(_, (enm, _)) => {
+                let variants = ty::enum_variants(tcx, enm);
                 if variants.len() == 1 {
                     kind = single;
                 } else {