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

Author: pcwalton

doc/tutorial.md

@@ -2291,13 +2291,12 @@ be private. But this encapsulation is at the module level, not the
 struct level. Note that fields and methods are _public_ by default.
 
 ~~~
-mod farm {
-# use farm;
+pub mod farm {
 # pub type Chicken = int;
 # type Cow = int;
 # enum Human = int;
 # impl Human { fn rest(&self) { } }
-# pub fn make_me_a_farm() -> farm::Farm { farm::Farm { chickens: ~[], cows: ~[], farmer: Human(0) } }
+# pub fn make_me_a_farm() -> Farm { Farm { chickens: ~[], cows: ~[], farmer: Human(0) } }
     pub struct Farm {
         priv chickens: ~[Chicken],
         priv cows: ~[Cow],

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/core-std.rs

@@ -16,7 +16,7 @@ use std::time::precise_time_s;
 use std::oldmap;
 use std::oldmap::{Map, HashMap};
 
-use io::{Reader, ReaderUtil};
+use core::io::{Reader, ReaderUtil};
 
 macro_rules! bench (
     ($id:ident) => (maybe_run_test(argv, stringify!($id).to_owned(), $id))

src/test/bench/core-vec-append.rs

@@ -11,8 +11,8 @@
 // A raw test of vector appending performance.
 
 extern mod std;
-use dvec::DVec;
-use io::WriterUtil;
+use core::dvec::DVec;
+use core::io::WriterUtil;
 
 fn collect_raw(num: uint) -> ~[uint] {
     let mut 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(+x: uint, +y: &color) -> color = |i, c| {
                 let colors = arc::get(&colors);
                 let graph = arc::get(&graph);
                 match *c {
@@ -290,20 +290,22 @@ 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 }
                 _ => { fail!(~"Found remaining gray nodes in BFS") }
             }
-        }
+        };
+        result
     }
 }
 
@@ -387,14 +389,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(+x: 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/msgsend-pipes-shared.rs

@@ -21,10 +21,10 @@
 #[legacy_modes];
 
 extern mod std;
-use io::Writer;
-use io::WriterUtil;
+use core::io::Writer;
+use core::io::WriterUtil;
 
-use comm::{Port, Chan, SharedChan};
+use core::comm::{Port, Chan, SharedChan};
 
 macro_rules! move_out (
     { $x:expr } => { unsafe { let y = *ptr::addr_of(&($x)); y } }

src/test/bench/msgsend-pipes.rs

@@ -17,10 +17,10 @@
 #[legacy_modes];
 
 extern mod std;
-use io::Writer;
-use io::WriterUtil;
+use core::io::Writer;
+use core::io::WriterUtil;
 
-use comm::{Port, PortSet, Chan, stream};
+use core::comm::{Port, PortSet, Chan, stream};
 
 macro_rules! move_out (
     { $x:expr } => { unsafe { let y = *ptr::addr_of(&($x)); y } }

src/test/bench/shootout-fasta.rs

@@ -16,7 +16,7 @@
  * http://shootout.alioth.debian.org/
  */
 extern mod std;
-use io::WriterUtil;
+use core::io::WriterUtil;
 
 fn LINE_LENGTH() -> uint { return 60u; }
 

src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -17,9 +17,9 @@ extern mod std;
 use std::oldmap;
 use std::oldmap::HashMap;
 use std::sort;
-use io::ReaderUtil;
-use comm::{stream, Port, Chan};
-use cmp::Ord;
+use core::io::ReaderUtil;
+use core::comm::{stream, Port, Chan};
+use core::cmp::Ord;
 
 // given a map, print a sorted version of it
 fn sort_and_fmt(mm: HashMap<~[u8], uint>, total: uint) -> ~str {