---

yaml
---
r: 36714
b: refs/heads/try2
c: 1b9f740
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4559895b12c5ce40739362d7cd0993bbb61afa52
+refs/heads/try2: 1b9f740f2fe7d67d70ae5b49b741712706cccead
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/librustc/middle/mode.rs

@@ -32,17 +32,27 @@ struct VisitContext {
 
 fn compute_modes_for_fn_args(callee_id: node_id,
                              args: &[@expr],
+                             last_arg_is_block: bool,
                              &&cx: VisitContext,
                              v: vt<VisitContext>) {
     let arg_tys = ty::ty_fn_args(ty::node_id_to_type(cx.tcx, callee_id));
+    let mut i = 0;
     for vec::each2(args, arg_tys) |arg, arg_ty| {
-        match ty::resolved_mode(cx.tcx, arg_ty.mode) {
-            by_ref => {
-                let arg_cx = VisitContext { mode: ReadValue, ..cx };
-                compute_modes_for_expr(*arg, arg_cx, v);
+        if last_arg_is_block && i == args.len() - 1 {
+            let block_cx = VisitContext { mode: MoveValue, ..cx };
+            compute_modes_for_expr(*arg, block_cx, v);
+        } else {
+            match ty::resolved_mode(cx.tcx, arg_ty.mode) {
+                by_ref => {
+                    let arg_cx = VisitContext { mode: ReadValue, ..cx };
+                    compute_modes_for_expr(*arg, arg_cx, v);
+                }
+                by_val | by_move | by_copy => {
+                    compute_modes_for_expr(*arg, cx, v);
+                }
             }
-            by_val | by_move | by_copy => compute_modes_for_expr(*arg, cx, v)
         }
+        i += 1;
     }
 }
 
@@ -80,10 +90,10 @@ fn compute_modes_for_expr(expr: @expr,
     };
 
     match expr.node {
-        expr_call(callee, args, _) => {
+        expr_call(callee, args, is_block) => {
             let callee_cx = VisitContext { mode: ReadValue, ..cx };
             compute_modes_for_expr(callee, callee_cx, v);
-            compute_modes_for_fn_args(callee.id, args, cx, v);
+            compute_modes_for_fn_args(callee.id, args, is_block, cx, v);
         }
         expr_path(*) => {
             record_mode_for_expr(expr, cx);
@@ -92,7 +102,7 @@ fn compute_modes_for_expr(expr: @expr,
             let callee_cx = VisitContext { mode: CopyValue, ..cx };
             compute_modes_for_expr(expr, callee_cx, v);
         }
-        expr_method_call(callee, _, _, args, _) => {
+        expr_method_call(callee, _, _, args, is_block) => {
             // The LHS of the dot may or may not result in a move, depending
             // on the method map entry.
             let callee_mode;
@@ -111,7 +121,7 @@ fn compute_modes_for_expr(expr: @expr,
             let callee_cx = VisitContext { mode: callee_mode, ..cx };
             compute_modes_for_expr(callee, callee_cx, v);
 
-            compute_modes_for_fn_args(expr.callee_id, args, cx, v);
+            compute_modes_for_fn_args(expr.callee_id, args, is_block, cx, v);
         }
         expr_binary(_, lhs, rhs) | expr_assign_op(_, lhs, rhs) => {
             // The signatures of these take their arguments by-ref, so they

branches/try2/src/test/compile-fail/moves-based-on-type-block-bad.rs

@@ -0,0 +1,27 @@
+struct S {
+    x: ~E
+}
+
+enum E {
+    Foo(~S),
+    Bar(~int),
+    Baz
+}
+
+fn f(s: &S, g: &fn(&S)) {
+    g(s)
+}
+
+fn main() {
+    let s = S { x: ~Bar(~42) };
+    loop {
+        do f(&s) |hellothere| {
+            match hellothere.x {    //~ ERROR moving out of immutable field
+                ~Foo(_) => {}
+                ~Bar(x) => io::println(x.to_str()),
+                ~Baz => {}
+            }
+        }
+    }
+}
+