---

yaml
---
r: 10918
b: refs/heads/master
c: 25d6017
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b9bb58f104400294d00cb821dfe15c19ed1b641d
+refs/heads/master: 25d60172d6a66b2a620a228ce6642640e9faa517
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/comp/middle/kind.rs

@@ -215,9 +215,24 @@ fn maybe_copy(cx: ctx, ex: @expr) {
     check_copy_ex(cx, ex, true);
 }
 
+fn is_nullary_variant(cx: ctx, ex: @expr) -> bool {
+    alt ex.node {
+      expr_path(_) {
+        alt cx.tcx.def_map.get(ex.id) {
+          def_variant(edid, vdid) {
+            vec::len(ty::enum_variant_with_id(cx.tcx, edid, vdid).args) == 0u
+          }
+          _ { false }
+        }
+      }
+      _ { false }
+    }
+}
+
 fn check_copy_ex(cx: ctx, ex: @expr, _warn: bool) {
     if ty::expr_is_lval(cx.method_map, ex) &&
-       !cx.last_uses.contains_key(ex.id) {
+       !cx.last_uses.contains_key(ex.id) &&
+       !is_nullary_variant(cx, ex) {
         let ty = ty::expr_ty(cx.tcx, ex);
         check_copy(cx, ty, ex.span);
         // FIXME turn this on again once vector types are no longer unique.