---

yaml
---
r: 14421
b: refs/heads/try
c: 1e52662
h: refs/heads/master
i:
  14419: 7a26ea1
v: v3

Author: marijnh

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 8015e6d52b7eeea47f9e61c6ac42487935474ca4
+refs/heads/try: 1e5266260aad92973caeede3500f848c277f84e2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/middle/mutbl.rs

@@ -172,6 +172,16 @@ fn visit_expr(cx: @ctx, ex: @expr, &&e: (), v: visit::vt<()>) {
       expr_assign(dest, src) | expr_assign_op(_, dest, src) {
         check_lval(cx, dest, msg_assign);
       }
+      expr_fn(_, _, _, cap) {
+        for moved in cap.moves {
+            let def = cx.tcx.def_map.get(moved.id);
+            alt is_immutable_def(cx, def) {
+              some(name) { mk_err(cx, moved.span, msg_move_out, moved.name); }
+              _ { }
+            }
+            cx.mutbl_map.insert(ast_util::def_id_of_def(def).node, ());
+        }
+      }
       _ { }
     }
     visit::visit_expr(ex, e, v);

branches/try/src/comp/middle/trans/closure.rs

@@ -376,7 +376,9 @@ fn build_closure(bcx0: block,
             env_vals += [env_move(lv.val, ty, lv.kind)];
           }
           capture::cap_drop {
+            assert lv.kind == owned;
             bcx = drop_ty(bcx, lv.val, ty);
+            bcx = zero_alloca(bcx, lv.val, ty);
           }
         }
     }

branches/try/src/test/run-pass/unused-move-capture.rs

@@ -0,0 +1,5 @@
+fn main() {
+    let x = ~1;
+    let lam_move = fn@[move x]() { };
+    lam_move();
+}