test: Remove fn@, fn~, and fn& from the test suite. rs=defun

Author: pcwalton

src/test/auxiliary/cci_nested_lib.rs

@@ -14,7 +14,7 @@ use core::dvec::DVec;
 
 pub struct Entry<A,B> {key: A, value: B}
 
-pub struct alist<A,B> { eq_fn: fn@(A,A) -> bool, data: DVec<Entry<A,B>> }
+pub struct alist<A,B> { eq_fn: @fn(A,A) -> bool, data: DVec<Entry<A,B>> }
 
 pub fn alist_add<A:Copy,B:Copy>(lst: alist<A,B>, k: A, v: B) {
     lst.data.push(Entry{key:k, value:v});

src/test/auxiliary/issue4516_ty_param_lib.rs

@@ -9,5 +9,6 @@
 // except according to those terms.
 
 pub fn to_closure<A:Durable + Copy>(x: A) -> @fn() -> A {
-    fn@() -> A { copy x }
+    let result: @fn() -> A = || copy x;
+    result
 }

src/test/bench/graph500-bfs.rs

@@ -267,7 +267,7 @@ fn pbfs(&&graph: arc::ARC<graph>, key: node_id) -> bfs_result {
         colors = do par::mapi(*color_vec) {
             let colors = arc::clone(&color);
             let graph = arc::clone(&graph);
-            fn~(+i: uint, +c: &color) -> color {
+            let result: ~fn(uint, &color) -> color = |i, c| {
                 let colors = arc::get(&colors);
                 let graph = arc::get(&graph);
                 match *c {
@@ -290,14 +290,15 @@ fn pbfs(&&graph: arc::ARC<graph>, key: node_id) -> bfs_result {
                   gray(parent) => { black(parent) }
                   black(parent) => { black(parent) }
                 }
-            }
+            };
+            result
         };
         assert(colors.len() == old_len);
     }
 
     // Convert the results.
     do par::map(colors) {
-        fn~(c: &color) -> i64 {
+        let result: ~fn(c: &color) -> i64 = |c| {
             match *c {
                 white => { -1i64 }
                 black(parent) => { parent }
@@ -387,14 +388,15 @@ fn validate(edges: ~[(node_id, node_id)],
 
     let status = do par::alli(tree) {
         let edges = copy edges;
-        fn~(+u: uint, v: &i64) -> bool {
+        let result: ~fn(uint, v: &i64) -> bool = |u, v| {
             let u = u as node_id;
             if *v == -1i64 || u == root {
                 true
             } else {
                 edges.contains(&(u, *v)) || edges.contains(&(*v, u))
             }
-        }
+        };
+        result
     };
 
     if !status { return status }

src/test/bench/task-perf-alloc-unwind.rs

@@ -46,7 +46,7 @@ type nillist = List<()>;
 struct State {
     box: @nillist,
     unique: ~nillist,
-    fn_box: fn@() -> @nillist,
+    fn_box: @fn() -> @nillist,
     tuple: (@nillist, ~nillist),
     vec: ~[@nillist],
     res: r
@@ -78,7 +78,7 @@ fn recurse_or_fail(depth: int, st: Option<State>) {
             State {
                 box: @Nil,
                 unique: ~Nil,
-                fn_box: fn@() -> @nillist { @Nil::<()> },
+                fn_box: || @Nil::<()>,
                 tuple: (@Nil, ~Nil),
                 vec: ~[@Nil],
                 res: r(@Nil)
@@ -90,7 +90,7 @@ fn recurse_or_fail(depth: int, st: Option<State>) {
             State {
                 box: @Cons((), st.box),
                 unique: ~Cons((), @*st.unique),
-                fn_box: fn@() -> @nillist { @Cons((), fn_box()) },
+                fn_box: || @Cons((), fn_box()),
                 tuple: (@Cons((), st.tuple.first()),
                         ~Cons((), @*st.tuple.second())),
                 vec: st.vec + ~[@Cons((), st.vec.last())],

src/test/bench/task-perf-linked-failure.rs

@@ -46,7 +46,7 @@ fn grandchild_group(num_tasks: uint) {
     // Master grandchild task exits early.
 }
 
-fn spawn_supervised_blocking(myname: &str, +f: fn~()) {
+fn spawn_supervised_blocking(myname: &str, +f: ~fn()) {
     let mut res = None;
     task::task().future_result(|+r| res = Some(r)).supervised().spawn(f);
     error!("%s group waiting", myname);

src/test/compile-fail/assign-to-method.rs

@@ -28,5 +28,5 @@ fn cat(in_x : uint, in_y : int) -> cat {
 
 fn main() {
   let nyan : cat = cat(52u, 99);
-  nyan.speak = fn@() { debug!("meow"); }; //~ ERROR attempted to take value of method
+  nyan.speak = || debug!("meow"); //~ ERROR attempted to take value of method
 }

src/test/compile-fail/borrowck-addr-of-upvar.rs

@@ -8,16 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn foo(x: @int) -> fn@() -> &static/int {
-    fn@() -> &static/int {&*x} //~ ERROR illegal borrow
+fn foo(x: @int) -> @fn() -> &static/int {
+    let result: @fn() -> &static/int = || &*x;  //~ ERROR illegal borrow
+    result
 }
 
-fn bar(x: @int) -> fn@() -> &int {
-    fn@() -> &int {&*x} //~ ERROR illegal borrow
+fn bar(x: @int) -> @fn() -> &int {
+    let result: @fn() -> &int = || &*x; //~ ERROR illegal borrow
+    result
 }
 
-fn zed(x: @int) -> fn@() -> int {
-    fn@() -> int {*&*x}
+fn zed(x: @int) -> @fn() -> int {
+    let result: @fn() -> int = || *&*x;
+    result
 }
 
 fn main() {

src/test/compile-fail/borrowck-call-sendfn.rs

@@ -10,7 +10,11 @@
 
 // xfail-test #2978
 
-fn call(x: @{f: fn~()}) {
+struct Foo {
+    f: ~fn()
+}
+
+fn call(x: @Foo) {
     x.f(); //~ ERROR foo
     //~^ NOTE bar
 }

src/test/compile-fail/borrowck-loan-blocks-move-cc.rs

@@ -22,7 +22,7 @@ fn box_imm() {
 
     let v = ~3;
     let _w = &v; //~ NOTE loan of immutable local variable granted here
-    task::spawn(fn~() {
+    task::spawn(|| {
         debug!("v=%d", *v);
         //~^ ERROR by-move capture of immutable local variable prohibited due to outstanding loan
     });

src/test/compile-fail/do2.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn f(f: fn@(int) -> bool) -> bool { f(10i) }
+fn f(f: @fn(int) -> bool) -> bool { f(10i) }
 
 fn main() {
     assert do f() |i| { i == 10i } == 10i;

src/test/compile-fail/fn-variance-2.rs

@@ -8,16 +8,17 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn reproduce<T:Copy>(t: T) -> fn@() -> T {
-    fn@() -> T { t }
+fn reproduce<T:Copy>(t: T) -> @fn() -> T {
+    let result: @fn() -> T = || t;
+    result
 }
 
 fn main() {
     // type of x is the variable X,
     // with the lower bound @mut int
     let x = @mut 3;
 
-    // type of r is fn@() -> X
+    // type of r is @fn() -> X
     let r = reproduce(x);
 
     // Requires that X be a subtype of

src/test/compile-fail/fn-variance-3.rs

@@ -8,12 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn mk_identity<T:Copy>() -> fn@(T) -> T {
-    fn@(t: T) -> T { t }
+fn mk_identity<T:Copy>() -> @fn(T) -> T {
+    let result: @fn(t: T) -> T = |t| t;
+    result
 }
 
 fn main() {
-    // type of r is fn@(X) -> X
+    // type of r is @fn(X) -> X
     // for some fresh X
     let r = mk_identity();
 

src/test/compile-fail/issue-1451.rs

@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // xfail-test
-struct T { f: fn@() };
-struct S { f: fn@() };
+struct T { f: @fn() };
+struct S { f: @fn() };
 
 fn fooS(t: S) {
 }
@@ -22,11 +22,11 @@ fn bar() {
 }
 
 fn main() {
-    let x: fn@() = bar;
+    let x: @fn() = bar;
     fooS(S {f: x});
     fooS(S {f: bar});
 
-    let x: fn@() = bar;
+    let x: @fn() = bar;
     fooT(T {f: x});
     fooT(T {f: bar});
 }

src/test/compile-fail/issue-1896-1.rs

@@ -8,10 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-struct boxedFn { theFn: fn~() -> uint }
+struct boxedFn { theFn: ~fn() -> uint }
 
 fn createClosure (closedUint: uint) -> boxedFn {
-    boxedFn {theFn: fn@ () -> uint { closedUint }} //~ ERROR mismatched types
+    let result: @fn() -> uint = || closedUint;
+    boxedFn { theFn: result } //~ ERROR mismatched types
 }
 
 fn main () {

src/test/compile-fail/issue-2074.rs

@@ -10,13 +10,13 @@
 
 // xfail-test
 fn main() {
-    let one = fn@() -> uint {
+    let one: @fn() -> uint = || {
         enum r { a };
-        return a as uint;
+        a as uint
     };
-    let two = fn@() -> uint {
+    let two = @fn() -> uint = || {
         enum r { a };
-        return a as uint;
+        a as uint
     };
     one(); two();
 }

src/test/compile-fail/kindck-nonsendable-1.rs

@@ -12,7 +12,7 @@ fn foo(_x: @uint) {}
 
 fn main() {
     let x = @3u;
-    let _ = fn~() { foo(x); }; //~ ERROR value has non-owned type `@uint`
-    let _ = fn~() { foo(x); }; //~ ERROR value has non-owned type `@uint`
-    let _ = fn~() { foo(x); }; //~ ERROR value has non-owned type `@uint`
+    let _: ~fn() = || foo(x); //~ ERROR value has non-owned type `@uint`
+    let _: ~fn() = || foo(x); //~ ERROR value has non-owned type `@uint`
+    let _: ~fn() = || foo(x); //~ ERROR value has non-owned type `@uint`
 }

src/test/compile-fail/kindck-owned.rs

@@ -8,12 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn copy1<T:Copy>(t: T) -> fn@() -> T {
-    fn@() -> T { t } //~ ERROR value may contain borrowed pointers
+fn copy1<T:Copy>(t: T) -> @fn() -> T {
+    let result: @fn() -> T = || t; //~ ERROR value may contain borrowed pointers
+    result
 }
 
-fn copy2<T:Copy + &static>(t: T) -> fn@() -> T {
-    fn@() -> T { t }
+fn copy2<T:Copy + &static>(t: T) -> @fn() -> T {
+    let result: @fn() -> T = || t;
+    result
 }
 
 fn main() {
@@ -23,7 +25,10 @@ fn main() {
     copy2(@3);
     copy2(@&x); //~ ERROR does not fulfill `&static`
 
-    copy2(fn@() {});
-    copy2(fn~() {}); //~ ERROR does not fulfill `Copy`
-    copy2(fn&() {}); //~ ERROR does not fulfill `&static`
+    let boxed: @fn() = || {};
+    copy2(boxed);
+    let owned: ~fn() = || {};
+    copy2(owned);    //~ ERROR does not fulfill `Copy`
+    let borrowed: &fn() = || {};
+    copy2(borrowed); //~ ERROR does not fulfill `&static`
 }

src/test/compile-fail/lambda-mutate-nested.rs

@@ -9,13 +9,13 @@
 // except according to those terms.
 
 // error-pattern:assigning to captured outer immutable variable in a stack closure
-// Make sure that nesting a block within a fn@ doesn't let us
-// mutate upvars from a fn@.
-fn f2(x: fn()) { x(); }
+// Make sure that nesting a block within a @fn doesn't let us
+// mutate upvars from a @fn.
+fn f2(x: &fn()) { x(); }
 
 fn main() {
     let i = 0;
-    let ctr = fn@ () -> int { f2(|| i = i + 1 ); return i; };
+    let ctr: @fn() -> int = || { f2(|| i = i + 1 ); i };
     log(error, ctr());
     log(error, ctr());
     log(error, ctr());

src/test/compile-fail/lambda-mutate.rs

@@ -9,10 +9,10 @@
 // except according to those terms.
 
 // error-pattern:assigning to captured outer variable in a heap closure
-// Make sure we can't write to upvars from fn@s
+// Make sure we can't write to upvars from @fns
 fn main() {
     let i = 0;
-    let ctr = fn@ () -> int { i = i + 1; return i; };
+    let ctr: @fn() -> int = || { i = i + 1; i };
     log(error, ctr());
     log(error, ctr());
     log(error, ctr());

src/test/compile-fail/liveness-block-unint.rs

@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn force(f: fn()) { f(); }
+fn force(f: &fn()) { f(); }
 fn main() {
     let x: int;
-    force(fn&() {
+    force(|| {
         log(debug, x); //~ ERROR capture of possibly uninitialized variable: `x`
     });
 }

src/test/compile-fail/liveness-init-in-called-fn-expr.rs

@@ -9,9 +9,9 @@
 // except according to those terms.
 
 fn main() {
-    let j = fn@() -> int {
+    let j: @fn() -> int = || {
         let i: int;
-        return i; //~ ERROR use of possibly uninitialized variable: `i`
+        i //~ ERROR use of possibly uninitialized variable: `i`
     };
     j();
 }

src/test/compile-fail/liveness-init-in-fn-expr.rs

@@ -9,9 +9,9 @@
 // except according to those terms.
 
 fn main() {
-    let f = fn@() -> int {
+    let f: @fn() -> int = || {
         let i: int;
-        return i; //~ ERROR use of possibly uninitialized variable: `i`
+        i //~ ERROR use of possibly uninitialized variable: `i`
     };
     log(error, f());
 }

src/test/compile-fail/liveness-issue-2163.rs

@@ -10,7 +10,7 @@
 
 fn main() {
     let a: ~[int] = ~[];
-    vec::each(a, fn@(_x: &int) -> bool {
-        //~^ ERROR not all control paths return a value
+    vec::each(a, |_| -> bool {
+        //~^ ERROR mismatched types
     });
 }

src/test/compile-fail/liveness-unused.rs

@@ -68,5 +68,5 @@ impl Drop for r {
 
 fn main() {
     let x = r { x: () };
-    fn@() { copy x; }; //~ ERROR copying a value of non-copyable type
+    || { copy x; }; //~ ERROR copying a value of non-copyable type
 }