Convert to new closure syntax

4 files changed, 20 insertions, 22 deletions

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 0690023fd97..359ca0c5bcc 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -136,7 +136,7 @@ fn test_opts(config: config) -> test::test_opts {
 fn make_tests(config: config) -> ~[test::test_desc] {
     #debug("making tests from %s", config.src_base);
     let mut tests = ~[];
-    for os::list_dir_path(config.src_base).each {|file|
+    for os::list_dir_path(config.src_base).each |file| {
         let file = file;
         #debug("inspecting file %s", file);
         if is_test(config, file) {
@@ -155,11 +155,11 @@ fn is_test(config: config, testfile: str) -> bool {
 
     let mut valid = false;
 
-    for valid_extensions.each {|ext|
+    for valid_extensions.each |ext| {
         if str::ends_with(name, ext) { valid = true; }
     }
 
-    for invalid_prefixes.each {|pre|
+    for invalid_prefixes.each |pre| {
         if str::starts_with(name, pre) { valid = false; }
     }
 
@@ -181,9 +181,7 @@ fn make_test_name(config: config, testfile: str) -> str {
 }
 
 fn make_test_closure(config: config, testfile: str) -> test::test_fn {
-    ret {||
-        runtest::run(config, copy testfile);
-    };
+    fn~() { runtest::run(config, copy testfile) }
 }
 
 // Local Variables:
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index 2810ffd139a..53f3876d9f6 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -29,7 +29,7 @@ fn load_props(testfile: str) -> test_props {
     let mut exec_env = ~[];
     let mut compile_flags = option::none;
     let mut pp_exact = option::none;
-    for iter_header(testfile) {|ln|
+    for iter_header(testfile) |ln| {
         alt parse_error_pattern(ln) {
           option::some(ep) { vec::push(error_patterns, ep) }
           option::none { }
@@ -43,11 +43,11 @@ fn load_props(testfile: str) -> test_props {
             pp_exact = parse_pp_exact(ln, testfile);
         }
 
-        do option::iter(parse_aux_build(ln)) {|ab|
+        do option::iter(parse_aux_build(ln)) |ab| {
             vec::push(aux_builds, ab);
         }
 
-        do option::iter(parse_exec_env(ln)) {|ee|
+        do option::iter(parse_exec_env(ln)) |ee| {
             vec::push(exec_env, ee);
         }
     };
@@ -62,7 +62,7 @@ fn load_props(testfile: str) -> test_props {
 
 fn is_test_ignored(config: config, testfile: str) -> bool {
     let mut found = false;
-    for iter_header(testfile) {|ln|
+    for iter_header(testfile) |ln| {
         if parse_name_directive(ln, "xfail-test") { ret true; }
         if parse_name_directive(ln, xfail_target()) { ret true; }
         if config.mode == common::mode_pretty &&
@@ -104,7 +104,7 @@ fn parse_compile_flags(line: str) -> option<str> {
 }
 
 fn parse_exec_env(line: str) -> option<(str, str)> {
-    do parse_name_value_directive(line, "exec-env").map {|nv|
+    do parse_name_value_directive(line, "exec-env").map |nv| {
         // nv is either FOO or FOO=BAR
         let strs = str::splitn_char(nv, '=', 1u);
         alt strs.len() {
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index dfe66b57a88..d2e8b019bfd 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -13,7 +13,7 @@ fn target_env(lib_path: str, prog: str) -> ~[(str,str)] {
     assert prog.ends_with(".exe");
     let aux_path = prog.slice(0u, prog.len() - 4u) + ".libaux";
 
-    env = do vec::map(env) {|pair|
+    env = do vec::map(env) |pair| {
         let (k,v) = pair;
         if k == "PATH" { ("PATH", v + ";" + lib_path + ";" + aux_path) }
         else { (k,v) }
@@ -60,11 +60,11 @@ fn run(lib_path: str,
     writeclose(pipe_in.out, input);
     let p = comm::port();
     let ch = comm::chan(p);
-    do task::spawn_sched(task::single_threaded) {||
+    do task::spawn_sched(task::single_threaded) || {
         let errput = readclose(pipe_err.in);
         comm::send(ch, (2, errput));
     }
-    do task::spawn_sched(task::single_threaded) {||
+    do task::spawn_sched(task::single_threaded) || {
         let output = readclose(pipe_out.in);
         comm::send(ch, (1, output));
     }
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index c7fcf1ca3f6..9c131f18564 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -199,7 +199,7 @@ fn check_error_patterns(props: test_props,
     let mut next_err_idx = 0u;
     let mut next_err_pat = props.error_patterns[next_err_idx];
     let mut done = false;
-    for str::split_char(procres.stderr, '\n').each {|line|
+    for str::split_char(procres.stderr, '\n').each |line| {
         if str::contains(line, next_err_pat) {
             #debug("found error pattern %s", next_err_pat);
             next_err_idx += 1u;
@@ -220,7 +220,7 @@ fn check_error_patterns(props: test_props,
         fatal_procres(#fmt["error pattern '%s' not found!",
                            missing_patterns[0]], procres);
     } else {
-        for missing_patterns.each {|pattern|
+        for missing_patterns.each |pattern| {
             error(#fmt["error pattern '%s' not found!", pattern]);
         }
         fatal_procres("multiple error patterns not found", procres);
@@ -239,7 +239,7 @@ fn check_expected_errors(expected_errors: ~[errors::expected_error],
         fatal("process did not return an error status");
     }
 
-    let prefixes = vec::map(expected_errors, {|ee|
+    let prefixes = vec::map(expected_errors, |ee| {
         #fmt("%s:%u:", testfile, ee.line)
     });
 
@@ -249,9 +249,9 @@ fn check_expected_errors(expected_errors: ~[errors::expected_error],
     //    filename:line1:col1: line2:col2: *warning:* msg
     // where line1:col1: is the starting point, line2:col2:
     // is the ending point, and * represents ANSI color codes.
-    for str::split_char(procres.stderr, '\n').each {|line|
+    for str::split_char(procres.stderr, '\n').each |line| {
         let mut was_expected = false;
-        for vec::eachi(expected_errors) {|i, ee|
+        for vec::eachi(expected_errors) |i, ee| {
             if !found_flags[i] {
                 #debug["prefix=%s ee.kind=%s ee.msg=%s line=%s",
                        prefixes[i], ee.kind, ee.msg, line];
@@ -277,7 +277,7 @@ fn check_expected_errors(expected_errors: ~[errors::expected_error],
         }
     }
 
-    for uint::range(0u, vec::len(found_flags)) {|i|
+    for uint::range(0u, vec::len(found_flags)) |i| {
         if !found_flags[i] {
             let ee = expected_errors[i];
             fatal_procres(#fmt["expected %s on line %u not found: %s",
@@ -321,11 +321,11 @@ fn compose_and_run_compiler(
 
     let extra_link_args = ~["-L", aux_output_dir_name(config, testfile)];
 
-    do vec::iter(props.aux_builds) {|rel_ab|
+    do vec::iter(props.aux_builds) |rel_ab| {
         let abs_ab = path::connect(config.aux_base, rel_ab);
         let aux_args =
             make_compile_args(config, props, ~["--lib"] + extra_link_args,
-                              {|a,b|make_lib_name(a, b, testfile)}, abs_ab);
+                              |a,b| make_lib_name(a, b, testfile), abs_ab);
         let auxres = compose_and_run(config, abs_ab, aux_args, ~[],
                                      config.compile_lib_path, option::none);
         if auxres.status != 0 {