---

yaml
---
r: 36172
b: refs/heads/try2
c: 768247f
h: refs/heads/master
v: v3

Author: catamorphism

[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: b269ac13cde5d663909894f5c656cb8be77249c2
+refs/heads/try2: 768247f393a18ec56d7a92cded2545e6f7d92649
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/test/compile-fail/issue-1896.rs

@@ -0,0 +1,8 @@
+type t<T> = { f: fn() -> T };
+
+fn f<T>(_x: t<T>) {}
+
+fn main() {
+    let x: t<()> = { f: { || () } };
+    f(x); //~ ERROR copying a noncopyable value
+}

branches/try2/src/test/run-pass/issue-1896-1.rs

@@ -0,0 +1,13 @@
+type boxedFn = { theFn: fn () -> uint };
+
+fn createClosure (closedUint: uint) -> boxedFn {
+    { theFn: fn@ () -> uint { closedUint } }
+}
+
+fn main () {
+    let aFn: boxedFn = createClosure(10);
+
+    let myInt: uint = aFn.theFn();
+
+    assert myInt == 10;
+}

branches/try2/src/test/run-pass/issue-1896-2.rs

@@ -0,0 +1,10 @@
+fn add(n: int) -> fn@(int) -> int {
+      fn@(m: int) -> int { m + n }
+}
+
+fn main()
+{
+      assert add(3)(4) == 7;
+        let add3 : fn(int)->int = add(3);
+          assert add3(4) == 7;
+}

branches/try2/src/test/run-pass/issue-1896-3.rs

@@ -0,0 +1,17 @@
+fn add(n: int) -> fn@(int) -> int {
+    fn@(m: int) -> int { m + n }
+}
+
+fn main()
+{
+    assert add(3)(4) == 7;
+
+    let add1 : fn@(int)->int = add(1);
+    assert add1(6) == 7;
+
+    let add2 : &(fn@(int)->int) = &add(2);
+    assert (*add2)(5) == 7;
+
+    let add3 : fn(int)->int = add(3);
+    assert add3(4) == 7;
+}