---

yaml
---
r: 142942
b: refs/heads/try2
c: 782853c
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 81c576cd5bbae5207694121ca8c21098a847c153
+refs/heads/try2: 782853c65846be185c9b8bf930e1b47b78f6fdf6
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/compile-fail/borrowck-move-by-capture.rs

@@ -4,8 +4,10 @@ pub fn main() {
     let _f: @fn() -> int = || *foo + 5;
     //~^ ERROR cannot move `foo`
 
+    // FIXME(#2202) - Due to the way that borrowck treats closures,
+    // you get two error reports here.
     let bar = ~3;
     let _g = || { //~ ERROR capture of moved value
-        let _h: @fn() -> int = || *bar;
+        let _h: @fn() -> int = || *bar; //~ ERROR capture of moved value
     };
 }

branches/try2/src/test/run-pass/borrowck-move-by-capture-ok.rs

@@ -0,0 +1,5 @@
+pub fn main() {
+    let bar = ~3;
+    let h: @fn() -> int = || *bar;
+    assert_eq!(h(), 3);
+}