diff options
Diffstat (limited to 'src/test')
256 files changed, 505 insertions, 505 deletions
diff --git a/src/test/auxiliary/cci_class_4.rs b/src/test/auxiliary/cci_class_4.rs index 43f57c41f88..be2c982799b 100644 --- a/src/test/auxiliary/cci_class_4.rs +++ b/src/test/auxiliary/cci_class_4.rs @@ -24,11 +24,11 @@ class cat { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } } diff --git a/src/test/auxiliary/cci_class_cast.rs b/src/test/auxiliary/cci_class_cast.rs index 95870b73c4d..36642db378f 100644 --- a/src/test/auxiliary/cci_class_cast.rs +++ b/src/test/auxiliary/cci_class_cast.rs @@ -27,11 +27,11 @@ class cat : to_str { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } diff --git a/src/test/auxiliary/cci_nested_lib.rs b/src/test/auxiliary/cci_nested_lib.rs index cb3d9de652f..31ee535fcab 100644 --- a/src/test/auxiliary/cci_nested_lib.rs +++ b/src/test/auxiliary/cci_nested_lib.rs @@ -10,7 +10,7 @@ fn alist_add<A: copy, B: copy>(lst: alist<A,B>, k: A, v: B) { fn alist_get<A: copy, B: copy>(lst: alist<A,B>, k: A) -> B { let eq_fn = lst.eq_fn; for lst.data.each |entry| { - if eq_fn(entry.key, k) { ret entry.value; } + if eq_fn(entry.key, k) { return entry.value; } } fail; } @@ -18,12 +18,12 @@ fn alist_get<A: copy, B: copy>(lst: alist<A,B>, k: A) -> B { #[inline] fn new_int_alist<B: copy>() -> alist<int, B> { fn eq_int(&&a: int, &&b: int) -> bool { a == b } - ret {eq_fn: eq_int, data: dvec()}; + return {eq_fn: eq_int, data: dvec()}; } #[inline] fn new_int_alist_2<B: copy>() -> alist<int, B> { #[inline] fn eq_int(&&a: int, &&b: int) -> bool { a == b } - ret {eq_fn: eq_int, data: dvec()}; + return {eq_fn: eq_int, data: dvec()}; } \ No newline at end of file diff --git a/src/test/auxiliary/test_comm.rs b/src/test/auxiliary/test_comm.rs index 4542a23b854..007ef3bcc43 100644 --- a/src/test/auxiliary/test_comm.rs +++ b/src/test/auxiliary/test_comm.rs @@ -75,7 +75,7 @@ fn recv_<T: send>(p: *rust_port) -> T { // this is a good place to yield task::yield(); } - ret res; + return res; } diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index 0683624d5ff..b32047755ee 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -33,7 +33,7 @@ fn maybe_run_test(argv: &[~str], name: ~str, test: fn()) { run_test = argv.contains(~"all") || argv.contains(name) } - if !run_test { ret } + if !run_test { return } let start = precise_time_s(); test(); diff --git a/src/test/bench/core-vec-append.rs b/src/test/bench/core-vec-append.rs index 3a35e0c89ca..d950abb99be 100644 --- a/src/test/bench/core-vec-append.rs +++ b/src/test/bench/core-vec-append.rs @@ -9,7 +9,7 @@ fn collect_raw(num: uint) -> ~[uint] { for uint::range(0u, num) |i| { vec::push(result, i); } - ret result; + return result; } fn collect_dvec(num: uint) -> ~[mut uint] { @@ -17,7 +17,7 @@ fn collect_dvec(num: uint) -> ~[mut uint] { for uint::range(0u, num) |i| { result.push(i); } - ret dvec::unwrap(result); + return dvec::unwrap(result); } fn main(args: ~[~str]) { diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs index 3e3f69372b4..497f964b18a 100644 --- a/src/test/bench/graph500-bfs.rs +++ b/src/test/bench/graph500-bfs.rs @@ -320,7 +320,7 @@ fn validate(edges: ~[(node_id, node_id)], } }; - if !status { ret status } + if !status { return status } // 2. Each tree edge connects vertices whose BFS levels differ by // exactly one. @@ -336,7 +336,7 @@ fn validate(edges: ~[(node_id, node_id)], } }; - if !status { ret status } + if !status { return status } // 3. Every edge in the input list has vertices with levels that // differ by at most one or that both are not in the BFS tree. @@ -349,7 +349,7 @@ fn validate(edges: ~[(node_id, node_id)], abs(level[u] - level[v]) <= 1 }; - if !status { ret status } + if !status { return status } // 4. The BFS tree spans an entire connected component's vertices. @@ -370,7 +370,7 @@ fn validate(edges: ~[(node_id, node_id)], } }; - if !status { ret status } + if !status { return status } // If we get through here, all the tests passed! true diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout-ackermann.rs index f9b698a2195..291e7c2dba5 100644 --- a/src/test/bench/shootout-ackermann.rs +++ b/src/test/bench/shootout-ackermann.rs @@ -2,12 +2,12 @@ use std; fn ack(m: int, n: int) -> int { if m == 0 { - ret n + 1 + return n + 1 } else { if n == 0 { - ret ack(m - 1, 1); + return ack(m - 1, 1); } else { - ret ack(m - 1, ack(m, n - 1)); + return ack(m - 1, ack(m, n - 1)); } } } diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs index 55e566296fc..aadf8929015 100644 --- a/src/test/bench/shootout-binarytrees.rs +++ b/src/test/bench/shootout-binarytrees.rs @@ -6,20 +6,20 @@ enum tree/& { nil, node(&tree, &tree, int), } fn item_check(t: &tree) -> int { alt *t { - nil { ret 0; } + nil { return 0; } node(left, right, item) { - ret item + item_check(left) - item_check(right); + return item + item_check(left) - item_check(right); } } } fn bottom_up_tree(arena: &arena::arena, item: int, depth: int) -> &tree { if depth > 0 { - ret new(*arena) node(bottom_up_tree(arena, 2 * item - 1, depth - 1), + return new(*arena) node(bottom_up_tree(arena, 2 * item - 1, depth - 1), bottom_up_tree(arena, 2 * item, depth - 1), item); } - ret new(*arena) nil; + return new(*arena) nil; } fn main(args: ~[~str]) { diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs index 0400e8b127e..8882b5ae7c7 100644 --- a/src/test/bench/shootout-chameneos-redux.rs +++ b/src/test/bench/shootout-chameneos-redux.rs @@ -35,7 +35,7 @@ fn show_color_list(set: ~[color]) -> ~str { out += ~" "; out += show_color(col); } - ret out; + return out; } fn show_digit(nn: uint) -> ~str { @@ -67,7 +67,7 @@ fn show_number(nn: uint) -> ~str { out = show_digit(dig) + ~" " + out; } - ret out; + return out; } fn transform(aa: color, bb: color) -> color { @@ -137,7 +137,7 @@ fn rendezvous(nn: uint, set: ~[color]) { fn@(ii: uint, col: color) -> comm::chan<option<creature_info>> { // create each creature as a listener with a port, and // give us a channel to talk to each - ret do task::spawn_listener |from_rendezvous| { + return do task::spawn_listener |from_rendezvous| { creature(ii, col, from_rendezvous, to_rendezvous, to_rendezvous_log); }; diff --git a/src/test/bench/shootout-fannkuchredux.rs b/src/test/bench/shootout-fannkuchredux.rs index 4f48c8799b7..e5eab3b78f4 100644 --- a/src/test/bench/shootout-fannkuchredux.rs +++ b/src/test/bench/shootout-fannkuchredux.rs @@ -4,7 +4,7 @@ import int; import vec; fn fannkuch(n: int) -> int { - fn perm1init(i: uint) -> int { ret i as int; } + fn perm1init(i: uint) -> int { return i as int; } let perm = vec::to_mut(vec::from_elem(n as uint, 0)); let perm1 = vec::to_mut(vec::from_fn(n as uint, perm1init)); @@ -44,7 +44,7 @@ fn fannkuch(n: int) -> int { while go { if r == n { io::println(fmt!{"%d", checksum}); - ret flips; + return flips; } let p0 = perm1[0]; i = 0; @@ -55,7 +55,7 @@ fn fannkuch(n: int) -> int { } nperm += 1; } - ret flips; + return flips; } fn main(args: ~[~str]) { diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs index ca528764b1d..a1cb8933893 100644 --- a/src/test/bench/shootout-fasta.rs +++ b/src/test/bench/shootout-fasta.rs @@ -12,7 +12,7 @@ import int; import str; import io::writer_util; -fn LINE_LENGTH() -> uint { ret 60u; } +fn LINE_LENGTH() -> uint { return 60u; } type myrandom = @{mut last: u32}; @@ -27,20 +27,20 @@ fn make_cumulative(aa: ~[aminoacids]) -> ~[aminoacids] { let mut cp: u32 = 0u32; let mut ans: ~[aminoacids] = ~[]; for aa.each |a| { cp += a.prob; ans += ~[{ch: a.ch, prob: cp}]; } - ret ans; + return ans; } fn select_random(r: u32, genelist: ~[aminoacids]) -> char { - if r < genelist[0].prob { ret genelist[0].ch; } + if r < genelist[0].prob { return genelist[0].ch; } fn bisect(v: ~[aminoacids], lo: uint, hi: uint, target: u32) -> char { if hi > lo + 1u { let mid: uint = lo + (hi - lo) / 2u; if target < v[mid].prob { - ret bisect(v, lo, mid, target); - } else { ret bisect(v, mid, hi, target); } - } else { ret v[hi].ch; } + return bisect(v, lo, mid, target); + } else { return bisect(v, mid, hi, target); } + } else { return v[hi].ch; } } - ret bisect(genelist, 0u, vec::len::<aminoacids>(genelist) - 1u, r); + return bisect(genelist, 0u, vec::len::<aminoacids>(genelist) - 1u, r); } fn make_random_fasta(wr: io::writer, id: ~str, desc: ~str, genelist: ~[aminoacids], n: int) { @@ -72,7 +72,7 @@ fn make_repeat_fasta(wr: io::writer, id: ~str, desc: ~str, s: ~str, n: int) unsa if str::len(op) > 0u { wr.write_line(op); } } -fn acid(ch: char, prob: u32) -> aminoacids { ret {ch: ch, prob: prob}; } +fn acid(ch: char, prob: u32) -> aminoacids { return {ch: ch, prob: prob}; } fn main(args: ~[~str]) { let args = if os::getenv(~"RUST_BENCH").is_some() { diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs index 2851b59956e..4e8cfff4ad2 100644 --- a/src/test/bench/shootout-fibo.rs +++ b/src/test/bench/shootout-fibo.rs @@ -2,9 +2,9 @@ use std; fn fib(n: int) -> int { if n < 2 { - ret 1; + return 1; } else { - ret fib(n - 1) + fib(n - 2); + return fib(n - 1) + fib(n - 2); } } diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index d8a82019f33..d02fe7770c5 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -14,24 +14,24 @@ import pipes::{stream, port, chan}; // given a map, print a sorted version of it fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { fn pct(xx: uint, yy: uint) -> float { - ret (xx as float) * 100f / (yy as float); + return (xx as float) * 100f / (yy as float); } fn le_by_val<TT: copy, UU: copy>(kv0: (TT,UU), kv1: (TT,UU)) -> bool { let (_, v0) = kv0; let (_, v1) = kv1; - ret v0 >= v1; + return v0 >= v1; } fn le_by_key<TT: copy, UU: copy>(kv0: (TT,UU), kv1: (TT,UU)) -> bool { let (k0, _) = kv0; let (k1, _) = kv1; - ret k0 <= k1; + return k0 <= k1; } // sort by key, then by value fn sortKV<TT: copy, UU: copy>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] { - ret sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig)); + return sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig)); } let mut pairs = ~[]; @@ -39,7 +39,7 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { // map -> [(k,%)] mm.each(fn&(key: ~[u8], val: uint) -> bool { vec::push(pairs, (key, pct(val, total))); - ret true; + return true; }); let pairs_sorted = sortKV(pairs); @@ -49,17 +49,17 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { pairs_sorted.each(fn&(kv: (~[u8], float)) -> bool unsafe { let (k,v) = kv; buffer += (fmt!{"%s %0.3f\n", str::to_upper(str::unsafe::from_bytes(k)), v}); - ret true; + return true; }); - ret buffer; + return buffer; } // given a map, search for the frequency of a pattern fn find(mm: hashmap<~[u8], uint>, key: ~str) -> uint { alt mm.find(str::bytes(str::to_lower(key))) { - option::none { ret 0u; } - option::some(num) { ret num; } + option::none { return 0u; } + option::some(num) { return num; } } } @@ -85,7 +85,7 @@ fn windows_with_carry(bb: &[u8], nn: uint, ii += 1u; } - ret vec::slice(bb, len - (nn - 1u), len); + return vec::slice(bb, len - (nn - 1u), len); } fn make_sequence_processor(sz: uint, from_parent: pipes::port<~[u8]>, diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index 2eee8572a77..d5beee9ff08 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -12,24 +12,24 @@ import std::sort; // given a map, print a sorted version of it fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { fn pct(xx: uint, yy: uint) -> float { - ret (xx as float) * 100f / (yy as float); + return (xx as float) * 100f / (yy as float); } fn le_by_val<TT: copy, UU: copy>(kv0: (TT,UU), kv1: (TT,UU)) -> bool { let (_, v0) = kv0; let (_, v1) = kv1; - ret v0 >= v1; + return v0 >= v1; } fn le_by_key<TT: copy, UU: copy>(kv0: (TT,UU), kv1: (TT,UU)) -> bool { let (k0, _) = kv0; let (k1, _) = kv1; - ret k0 <= k1; + return k0 <= k1; } // sort by key, then by value fn sortKV<TT: copy, UU: copy>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] { - ret sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig)); + return sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig)); } let mut pairs = ~[]; @@ -37,7 +37,7 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { // map -> [(k,%)] mm.each(fn&(key: ~[u8], val: uint) -> bool { vec::push(pairs, (key, pct(val, total))); - ret true; + return true; }); let pairs_sorted = sortKV(pairs); @@ -47,17 +47,17 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { pairs_sorted.each(fn&(kv: (~[u8], float)) -> bool unsafe { let (k,v) = kv; buffer += (fmt!{"%s %0.3f\n", str::to_upper(str::unsafe::from_bytes(k)), v}); - ret true; + return true; }); - ret buffer; + return buffer; } // given a map, search for the frequency of a pattern fn find(mm: hashmap<~[u8], uint>, key: ~str) -> uint { alt mm.find(str::bytes(str::to_lower(key))) { - option::none { ret 0u; } - option::some(num) { ret num; } + option::none { return 0u; } + option::some(num) { return num; } } } @@ -83,7 +83,7 @@ fn windows_with_carry(bb: &[u8], nn: uint, ii += 1u; } - ret vec::slice(bb, len - (nn - 1u), len); + return vec::slice(bb, len - (nn - 1u), len); } fn make_sequence_processor(sz: uint, from_parent: comm::port<~[u8]>, @@ -142,7 +142,7 @@ fn main(args: ~[~str]) { let from_child = vec::map (sizes, |_sz| comm::port() ); let to_parent = vec::mapi(sizes, |ii, _sz| comm::chan(from_child[ii]) ); let to_child = vec::mapi(sizes, fn@(ii: uint, sz: uint) -> comm::chan<~[u8]> { - ret do task::spawn_listener |from_parent| { + return do task::spawn_listener |from_parent| { make_sequence_processor(sz, from_parent, to_parent[ii]); }; }); diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs index 3e1288b3b0a..0082bc6ad03 100644 --- a/src/test/bench/shootout-nbody.rs +++ b/src/test/bench/shootout-nbody.rs @@ -52,7 +52,7 @@ mod NBodySystem { // side-effecting Body::offset_momentum(bodies[0], px, py, pz); - ret bodies; + return bodies; } fn advance(bodies: ~[Body::props], dt: float) { @@ -122,7 +122,7 @@ mod NBodySystem { i += 1; } - ret e; + return e; } } @@ -144,7 +144,7 @@ mod Body { mass: float}; fn jupiter() -> Body::props { - ret {mut x: 4.84143144246472090e+00, + return {mut x: 4.84143144246472090e+00, mut y: -1.16032004402742839e+00, mut z: -1.03622044471123109e-01, mut vx: 1.66007664274403694e-03 * DAYS_PER_YEAR, @@ -154,7 +154,7 @@ mod Body { } fn saturn() -> Body::props { - ret {mut x: 8.34336671824457987e+00, + return {mut x: 8.34336671824457987e+00, mut y: 4.12479856412430479e+00, mut z: -4.03523417114321381e-01, mut vx: -2.76742510726862411e-03 * DAYS_PER_YEAR, @@ -164,7 +164,7 @@ mod Body { } fn uranus() -> Body::props { - ret {mut x: 1.28943695621391310e+01, + return {mut x: 1.28943695621391310e+01, mut y: -1.51111514016986312e+01, mut z: -2.23307578892655734e-01, mut vx: 2.96460137564761618e-03 * DAYS_PER_YEAR, @@ -174,7 +174,7 @@ mod Body { } fn neptune() -> Body::props { - ret {mut x: 1.53796971148509165e+01, + return {mut x: 1.53796971148509165e+01, mut y: -2.59193146099879641e+01, mut z: 1.79258772950371181e-01, mut vx: 2.68067772490389322e-03 * DAYS_PER_YEAR, @@ -184,7 +184,7 @@ mod Body { } fn sun() -> Body::props { - ret {mut x: 0.0, + return {mut x: 0.0, mut y: 0.0, mut z: 0.0, mut vx: 0.0, diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index be7a8c6c3c7..2d2f9377820 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -41,7 +41,7 @@ fn fib(n: int) -> int { let p = port(); let ch = chan(p); let t = task::spawn(|| pfib(ch, n) ); - ret recv(p); + return recv(p); } type config = {stress: bool}; @@ -53,7 +53,7 @@ fn parse_opts(argv: ~[~str]) -> config { alt getopts::getopts(opt_args, opts) { - ok(m) { ret {stress: getopts::opt_present(m, ~"stress")} } + ok(m) { return {stress: getopts::opt_present(m, ~"stress")} } err(_) { fail; } } } diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout-threadring.rs index 890f36b833c..36df950a2b7 100644 --- a/src/test/bench/shootout-threadring.rs +++ b/src/test/bench/shootout-threadring.rs @@ -24,13 +24,13 @@ fn roundtrip(id: int, p: comm::port<int>, ch: comm::chan<int>) { alt comm::recv(p) { 1 { io::println(fmt!{"%d\n", id}); - ret; + return; } token { debug!{"%d %d", id, token}; comm::send(ch, token - 1); if token <= n_threads { - ret; + return; } } } diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index e062e5c9dcb..fc22b99f59c 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -42,7 +42,7 @@ fn read_grid(f: io::reader) -> grid_t { g[row][col] = option::get(uint::from_str(comps[2])) as u8; } } - ret grid_ctor(g); + return grid_ctor(g); } // solve sudoku grid @@ -62,12 +62,12 @@ fn solve_grid(g: grid_t) { for uint::range(1u, 10u) |i| { if avail.get(i) { g[row][col] = i as u8; - ret true; + return true; } }; } g[row][col] = 0u8; - ret false; + return false; } // find colors available in neighbourhood of (row, col) diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index 59c9be9d58f..8192143faa2 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -167,7 +167,7 @@ mod map_reduce { vec::push(tasks, spawn_joinable(|| map_task(map, ctrl, i) )); vec::push(ctrls, ctrl_server); } - ret tasks; + return tasks; } fn map_task<K1: copy send, K2: const copy send hash_key, V: copy send>( @@ -226,7 +226,7 @@ mod map_reduce { alt recv(p) { emit_val(v) { // error!{"received %d", v}; - ret some(v); + return some(v); } done { // error!{"all done"}; @@ -236,7 +236,7 @@ mod map_reduce { release { ref_count -= 1; } } } - ret none; + return none; } reduce(key, || get(p, ref_count, is_done) ); @@ -303,7 +303,7 @@ fn main(argv: ~[~str]) { out.write_line(fmt!{"Usage: %s <filename> ...", argv[0]}); - ret; + return; } let readers: ~[fn~() -> word_reader] = if argv.len() >= 2 { @@ -339,9 +339,9 @@ fn read_word(r: io::reader) -> option<~str> { if is_word_char(c) { w += str::from_char(c); - } else { if w != ~"" { ret some(w); } } + } else { if w != ~"" { return some(w); } } } - ret none; + return none; } fn is_word_char(c: char) -> bool { diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs index d83045ae417..01b949e312c 100644 --- a/src/test/bench/task-perf-word-count.rs +++ b/src/test/bench/task-perf-word-count.rs @@ -68,7 +68,7 @@ mod map_reduce { map_task(ctrl, i); // Task body } } - ret results; + return results; } fn map_task(ctrl: chan<ctrl_proto>, input: ~str) { @@ -114,7 +114,7 @@ mod map_reduce { alt recv(p) { emit_val(v) { // error!{"received %d", v}; - ret some(v); + return some(v); } done { // error!{"all done"}; @@ -124,7 +124,7 @@ mod map_reduce { release { state.ref_count -= 1; } } } - ret none; + return none; } reduce(key, || get(p, state) ); @@ -210,9 +210,9 @@ fn read_word(r: io::reader) -> option<~str> { if is_word_char(c) { w += str::from_char(c); - } else { if w != ~"" { ret some(w); } } + } else { if w != ~"" { return some(w); } } } - ret none; + return none; } fn is_digit(c: char) -> bool { diff --git a/src/test/compile-fail/bad-bang-ann-3.rs b/src/test/compile-fail/bad-bang-ann-3.rs index 3a88afd5346..fab48c0d559 100644 --- a/src/test/compile-fail/bad-bang-ann-3.rs +++ b/src/test/compile-fail/bad-bang-ann-3.rs @@ -2,7 +2,7 @@ // Tests that a function with a ! annotation always actually fails fn bad_bang(i: uint) -> ! { - ret 7u; + return 7u; //~^ ERROR expected `_|_` but found `uint` } diff --git a/src/test/compile-fail/block-arg-used-as-lambda-with-illegal-cap.rs b/src/test/compile-fail/block-arg-used-as-lambda-with-illegal-cap.rs index 2e1d7778a9e..73152fba0ed 100644 --- a/src/test/compile-fail/block-arg-used-as-lambda-with-illegal-cap.rs +++ b/src/test/compile-fail/block-arg-used-as-lambda-with-illegal-cap.rs @@ -1,9 +1,9 @@ fn to_lambda1(f: fn@(uint) -> uint) -> fn@(uint) -> uint { - ret f; + return f; } fn to_lambda2(b: fn(uint) -> uint) -> fn@(uint) -> uint { - ret to_lambda1({|x| b(x)}); //~ ERROR value may contain borrowed pointers + return to_lambda1({|x| b(x)}); //~ ERROR value may contain borrowed pointers } fn main() { diff --git a/src/test/compile-fail/block-coerce-no.rs b/src/test/compile-fail/block-coerce-no.rs index dd8f77ce20e..f407d362603 100644 --- a/src/test/compile-fail/block-coerce-no.rs +++ b/src/test/compile-fail/block-coerce-no.rs @@ -3,9 +3,9 @@ fn coerce(b: fn()) -> extern fn() { fn lol(f: extern fn(fn()) -> extern fn(), - g: fn()) -> extern fn() { ret f(g); } - fn fn_id(f: extern fn()) -> extern fn() { ret f } - ret lol(fn_id, b); + g: fn()) -> extern fn() { return f(g); } + fn fn_id(f: extern fn()) -> extern fn() { return f } + return lol(fn_id, b); //~^ ERROR mismatched types: expected `extern fn(fn()) -> extern fn()` } diff --git a/src/test/compile-fail/block-copy.rs b/src/test/compile-fail/block-copy.rs index cb5550cded9..964ea5c7750 100644 --- a/src/test/compile-fail/block-copy.rs +++ b/src/test/compile-fail/block-copy.rs @@ -1,6 +1,6 @@ // error-pattern: stack closure type can only appear -fn lol(f: fn()) -> fn() { ret f; } +fn lol(f: fn()) -> fn() { return f; } fn main() { let i = 8; let f = lol(fn&() { log(error, i); }); diff --git a/src/test/compile-fail/borrowck-move-from-unsafe-ptr.rs b/src/test/compile-fail/borrowck-move-from-unsafe-ptr.rs index fc8ff1ffe07..71bba89fb77 100644 --- a/src/test/compile-fail/borrowck-move-from-unsafe-ptr.rs +++ b/src/test/compile-fail/borrowck-move-from-unsafe-ptr.rs @@ -1,6 +1,6 @@ fn foo(x: *~int) -> ~int { let y <- *x; //~ ERROR dereference of unsafe pointer requires unsafe function or block - ret y; + return y; } fn main() { diff --git a/src/test/compile-fail/borrowck-mut-vec-as-imm-slice-bad.rs b/src/test/compile-fail/borrowck-mut-vec-as-imm-slice-bad.rs index ad9877c2674..da394fbf372 100644 --- a/src/test/compile-fail/borrowck-mut-vec-as-imm-slice-bad.rs +++ b/src/test/compile-fail/borrowck-mut-vec-as-imm-slice-bad.rs @@ -1,7 +1,7 @@ fn want_slice(v: &[int]) -> int { let mut sum = 0; for vec::each(v) |i| { sum += i; } - ret sum; + return sum; } fn has_mut_vec(+v: @~[mut int]) -> int { diff --git a/src/test/compile-fail/cap-clause-illegal-cap.rs b/src/test/compile-fail/cap-clause-illegal-cap.rs index c13cc37f4b7..f7863013898 100644 --- a/src/test/compile-fail/cap-clause-illegal-cap.rs +++ b/src/test/compile-fail/cap-clause-illegal-cap.rs @@ -5,7 +5,7 @@ class foo { let x: int; new(x: int) { self.x = x; } drop { } } fn to_lambda2(b: foo) -> fn@(uint) -> uint { // test case where copy clause specifies a value that is not used // in fn@ body, but value is illegal to copy: - ret fn@(u: uint, copy b) -> uint { 22u }; + return fn@(u: uint, copy b) -> uint { 22u }; } fn main() { diff --git a/src/test/compile-fail/capture1.rs b/src/test/compile-fail/capture1.rs index 877884bf7f9..053e2f5ca7f 100644 --- a/src/test/compile-fail/capture1.rs +++ b/src/test/compile-fail/capture1.rs @@ -4,5 +4,5 @@ fn main() { let bar: int = 5; - fn foo() -> int { ret bar; } + fn foo() -> int { return bar; } } diff --git a/src/test/compile-fail/class-cast-to-iface.rs b/src/test/compile-fail/class-cast-to-iface.rs index fb35b788779..159e881ee8a 100644 --- a/src/test/compile-fail/class-cast-to-iface.rs +++ b/src/test/compile-fail/class-cast-to-iface.rs @@ -27,11 +27,11 @@ class cat : noisy { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } } diff --git a/src/test/compile-fail/constrained-type-missing-check.rs b/src/test/compile-fail/constrained-type-missing-check.rs index bed10a12de5..4ad79f570ae 100644 --- a/src/test/compile-fail/constrained-type-missing-check.rs +++ b/src/test/compile-fail/constrained-type-missing-check.rs @@ -2,7 +2,7 @@ // xfail-test // error-pattern:Unsatisfied precondition -pure fn less_than(x: int, y: int) -> bool { ret x < y; } +pure fn less_than(x: int, y: int) -> bool { return x < y; } type ordered_range = {low: int, high: int} : less_than(*.low, *.high); diff --git a/src/test/compile-fail/dead-code-ret.rs b/src/test/compile-fail/dead-code-ret.rs index fe7b7aec104..2f46bd2d473 100644 --- a/src/test/compile-fail/dead-code-ret.rs +++ b/src/test/compile-fail/dead-code-ret.rs @@ -5,5 +5,5 @@ fn f(caller: str) { log(debug, caller); } -fn main() { ret f("main"); debug!{"Paul is dead"}; } +fn main() { return f("main"); debug!{"Paul is dead"}; } diff --git a/src/test/compile-fail/for-loop-decl.rs b/src/test/compile-fail/for-loop-decl.rs index eb327ff3ea1..697a135d0cc 100644 --- a/src/test/compile-fail/for-loop-decl.rs +++ b/src/test/compile-fail/for-loop-decl.rs @@ -13,7 +13,7 @@ fn bitv_to_str(enclosing: fn_info, v: ~bitv::bitv) -> str { for enclosing.vars.each_value |val| { if v.get(val) { s += "foo"; } } - ret s; + return s; } fn main() { debug!{"OK"}; } diff --git a/src/test/compile-fail/fully-qualified-type-name2.rs b/src/test/compile-fail/fully-qualified-type-name2.rs index db6521cbd78..12125422a94 100644 --- a/src/test/compile-fail/fully-qualified-type-name2.rs +++ b/src/test/compile-fail/fully-qualified-type-name2.rs @@ -9,7 +9,7 @@ mod y { } fn bar(x: x::foo) -> y::foo { - ret x; + return x; //~^ ERROR mismatched types: expected `y::foo` but found `x::foo` } diff --git a/src/test/compile-fail/fully-qualified-type-name3.rs b/src/test/compile-fail/fully-qualified-type-name3.rs index 6bd764af179..8c4f976f1b3 100644 --- a/src/test/compile-fail/fully-qualified-type-name3.rs +++ b/src/test/compile-fail/fully-qualified-type-name3.rs @@ -4,7 +4,7 @@ type T1 = uint; type T2 = int; fn bar(x: T1) -> T2 { - ret x; + return x; //~^ ERROR mismatched types: expected `T2` but found `T1` } diff --git a/src/test/compile-fail/fully-qualified-type-name4.rs b/src/test/compile-fail/fully-qualified-type-name4.rs index 73560432032..00eb7434224 100644 --- a/src/test/compile-fail/fully-qualified-type-name4.rs +++ b/src/test/compile-fail/fully-qualified-type-name4.rs @@ -3,7 +3,7 @@ import core::task::task; fn bar(x: uint) -> task { - ret x; + return x; //~^ ERROR mismatched types: expected `core::task::task` } diff --git a/src/test/compile-fail/iface-cast.rs b/src/test/compile-fail/iface-cast.rs index f6642ec1b62..736634c13e8 100644 --- a/src/test/compile-fail/iface-cast.rs +++ b/src/test/compile-fail/iface-cast.rs @@ -1,7 +1,7 @@ trait foo<T> { } fn bar(x: foo<uint>) -> foo<int> { - ret (x as foo::<int>); + return (x as foo::<int>); //~^ ERROR mismatched types: expected `foo<int>` but found `foo<uint>` } diff --git a/src/test/compile-fail/import-glob-circular.rs b/src/test/compile-fail/import-glob-circular.rs index e0f2d3a3c09..a3be8b17604 100644 --- a/src/test/compile-fail/import-glob-circular.rs +++ b/src/test/compile-fail/import-glob-circular.rs @@ -6,7 +6,7 @@ mod circ1 { export f2; export common; fn f1() { debug!{"f1"}; } - fn common() -> uint { ret 0u; } + fn common() -> uint { return 0u; } } mod circ2 { @@ -15,7 +15,7 @@ mod circ2 { export f2; export common; fn f2() { debug!{"f2"}; } - fn common() -> uint { ret 1u; } + fn common() -> uint { return 1u; } } mod test { diff --git a/src/test/compile-fail/issue-1193.rs b/src/test/compile-fail/issue-1193.rs index b20d734ec59..d6ab1e44211 100644 --- a/src/test/compile-fail/issue-1193.rs +++ b/src/test/compile-fail/issue-1193.rs @@ -7,8 +7,8 @@ mod foo { fn bar(v: t) -> bool { alt v { - a { ret true; } - b { ret false; } + a { return true; } + b { return false; } } } } diff --git a/src/test/compile-fail/issue-1448-1.rs b/src/test/compile-fail/issue-1448-1.rs index 191dda5b4c1..1da1289f18e 100644 --- a/src/test/compile-fail/issue-1448-1.rs +++ b/src/test/compile-fail/issue-1448-1.rs @@ -2,6 +2,6 @@ fn main() { #macro[[#apply[f, [x, ...]], f(x, ...)]]; - fn add(a: int, b: int) -> int { ret a + b; } + fn add(a: int, b: int) -> int { return a + b; } assert (apply!{add, [y, 15]} == 16); //~ ERROR unresolved name: y } diff --git a/src/test/compile-fail/issue-2150.rs b/src/test/compile-fail/issue-2150.rs index 79f0598baac..7234ca9e9e1 100644 --- a/src/test/compile-fail/issue-2150.rs +++ b/src/test/compile-fail/issue-2150.rs @@ -3,6 +3,6 @@ fn fail_len(v: ~[const int]) -> uint { for v.each |x| { i += 1u; } //~^ WARNING unreachable statement //~^^ ERROR the type of this value must be known - ret i; + return i; } fn main() {} \ No newline at end of file diff --git a/src/test/compile-fail/issue-3021-d.rs b/src/test/compile-fail/issue-3021-d.rs index 145cce00839..82aeb1c8da2 100644 --- a/src/test/compile-fail/issue-3021-d.rs +++ b/src/test/compile-fail/issue-3021-d.rs @@ -15,7 +15,7 @@ fn siphash(k0 : u64, k1 : u64) -> siphash { let v0 = st.v0, v1 = st.v1; - ret v0 ^ v1; + return v0 ^ v1; } impl of siphash for sipstate { @@ -25,7 +25,7 @@ fn siphash(k0 : u64, k1 : u64) -> siphash { self.v1 = k1 ^ 0x646f72616e646f6d; //~ ERROR attempted dynamic environment-capture //~^ ERROR unresolved name: k1 } - fn result() -> u64 { ret mk_result(self); } + fn result() -> u64 { return mk_result(self); } } } diff --git a/src/test/compile-fail/issue-897-2.rs b/src/test/compile-fail/issue-897-2.rs index ce6737cc962..ebf3b5e986e 100644 --- a/src/test/compile-fail/issue-897-2.rs +++ b/src/test/compile-fail/issue-897-2.rs @@ -1,6 +1,6 @@ fn g() -> ! { fail; } fn f() -> ! { - ret 42i; //~ ERROR expected `_|_` but found `int` + return 42i; //~ ERROR expected `_|_` but found `int` g(); //~ WARNING unreachable statement } fn main() { } diff --git a/src/test/compile-fail/issue-897.rs b/src/test/compile-fail/issue-897.rs index 1adf8534cca..f53d880d10b 100644 --- a/src/test/compile-fail/issue-897.rs +++ b/src/test/compile-fail/issue-897.rs @@ -1,5 +1,5 @@ fn f() -> ! { - ret 42i; //~ ERROR expected `_|_` but found `int` + return 42i; //~ ERROR expected `_|_` but found `int` fail; //~ WARNING unreachable statement } fn main() { } diff --git a/src/test/compile-fail/lambda-mutate-nested.rs b/src/test/compile-fail/lambda-mutate-nested.rs index 8b673e2b307..7eff11daea1 100644 --- a/src/test/compile-fail/lambda-mutate-nested.rs +++ b/src/test/compile-fail/lambda-mutate-nested.rs @@ -5,7 +5,7 @@ fn f2(x: fn()) { x(); } fn main() { let i = 0; - let ctr = fn@ () -> int { f2(|| i = i + 1 ); ret i; }; + let ctr = fn@ () -> int { f2(|| i = i + 1 ); return i; }; log(error, ctr()); log(error, ctr()); log(error, ctr()); diff --git a/src/test/compile-fail/lambda-mutate.rs b/src/test/compile-fail/lambda-mutate.rs index 8886f930e20..15b9bcd8469 100644 --- a/src/test/compile-fail/lambda-mutate.rs +++ b/src/test/compile-fail/lambda-mutate.rs @@ -2,7 +2,7 @@ // Make sure we can't write to upvars from fn@s fn main() { let i = 0; - let ctr = fn@ () -> int { i = i + 1; ret i; }; + let ctr = fn@ () -> int { i = i + 1; return i; }; log(error, ctr()); log(error, ctr()); log(error, ctr()); diff --git a/src/test/compile-fail/liveness-break-uninit-2.rs b/src/test/compile-fail/liveness-break-uninit-2.rs index fc1c941836e..029d0aef9da 100644 --- a/src/test/compile-fail/liveness-break-uninit-2.rs +++ b/src/test/compile-fail/liveness-break-uninit-2.rs @@ -8,7 +8,7 @@ fn foo() -> int { log(debug, x); //~ ERROR use of possibly uninitialized variable: `x` - ret 17; + return 17; } fn main() { log(debug, foo()); } diff --git a/src/test/compile-fail/liveness-break-uninit.rs b/src/test/compile-fail/liveness-break-uninit.rs index 56753a3a95c..3729d2e8b22 100644 --- a/src/test/compile-fail/liveness-break-uninit.rs +++ b/src/test/compile-fail/liveness-break-uninit.rs @@ -8,7 +8,7 @@ fn foo() -> int { log(debug, x); //~ ERROR use of possibly uninitialized variable: `x` - ret 17; + return 17; } fn main() { log(debug, foo()); } diff --git a/src/test/compile-fail/liveness-forgot-ret.rs b/src/test/compile-fail/liveness-forgot-ret.rs index 4d78b7a7aff..84d0ccd641e 100644 --- a/src/test/compile-fail/liveness-forgot-ret.rs +++ b/src/test/compile-fail/liveness-forgot-ret.rs @@ -1,8 +1,8 @@ // -*- rust -*- // error-pattern: not all control paths return a value -fn god_exists(a: int) -> bool { ret god_exists(a); } +fn god_exists(a: int) -> bool { return god_exists(a); } -fn f(a: int) -> int { if god_exists(a) { ret 5; }; } +fn f(a: int) -> int { if god_exists(a) { return 5; }; } fn main() { f(12); } diff --git a/src/test/compile-fail/liveness-init-in-called-fn-expr.rs b/src/test/compile-fail/liveness-init-in-called-fn-expr.rs index 5716a380936..59bbe0e14c8 100644 --- a/src/test/compile-fail/liveness-init-in-called-fn-expr.rs +++ b/src/test/compile-fail/liveness-init-in-called-fn-expr.rs @@ -1,7 +1,7 @@ fn main() { let j = fn@() -> int { let i: int; - ret i; //~ ERROR use of possibly uninitialized variable: `i` + return i; //~ ERROR use of possibly uninitialized variable: `i` }; j(); } diff --git a/src/test/compile-fail/liveness-init-in-fn-expr.rs b/src/test/compile-fail/liveness-init-in-fn-expr.rs index cffba2132c2..ebd128905d8 100644 --- a/src/test/compile-fail/liveness-init-in-fn-expr.rs +++ b/src/test/compile-fail/liveness-init-in-fn-expr.rs @@ -1,7 +1,7 @@ fn main() { let f = fn@() -> int { let i: int; - ret i; //~ ERROR use of possibly uninitialized variable: `i` + return i; //~ ERROR use of possibly uninitialized variable: `i` }; log(error, f()); } diff --git a/src/test/compile-fail/liveness-missing-ret2.rs b/src/test/compile-fail/liveness-missing-ret2.rs index 54d8de63014..8cb365afbf6 100644 --- a/src/test/compile-fail/liveness-missing-ret2.rs +++ b/src/test/compile-fail/liveness-missing-ret2.rs @@ -1,7 +1,7 @@ // error-pattern: not all control paths return a value fn f() -> int { - // Make sure typestate doesn't interpret this alt expression + // Make sure typestate doesn't interpreturn this alt expression // as the function result alt check true { true { } }; } diff --git a/src/test/compile-fail/liveness-return.rs b/src/test/compile-fail/liveness-return.rs index 830eb9f8e89..c993ddd24b7 100644 --- a/src/test/compile-fail/liveness-return.rs +++ b/src/test/compile-fail/liveness-return.rs @@ -1,6 +1,6 @@ fn f() -> int { let x: int; - ret x; //~ ERROR use of possibly uninitialized variable: `x` + return x; //~ ERROR use of possibly uninitialized variable: `x` } fn main() { f(); } diff --git a/src/test/compile-fail/liveness-while.rs b/src/test/compile-fail/liveness-while.rs index 9cd61330bae..cfa555b1e35 100644 --- a/src/test/compile-fail/liveness-while.rs +++ b/src/test/compile-fail/liveness-while.rs @@ -1,7 +1,7 @@ fn f() -> int { let mut x: int; while 1 == 1 { x = 10; } - ret x; //~ ERROR use of possibly uninitialized variable: `x` + return x; //~ ERROR use of possibly uninitialized variable: `x` } fn main() { f(); } diff --git a/src/test/compile-fail/loop-does-not-diverge.rs b/src/test/compile-fail/loop-does-not-diverge.rs index 06a227cffd2..6f9b74a4ad7 100644 --- a/src/test/compile-fail/loop-does-not-diverge.rs +++ b/src/test/compile-fail/loop-does-not-diverge.rs @@ -4,7 +4,7 @@ fn forever() -> ! { loop { break; } - ret 42i; //~ ERROR expected `_|_` but found `int` + return 42i; //~ ERROR expected `_|_` but found `int` } fn main() { diff --git a/src/test/compile-fail/macro-2.rs b/src/test/compile-fail/macro-2.rs index 71ae833a139..c2c3d0127c5 100644 --- a/src/test/compile-fail/macro-2.rs +++ b/src/test/compile-fail/macro-2.rs @@ -2,7 +2,7 @@ fn main() { #macro[[#mylambda[x, body], { - fn f(x: int) -> int { ret body } + fn f(x: int) -> int { return body } f }]]; diff --git a/src/test/compile-fail/nested-ty-params.rs b/src/test/compile-fail/nested-ty-params.rs index de696f21b25..54d4d8e4817 100644 --- a/src/test/compile-fail/nested-ty-params.rs +++ b/src/test/compile-fail/nested-ty-params.rs @@ -1,6 +1,6 @@ // error-pattern:attempt to use a type argument out of scope fn hd<U>(v: ~[U]) -> U { - fn hd1(w: [U]) -> U { ret w[0]; } + fn hd1(w: [U]) -> U { return w[0]; } - ret hd1(v); + return hd1(v); } diff --git a/src/test/compile-fail/pattern-tyvar-2.rs b/src/test/compile-fail/pattern-tyvar-2.rs index 4d60457d87f..3e9648e19c9 100644 --- a/src/test/compile-fail/pattern-tyvar-2.rs +++ b/src/test/compile-fail/pattern-tyvar-2.rs @@ -8,6 +8,6 @@ import option::some; enum bar { t1((), option<~[int]>), t2, } -fn foo(t: bar) -> int { alt t { t1(_, some(x)) { ret x * 3; } _ { fail; } } } +fn foo(t: bar) -> int { alt t { t1(_, some(x)) { return x * 3; } _ { fail; } } } fn main() { } diff --git a/src/test/compile-fail/pure-loop-body.rs b/src/test/compile-fail/pure-loop-body.rs index e418a2f201f..bcc23d3c0d9 100644 --- a/src/test/compile-fail/pure-loop-body.rs +++ b/src/test/compile-fail/pure-loop-body.rs @@ -1,7 +1,7 @@ pure fn range(from: uint, to: uint, f: fn(uint) -> bool) { let mut i = from; while i < to { - if !f(i) {ret;} // Note: legal to call argument, even if it is not pure. + if !f(i) {return;} // Note: legal to call argument, even if it is not pure. i += 1u; } } diff --git a/src/test/compile-fail/regions-bounds.rs b/src/test/compile-fail/regions-bounds.rs index e62b702e53f..e795c5b8686 100644 --- a/src/test/compile-fail/regions-bounds.rs +++ b/src/test/compile-fail/regions-bounds.rs @@ -7,21 +7,21 @@ trait a_trait { fn foo() -> &self/int; } class a_class { let x:&self/int; new(x:&self/int) { self.x = x; } } fn a_fn1(e: an_enum/&a) -> an_enum/&b { - ret e; //~ ERROR mismatched types: expected `an_enum/&b` but found `an_enum/&a` + return e; //~ ERROR mismatched types: expected `an_enum/&b` but found `an_enum/&a` } fn a_fn2(e: a_trait/&a) -> a_trait/&b { - ret e; //~ ERROR mismatched types: expected `a_trait/&b` but found `a_trait/&a` + return e; //~ ERROR mismatched types: expected `a_trait/&b` but found `a_trait/&a` } fn a_fn3(e: a_class/&a) -> a_class/&b { - ret e; //~ ERROR mismatched types: expected `a_class/&b` but found `a_class/&a` + return e; //~ ERROR mismatched types: expected `a_class/&b` but found `a_class/&a` } fn a_fn4(e: int/&a) -> int/&b { //~^ ERROR region parameters are not allowed on this type //~^^ ERROR region parameters are not allowed on this type - ret e; + return e; } fn main() { } \ No newline at end of file diff --git a/src/test/compile-fail/regions-creating-enums.rs b/src/test/compile-fail/regions-creating-enums.rs index 5924164ef26..02780c70ed8 100644 --- a/src/test/compile-fail/regions-creating-enums.rs +++ b/src/test/compile-fail/regions-creating-enums.rs @@ -20,12 +20,12 @@ fn compute(x: &ast) -> uint { fn map_nums(x: &ast, f: fn(uint) -> uint) -> &ast { alt *x { num(x) { - ret &num(f(x)); //~ ERROR illegal borrow + return &num(f(x)); //~ ERROR illegal borrow } add(x, y) { let m_x = map_nums(x, f); let m_y = map_nums(y, f); - ret &add(m_x, m_y); //~ ERROR illegal borrow + return &add(m_x, m_y); //~ ERROR illegal borrow } } } diff --git a/src/test/compile-fail/regions-iface-2.rs b/src/test/compile-fail/regions-iface-2.rs index c034f8a753a..98b9797df62 100644 --- a/src/test/compile-fail/regions-iface-2.rs +++ b/src/test/compile-fail/regions-iface-2.rs @@ -13,7 +13,7 @@ impl of get_ctxt for has_ctxt { fn make_gc() -> get_ctxt { let ctxt = { v: 22u }; let hc = { c: &ctxt }; - ret hc as get_ctxt; //~ ERROR mismatched types: expected `get_ctxt/&` + return hc as get_ctxt; //~ ERROR mismatched types: expected `get_ctxt/&` } fn main() { diff --git a/src/test/compile-fail/regions-iface-3.rs b/src/test/compile-fail/regions-iface-3.rs index 78e77d66def..a0be6c90177 100644 --- a/src/test/compile-fail/regions-iface-3.rs +++ b/src/test/compile-fail/regions-iface-3.rs @@ -3,11 +3,11 @@ trait get_ctxt { } fn make_gc1(gc: get_ctxt/&a) -> get_ctxt/&b { - ret gc; //~ ERROR mismatched types: expected `get_ctxt/&b` but found `get_ctxt/&a` + return gc; //~ ERROR mismatched types: expected `get_ctxt/&b` but found `get_ctxt/&a` } fn make_gc2(gc: get_ctxt/&a) -> get_ctxt/&b { - ret gc as get_ctxt; //~ ERROR mismatched types: expected `get_ctxt/&b` but found `get_ctxt/&a` + return gc as get_ctxt; //~ ERROR mismatched types: expected `get_ctxt/&b` but found `get_ctxt/&a` } fn main() { diff --git a/src/test/compile-fail/regions-infer-borrow-scope-too-big.rs b/src/test/compile-fail/regions-infer-borrow-scope-too-big.rs index 2f4003f0f3a..dd2968504ee 100644 --- a/src/test/compile-fail/regions-infer-borrow-scope-too-big.rs +++ b/src/test/compile-fail/regions-infer-borrow-scope-too-big.rs @@ -1,13 +1,13 @@ type point = {x: int, y: int}; fn x_coord(p: &point) -> &int { - ret &p.x; + return &p.x; } fn foo(p: @point) -> &int { let xc = x_coord(p); //~ ERROR illegal borrow assert *xc == 3; - ret xc; + return xc; } fn main() {} diff --git a/src/test/compile-fail/regions-nested-fns-2.rs b/src/test/compile-fail/regions-nested-fns-2.rs index ad22140b3b5..04c5145cbf2 100644 --- a/src/test/compile-fail/regions-nested-fns-2.rs +++ b/src/test/compile-fail/regions-nested-fns-2.rs @@ -3,8 +3,8 @@ fn ignore<T>(_t: T) {} fn nested() { let y = 3; ignore(fn&(z: &z/int) -> &z/int { - if false { ret &y; } //~ ERROR illegal borrow - ret z; + if false { return &y; } //~ ERROR illegal borrow + return z; }); } diff --git a/src/test/compile-fail/regions-nested-fns.rs b/src/test/compile-fail/regions-nested-fns.rs index bd6e3644556..9d9116d10b2 100644 --- a/src/test/compile-fail/regions-nested-fns.rs +++ b/src/test/compile-fail/regions-nested-fns.rs @@ -11,9 +11,9 @@ fn nested(x: &x/int) { }); ignore(fn&(z: &z/int) -> &z/int { - if false { ret x; } //~ ERROR mismatched types - if false { ret ay; } //~ ERROR mismatched types - ret z; + if false { return x; } //~ ERROR mismatched types + if false { return ay; } //~ ERROR mismatched types + return z; }); } diff --git a/src/test/compile-fail/regions-ret.rs b/src/test/compile-fail/regions-ret.rs index 9c1bf26b400..b764fdbff9d 100644 --- a/src/test/compile-fail/regions-ret.rs +++ b/src/test/compile-fail/regions-ret.rs @@ -1,5 +1,5 @@ fn f(_x : &a/int) -> &a/int { - ret &3; //~ ERROR illegal borrow + return &3; //~ ERROR illegal borrow } fn main() { diff --git a/src/test/compile-fail/regions-scoping.rs b/src/test/compile-fail/regions-scoping.rs index c17319ca7bb..7b996cf4735 100644 --- a/src/test/compile-fail/regions-scoping.rs +++ b/src/test/compile-fail/regions-scoping.rs @@ -9,18 +9,18 @@ fn nested(x: &x/int) { // (1) z: &z/int) -> &z/int) // A fresh region `z` (3) -> &x/int { - if false { ret z(x, x, x); } //~ ERROR mismatched types: expected `&y/int` but found `&x/int` - if false { ret z(x, x, y); } //~ ERROR mismatched types: expected `&y/int` but found `&x/int` + if false { return z(x, x, x); } //~ ERROR mismatched types: expected `&y/int` but found `&x/int` + if false { return z(x, x, y); } //~ ERROR mismatched types: expected `&y/int` but found `&x/int` //~^ ERROR mismatched types: expected `&x/int` but found `&y/int` - if false { ret z(x, y, x); } - if false { ret z(x, y, y); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` - if false { ret z(y, x, x); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` + if false { return z(x, y, x); } + if false { return z(x, y, y); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` + if false { return z(y, x, x); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` //~^ ERROR mismatched types: expected `&y/int` but found `&x/int` - if false { ret z(y, x, y); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` + if false { return z(y, x, y); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` //~^ ERROR mismatched types: expected `&y/int` but found `&x/int` //~^^ ERROR mismatched types: expected `&x/int` but found `&y/int` - if false { ret z(y, y, x); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` - if false { ret z(y, y, y); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` + if false { return z(y, y, x); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` + if false { return z(y, y, y); } //~ ERROR mismatched types: expected `&x/int` but found `&y/int` //~^ ERROR mismatched types: expected `&x/int` but found `&y/int` fail; } diff --git a/src/test/compile-fail/ret-non-nil.rs b/src/test/compile-fail/ret-non-nil.rs index 4153f413dc0..ad9fcef4f52 100644 --- a/src/test/compile-fail/ret-non-nil.rs +++ b/src/test/compile-fail/ret-non-nil.rs @@ -1,7 +1,7 @@ -// error-pattern: `ret;` in function returning non-nil +// error-pattern: `return;` in function returning non-nil -fn f() { ret; } +fn f() { return; } -fn g() -> int { ret; } +fn g() -> int { return; } fn main() { f(); g(); } diff --git a/src/test/compile-fail/sendfn-is-not-a-lambda.rs b/src/test/compile-fail/sendfn-is-not-a-lambda.rs index 5aee9cd6fa7..081c400d71d 100644 --- a/src/test/compile-fail/sendfn-is-not-a-lambda.rs +++ b/src/test/compile-fail/sendfn-is-not-a-lambda.rs @@ -1,8 +1,8 @@ fn test(f: fn@(uint) -> uint) -> uint { - ret f(22u); + return f(22u); } fn main() { - let f = fn~(x: uint) -> uint { ret 4u; }; + let f = fn~(x: uint) -> uint { return 4u; }; log(debug, test(f)); //~ ERROR expected `fn@(uint) -> uint` } diff --git a/src/test/compile-fail/tail-typeck.rs b/src/test/compile-fail/tail-typeck.rs index 0c64e9d9556..844fa8b285e 100644 --- a/src/test/compile-fail/tail-typeck.rs +++ b/src/test/compile-fail/tail-typeck.rs @@ -1,7 +1,7 @@ // error-pattern: mismatched types -fn f() -> int { ret g(); } +fn f() -> int { return g(); } -fn g() -> uint { ret 0u; } +fn g() -> uint { return 0u; } fn main() { let y = f(); } diff --git a/src/test/compile-fail/tps-invariant-iface.rs b/src/test/compile-fail/tps-invariant-iface.rs index 82fbd5f1163..93ad8a72ac3 100644 --- a/src/test/compile-fail/tps-invariant-iface.rs +++ b/src/test/compile-fail/tps-invariant-iface.rs @@ -8,7 +8,7 @@ enum box_impl<T> = { }; impl<T:copy> of box_trait<T> for box_impl<T> { - fn get() -> T { ret self.f; } + fn get() -> T { return self.f; } fn set(t: T) { self.f = t; } } diff --git a/src/test/compile-fail/unsafe-fn-assign-deref-ptr.rs b/src/test/compile-fail/unsafe-fn-assign-deref-ptr.rs index 03af39ab7fc..98670900da5 100644 --- a/src/test/compile-fail/unsafe-fn-assign-deref-ptr.rs +++ b/src/test/compile-fail/unsafe-fn-assign-deref-ptr.rs @@ -2,7 +2,7 @@ fn f(p: *u8) { *p = 0u8; //~ ERROR dereference of unsafe pointer requires unsafe function or block - ret; + return; } fn main() { diff --git a/src/test/compile-fail/unsafe-fn-autoderef.rs b/src/test/compile-fail/unsafe-fn-autoderef.rs index b4ab76dc0c9..a6ce6e2033a 100644 --- a/src/test/compile-fail/unsafe-fn-autoderef.rs +++ b/src/test/compile-fail/unsafe-fn-autoderef.rs @@ -15,7 +15,7 @@ fn f(p: *rec) -> int { // are prohibited by various checks, such as that the enum is // instantiable and so forth). - ret p.f; //~ ERROR attempted access of field `f` on type `*rec` + return p.f; //~ ERROR attempted access of field `f` on type `*rec` } fn main() { diff --git a/src/test/compile-fail/unsafe-fn-called-from-safe.rs b/src/test/compile-fail/unsafe-fn-called-from-safe.rs index d7681a2ec60..08df19de658 100644 --- a/src/test/compile-fail/unsafe-fn-called-from-safe.rs +++ b/src/test/compile-fail/unsafe-fn-called-from-safe.rs @@ -1,6 +1,6 @@ // -*- rust -*- -unsafe fn f() { ret; } +unsafe fn f() { return; } fn main() { f(); //~ ERROR access to unsafe function requires unsafe function or block diff --git a/src/test/compile-fail/unsafe-fn-deref-ptr.rs b/src/test/compile-fail/unsafe-fn-deref-ptr.rs index e66bf5eb687..affa1dc7ac4 100644 --- a/src/test/compile-fail/unsafe-fn-deref-ptr.rs +++ b/src/test/compile-fail/unsafe-fn-deref-ptr.rs @@ -1,7 +1,7 @@ // -*- rust -*- fn f(p: *u8) -> u8 { - ret *p; //~ ERROR dereference of unsafe pointer requires unsafe function or block + return *p; //~ ERROR dereference of unsafe pointer requires unsafe function or block } fn main() { diff --git a/src/test/compile-fail/unsafe-fn-used-as-value.rs b/src/test/compile-fail/unsafe-fn-used-as-value.rs index 7dc0ce4a12b..f71f36f3f60 100644 --- a/src/test/compile-fail/unsafe-fn-used-as-value.rs +++ b/src/test/compile-fail/unsafe-fn-used-as-value.rs @@ -1,6 +1,6 @@ // -*- rust -*- -unsafe fn f() { ret; } +unsafe fn f() { return; } fn main() { let x = f; //~ ERROR access to unsafe function requires unsafe function or block diff --git a/src/test/compile-fail/unused-imports-warn.rs b/src/test/compile-fail/unused-imports-warn.rs index a81b8301a9f..be716bf8804 100644 --- a/src/test/compile-fail/unused-imports-warn.rs +++ b/src/test/compile-fail/unused-imports-warn.rs @@ -11,7 +11,7 @@ mod bar { mod c { import foo::point; import foo::square; - fn cc(p: point) -> str { ret 2 * (p.x + p.y); } + fn cc(p: point) -> str { return 2 * (p.x + p.y); } } } diff --git a/src/test/compile-fail/vec-concat-bug.rs b/src/test/compile-fail/vec-concat-bug.rs index 33873c087a5..afbb57f5878 100644 --- a/src/test/compile-fail/vec-concat-bug.rs +++ b/src/test/compile-fail/vec-concat-bug.rs @@ -7,7 +7,7 @@ fn concat<T: copy>(v: ~[const ~[const T]]) -> ~[T] { r += inner; }); - ret r; + return r; } fn main() {} \ No newline at end of file diff --git a/src/test/compile-fail/wrong-ret-type.rs b/src/test/compile-fail/wrong-ret-type.rs index 82293a8f706..9db0a582c34 100644 --- a/src/test/compile-fail/wrong-ret-type.rs +++ b/src/test/compile-fail/wrong-ret-type.rs @@ -1,3 +1,3 @@ // error-pattern: mismatched types -fn mk_int() -> uint { let i: int = 3; ret i; } +fn mk_int() -> uint { let i: int = 3; return i; } fn main() { } diff --git a/src/test/pretty/blank-lines.rs b/src/test/pretty/blank-lines.rs index 2c22432401b..3ef46a721ae 100644 --- a/src/test/pretty/blank-lines.rs +++ b/src/test/pretty/blank-lines.rs @@ -11,5 +11,5 @@ fn f() -> [int]/3 { - ret enterprise; + return enterprise; } diff --git a/src/test/pretty/block-arg-disambig.rs b/src/test/pretty/block-arg-disambig.rs index 8a4297d95b2..ea4563a579c 100644 --- a/src/test/pretty/block-arg-disambig.rs +++ b/src/test/pretty/block-arg-disambig.rs @@ -1,5 +1,5 @@ // FIXME: The disambiguation the pretty printer does here // is probably not necessary anymore (#2882) -fn blk1(b: fn()) -> fn@() { ret fn@() { }; } +fn blk1(b: fn()) -> fn@() { return fn@() { }; } fn test1() { (do blk1 { debug!{"hi"}; })(); } diff --git a/src/test/pretty/disamb-stmt-expr.rs b/src/test/pretty/disamb-stmt-expr.rs index 546020b6cd8..61323152af1 100644 --- a/src/test/pretty/disamb-stmt-expr.rs +++ b/src/test/pretty/disamb-stmt-expr.rs @@ -1,8 +1,8 @@ // pp-exact // Here we check that the parentheses around the body of `wsucc()` are -// preserved. They are needed to disambiguate `{ret n+1}; - 0` from -// `({ret n+1}-0)`. +// preserved. They are needed to disambiguate `{return n+1}; - 0` from +// `({return n+1}-0)`. fn id(f: fn() -> int) -> int { f() } diff --git a/src/test/run-fail/expr-alt-fail-fn.rs b/src/test/run-fail/expr-alt-fail-fn.rs index bf6898ed297..5a1d410bec1 100644 --- a/src/test/run-fail/expr-alt-fail-fn.rs +++ b/src/test/run-fail/expr-alt-fail-fn.rs @@ -4,6 +4,6 @@ // error-pattern:explicit failure fn f() -> ! { fail } -fn g() -> int { let x = alt true { true { f() } false { 10 } }; ret x; } +fn g() -> int { let x = alt true { true { f() } false { 10 } }; return x; } fn main() { g(); } diff --git a/src/test/run-fail/expr-if-fail-fn.rs b/src/test/run-fail/expr-if-fail-fn.rs index 406302532fa..31989707f4f 100644 --- a/src/test/run-fail/expr-if-fail-fn.rs +++ b/src/test/run-fail/expr-if-fail-fn.rs @@ -4,6 +4,6 @@ // error-pattern:explicit failure fn f() -> ! { fail } -fn g() -> int { let x = if true { f() } else { 10 }; ret x; } +fn g() -> int { let x = if true { f() } else { 10 }; return x; } fn main() { g(); } diff --git a/src/test/run-fail/if-check-fail.rs b/src/test/run-fail/if-check-fail.rs index 0ca92ab18c4..e6f109745ae 100644 --- a/src/test/run-fail/if-check-fail.rs +++ b/src/test/run-fail/if-check-fail.rs @@ -1,8 +1,8 @@ // error-pattern:Number is odd pure fn even(x: uint) -> bool { if x < 2u { - ret false; - } else if x == 2u { ret true; } else { ret even(x - 2u); } + return false; + } else if x == 2u { return true; } else { return even(x - 2u); } } fn foo(x: uint) { diff --git a/src/test/run-fail/unwind-misc-1.rs b/src/test/run-fail/unwind-misc-1.rs index 7a0324a0f16..ea25bb76545 100644 --- a/src/test/run-fail/unwind-misc-1.rs +++ b/src/test/run-fail/unwind-misc-1.rs @@ -9,10 +9,10 @@ fn main() { let count = @mut 0u; fn hash(&&s: ~[@~str]) -> uint { if (vec::len(s) > 0u && str::eq(*s[0], ~"boom")) { fail; } - ret 10u; + return 10u; } fn eq(&&s: ~[@~str], &&t: ~[@~str]) -> bool { - ret s == t; + return s == t; } let map = map::hashmap(hash, eq); diff --git a/src/test/run-fail/zip-different-lengths.rs b/src/test/run-fail/zip-different-lengths.rs index 5f29e83f8f8..85bceea0ca2 100644 --- a/src/test/run-fail/zip-different-lengths.rs +++ b/src/test/run-fail/zip-different-lengths.rs @@ -11,7 +11,7 @@ fn enum_chars(start: u8, end: u8) -> ~[char] { let mut i = start; let mut r = ~[]; while i <= end { vec::push(r, i as char); i += 1u as u8; } - ret r; + return r; } fn enum_uints(start: uint, end: uint) -> ~[uint] { @@ -19,7 +19,7 @@ fn enum_uints(start: uint, end: uint) -> ~[uint] { let mut i = start; let mut r = ~[]; while i <= end { vec::push(r, i); i += 1u; } - ret r; + return r; } fn main() { diff --git a/src/test/run-pass-fulldeps/issue-1926.rs b/src/test/run-pass-fulldeps/issue-1926.rs index 5a19fb96464..5d7a11ca0d8 100644 --- a/src/test/run-pass-fulldeps/issue-1926.rs +++ b/src/test/run-pass-fulldeps/issue-1926.rs @@ -18,7 +18,7 @@ fn new_parse_sess() -> parser::parse_sess { mut chpos: 0u, mut byte_pos: 0u }; - ret sess; + return sess; } trait fake_ext_ctxt { diff --git a/src/test/run-pass/alias-uninit-value.rs b/src/test/run-pass/alias-uninit-value.rs index 866ed58f842..699ee7ada70 100644 --- a/src/test/run-pass/alias-uninit-value.rs +++ b/src/test/run-pass/alias-uninit-value.rs @@ -10,7 +10,7 @@ enum sty { ty_nil, } type raw_t = {struct: sty, cname: option<~str>, hash: uint}; fn mk_raw_ty(st: sty, cname: option<~str>) -> raw_t { - ret {struct: st, cname: cname, hash: 0u}; + return {struct: st, cname: cname, hash: 0u}; } fn main() { mk_raw_ty(ty_nil, none::<~str>); } diff --git a/src/test/run-pass/alloca-from-derived-tydesc.rs b/src/test/run-pass/alloca-from-derived-tydesc.rs index 4f6f215226e..2a1599cd074 100644 --- a/src/test/run-pass/alloca-from-derived-tydesc.rs +++ b/src/test/run-pass/alloca-from-derived-tydesc.rs @@ -2,6 +2,6 @@ enum option<T> { some(T), none, } type r<T> = {mut v: ~[option<T>]}; -fn f<T>() -> ~[T] { ret ~[]; } +fn f<T>() -> ~[T] { return ~[]; } fn main() { let r: r<int> = {mut v: ~[]}; r.v = f(); } diff --git a/src/test/run-pass/alt-bot-2.rs b/src/test/run-pass/alt-bot-2.rs index e3fd606c2d8..341fcdc38d5 100644 --- a/src/test/run-pass/alt-bot-2.rs +++ b/src/test/run-pass/alt-bot-2.rs @@ -1,3 +1,3 @@ // n.b. This was only ever failing with optimization disabled. -fn a() -> int { alt check ret 1 { 2 { 3 } } } +fn a() -> int { alt check return 1 { 2 { 3 } } } fn main() { a(); } diff --git a/src/test/run-pass/alt-join.rs b/src/test/run-pass/alt-join.rs index 637c2c8dabf..2ba2fedb386 100644 --- a/src/test/run-pass/alt-join.rs +++ b/src/test/run-pass/alt-join.rs @@ -10,7 +10,7 @@ fn foo<T>(y: option<T>) { if true { } else { alt y { none::<T> { x = 17; } _ { x = 42; } } rs += ~[x]; } - ret; + return; } fn main() { debug!{"hello"}; foo::<int>(some::<int>(5)); } diff --git a/src/test/run-pass/alt-pattern-lit.rs b/src/test/run-pass/alt-pattern-lit.rs index e904818d688..aba7336a23b 100644 --- a/src/test/run-pass/alt-pattern-lit.rs +++ b/src/test/run-pass/alt-pattern-lit.rs @@ -2,8 +2,8 @@ fn altlit(f: int) -> int { alt check f { - 10 { debug!{"case 10"}; ret 20; } - 11 { debug!{"case 11"}; ret 22; } + 10 { debug!{"case 10"}; return 20; } + 11 { debug!{"case 11"}; return 22; } } } diff --git a/src/test/run-pass/alt-tag.rs b/src/test/run-pass/alt-tag.rs index 98fdb9ee2b8..f58eb29edb2 100644 --- a/src/test/run-pass/alt-tag.rs +++ b/src/test/run-pass/alt-tag.rs @@ -15,7 +15,7 @@ fn process(c: color) -> int { rgba(_, _, _, a) { debug!{"rgba"}; log(debug, a); x = a; } hsl(_, s, _) { debug!{"hsl"}; log(debug, s); x = s; } } - ret x; + return x; } fn main() { diff --git a/src/test/run-pass/alt-with-ret-arm.rs b/src/test/run-pass/alt-with-ret-arm.rs index b12841dd229..74a7e36a6e6 100644 --- a/src/test/run-pass/alt-with-ret-arm.rs +++ b/src/test/run-pass/alt-with-ret-arm.rs @@ -3,7 +3,7 @@ fn main() { // the right type for f, as we unified // bot and u32 here let f = alt uint::from_str(~"1234") { - none { ret () } + none { return () } some(num) { num as u32 } }; assert f == 1234u32; diff --git a/src/test/run-pass/argument-passing.rs b/src/test/run-pass/argument-passing.rs index 4a349a827a4..1d1ae9c785f 100644 --- a/src/test/run-pass/argument-passing.rs +++ b/src/test/run-pass/argument-passing.rs @@ -2,10 +2,10 @@ fn f1(a: {mut x: int}, &b: int, -c: int) -> int { let r = a.x + b + c; a.x = 0; b = 10; - ret r; + return r; } -fn f2(a: int, f: fn(int)) -> int { f(1); ret a; } +fn f2(a: int, f: fn(int)) -> int { f(1); return a; } fn main() { let mut a = {mut x: 1}, b = 2, c = 3; diff --git a/src/test/run-pass/artificial-block.rs b/src/test/run-pass/artificial-block.rs index 87c7cc149f6..e8d8a3821d1 100644 --- a/src/test/run-pass/artificial-block.rs +++ b/src/test/run-pass/artificial-block.rs @@ -1,3 +1,3 @@ -fn f() -> int { { ret 3; } } +fn f() -> int { { return 3; } } fn main() { assert (f() == 3); } diff --git a/src/test/run-pass/assignability-iface.rs b/src/test/run-pass/assignability-iface.rs index f555f61f5b8..b5a3fd8af61 100644 --- a/src/test/run-pass/assignability-iface.rs +++ b/src/test/run-pass/assignability-iface.rs @@ -21,7 +21,7 @@ impl vec<A> of iterable<A> for ~[A] { fn length<A, T: iterable<A>>(x: T) -> uint { let mut len = 0; for x.iterate() |_y| { len += 1 } - ret len; + return len; } fn main() { diff --git a/src/test/run-pass/auto-instantiate.rs b/src/test/run-pass/auto-instantiate.rs index 0d5429e1980..522ead87c73 100644 --- a/src/test/run-pass/auto-instantiate.rs +++ b/src/test/run-pass/auto-instantiate.rs @@ -2,7 +2,7 @@ // -*- rust -*- -fn f<T: copy, U: copy>(x: T, y: U) -> {a: T, b: U} { ret {a: x, b: y}; } +fn f<T: copy, U: copy>(x: T, y: U) -> {a: T, b: U} { return {a: x, b: y}; } fn main() { log(debug, f({x: 3, y: 4, z: 5}, 4).a.x); diff --git a/src/test/run-pass/autobind.rs b/src/test/run-pass/autobind.rs index 4b8f33e45bb..ad3b1366fca 100644 --- a/src/test/run-pass/autobind.rs +++ b/src/test/run-pass/autobind.rs @@ -1,6 +1,6 @@ -fn f<T: copy>(x: ~[T]) -> T { ret x[0]; } +fn f<T: copy>(x: ~[T]) -> T { return x[0]; } -fn g(act: fn(~[int]) -> int) -> int { ret act(~[1, 2, 3]); } +fn g(act: fn(~[int]) -> int) -> int { return act(~[1, 2, 3]); } fn main() { assert (g(f) == 1); diff --git a/src/test/run-pass/basic.rs b/src/test/run-pass/basic.rs index 786b34cb984..311b1f2a1f0 100644 --- a/src/test/run-pass/basic.rs +++ b/src/test/run-pass/basic.rs @@ -18,13 +18,13 @@ fn a(c: chan<int>) { send(c, 10); } -fn k(x: int) -> int { ret 15; } +fn k(x: int) -> int { return 15; } fn g(x: int, y: ~str) -> int { log(debug, x); log(debug, y); let z: int = k(1); - ret z; + return z; } fn main() { diff --git a/src/test/run-pass/block-arg-call-as.rs b/src/test/run-pass/block-arg-call-as.rs index 94c55ba33a1..348e2ef9cae 100644 --- a/src/test/run-pass/block-arg-call-as.rs +++ b/src/test/run-pass/block-arg-call-as.rs @@ -1,19 +1,19 @@ use std; fn asSendfn( f : fn~()->uint ) -> uint { - ret f(); + return f(); } fn asLambda( f : fn@()->uint ) -> uint { - ret f(); + return f(); } fn asBlock( f : fn&()->uint ) -> uint { - ret f(); + return f(); } fn asAny( f : fn()->uint ) -> uint { - ret f(); + return f(); } fn main() { diff --git a/src/test/run-pass/block-arg-in-parentheses.rs b/src/test/run-pass/block-arg-in-parentheses.rs index 4d479418877..14b05b29dc3 100644 --- a/src/test/run-pass/block-arg-in-parentheses.rs +++ b/src/test/run-pass/block-arg-in-parentheses.rs @@ -14,7 +14,7 @@ fn w_paren2(v: ~[int]) -> int { } fn w_ret(v: ~[int]) -> int { - ret do vec::foldl(0, v) |x,y| { x+y } - 10; + return do vec::foldl(0, v) |x,y| { x+y } - 10; } fn main() { diff --git a/src/test/run-pass/block-arg-used-as-any.rs b/src/test/run-pass/block-arg-used-as-any.rs index 257d7c25831..426bffe2f95 100644 --- a/src/test/run-pass/block-arg-used-as-any.rs +++ b/src/test/run-pass/block-arg-used-as-any.rs @@ -1,5 +1,5 @@ fn call_any(f: fn() -> uint) -> uint { - ret f(); + return f(); } fn main() { diff --git a/src/test/run-pass/block-arg-used-as-lambda.rs b/src/test/run-pass/block-arg-used-as-lambda.rs index 46f3276a4e5..1eb1c4f7907 100644 --- a/src/test/run-pass/block-arg-used-as-lambda.rs +++ b/src/test/run-pass/block-arg-used-as-lambda.rs @@ -1,5 +1,5 @@ fn to_lambda(f: fn@(uint) -> uint) -> fn@(uint) -> uint { - ret f; + return f; } fn main() { diff --git a/src/test/run-pass/block-fn-coerce.rs b/src/test/run-pass/block-fn-coerce.rs index 70e6c432c91..cac00bd9a60 100644 --- a/src/test/run-pass/block-fn-coerce.rs +++ b/src/test/run-pass/block-fn-coerce.rs @@ -1,6 +1,6 @@ -fn force(f: fn() -> int) -> int { ret f(); } +fn force(f: fn() -> int) -> int { return f(); } fn main() { - fn f() -> int { ret 7; } + fn f() -> int { return 7; } assert (force(f) == 7); let g = {||force(f)}; assert (g() == 7); diff --git a/src/test/run-pass/borrowck-borrow-from-at-vec.rs b/src/test/run-pass/borrowck-borrow-from-at-vec.rs index 5d3b21783e5..a79b581c562 100644 --- a/src/test/run-pass/borrowck-borrow-from-at-vec.rs +++ b/src/test/run-pass/borrowck-borrow-from-at-vec.rs @@ -1,7 +1,7 @@ fn sum_slice(x: &[int]) -> int { let mut sum = 0; for x.each |i| { sum += i; } - ret sum; + return sum; } fn main() { diff --git a/src/test/run-pass/borrowck-move-from-unsafe-ptr-ok.rs b/src/test/run-pass/borrowck-move-from-unsafe-ptr-ok.rs index ef0803c00d0..7ef868dbac2 100644 --- a/src/test/run-pass/borrowck-move-from-unsafe-ptr-ok.rs +++ b/src/test/run-pass/borrowck-move-from-unsafe-ptr-ok.rs @@ -3,7 +3,7 @@ fn bar(x: *~int) -> ~int { unsafe { let y <- *x; - ret y; + return y; } } diff --git a/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs b/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs index e5ea87b9996..b96a40dc088 100644 --- a/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs +++ b/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs @@ -1,7 +1,7 @@ fn want_slice(v: &[int]) -> int { let mut sum = 0; for vec::each(v) |i| { sum += i; } - ret sum; + return sum; } fn has_mut_vec(+v: ~[mut int]) -> int { diff --git a/src/test/run-pass/box-inside-if.rs b/src/test/run-pass/box-inside-if.rs index 3366906ec94..e9f9da8d16f 100644 --- a/src/test/run-pass/box-inside-if.rs +++ b/src/test/run-pass/box-inside-if.rs @@ -2,11 +2,11 @@ // -*- rust -*- -fn some_box(x: int) -> @int { ret @x; } +fn some_box(x: int) -> @int { return @x; } -fn is_odd(n: int) -> bool { ret true; } +fn is_odd(n: int) -> bool { return true; } -fn length_is_even(vs: @int) -> bool { ret true; } +fn length_is_even(vs: @int) -> bool { return true; } fn foo(acc: int, n: int) { if is_odd(n) && length_is_even(some_box(1)) { error!{"bloop"}; } diff --git a/src/test/run-pass/box-inside-if2.rs b/src/test/run-pass/box-inside-if2.rs index 97a7a919712..98ca1bc6370 100644 --- a/src/test/run-pass/box-inside-if2.rs +++ b/src/test/run-pass/box-inside-if2.rs @@ -2,11 +2,11 @@ // -*- rust -*- -fn some_box(x: int) -> @int { ret @x; } +fn some_box(x: int) -> @int { return @x; } -fn is_odd(n: int) -> bool { ret true; } +fn is_odd(n: int) -> bool { return true; } -fn length_is_even(vs: @int) -> bool { ret true; } +fn length_is_even(vs: @int) -> bool { return true; } fn foo(acc: int, n: int) { if is_odd(n) || length_is_even(some_box(1)) { error!{"bloop"}; } diff --git a/src/test/run-pass/box-unbox.rs b/src/test/run-pass/box-unbox.rs index 48c7c046d37..e243867b268 100644 --- a/src/test/run-pass/box-unbox.rs +++ b/src/test/run-pass/box-unbox.rs @@ -2,7 +2,7 @@ type box<T: copy> = {c: @T}; -fn unbox<T: copy>(b: box<T>) -> T { ret *b.c; } +fn unbox<T: copy>(b: box<T>) -> T { return *b.c; } fn main() { let foo: int = 17; diff --git a/src/test/run-pass/break-value.rs b/src/test/run-pass/break-value.rs index 3aaadb759f7..6179226abbb 100644 --- a/src/test/run-pass/break-value.rs +++ b/src/test/run-pass/break-value.rs @@ -1,3 +1,3 @@ -fn int_id(x: int) -> int { ret x; } +fn int_id(x: int) -> int { return x; } fn main() { loop { int_id(break); } } diff --git a/src/test/run-pass/c-stack-returning-int64.rs b/src/test/run-pass/c-stack-returning-int64.rs index 7b62553a4e5..dc640d9dda8 100644 --- a/src/test/run-pass/c-stack-returning-int64.rs +++ b/src/test/run-pass/c-stack-returning-int64.rs @@ -9,11 +9,11 @@ extern mod libc { } fn atol(s: ~str) -> int { - ret str::as_buf(s, { |x, _len| libc::atol(x) }); + return str::as_buf(s, { |x, _len| libc::atol(x) }); } fn atoll(s: ~str) -> i64 { - ret str::as_buf(s, { |x, _len| libc::atoll(x) }); + return str::as_buf(s, { |x, _len| libc::atoll(x) }); } fn main() { diff --git a/src/test/run-pass/chan-leak.rs b/src/test/run-pass/chan-leak.rs index ffd115c5b4e..ca3f93a4df6 100644 --- a/src/test/run-pass/chan-leak.rs +++ b/src/test/run-pass/chan-leak.rs @@ -27,7 +27,7 @@ fn new_cx() -> ctx { let t = task::spawn(|| request_task(ch) ); let mut cx: ctx; cx = recv(p); - ret cx; + return cx; } fn main() { diff --git a/src/test/run-pass/class-cast-to-iface-cross-crate.rs b/src/test/run-pass/class-cast-to-iface-cross-crate.rs index 765aba74cc2..deb0462da84 100644 --- a/src/test/run-pass/class-cast-to-iface-cross-crate.rs +++ b/src/test/run-pass/class-cast-to-iface-cross-crate.rs @@ -27,11 +27,11 @@ class cat : to_str { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } diff --git a/src/test/run-pass/class-cast-to-iface.rs b/src/test/run-pass/class-cast-to-iface.rs index 0fba6a7b74b..42e0c9b337b 100644 --- a/src/test/run-pass/class-cast-to-iface.rs +++ b/src/test/run-pass/class-cast-to-iface.rs @@ -26,11 +26,11 @@ class cat : noisy { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } } diff --git a/src/test/run-pass/class-impl-parameterized-iface.rs b/src/test/run-pass/class-impl-parameterized-iface.rs index fe31eb7a380..5c109481a91 100644 --- a/src/test/run-pass/class-impl-parameterized-iface.rs +++ b/src/test/run-pass/class-impl-parameterized-iface.rs @@ -29,11 +29,11 @@ class cat : map<int, bool> { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } diff --git a/src/test/run-pass/class-impl-very-parameterized-iface.rs b/src/test/run-pass/class-impl-very-parameterized-iface.rs index 2a5bcc98f06..ccdd94a934a 100644 --- a/src/test/run-pass/class-impl-very-parameterized-iface.rs +++ b/src/test/run-pass/class-impl-very-parameterized-iface.rs @@ -32,11 +32,11 @@ class cat<T: copy> : map<int, T> { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } diff --git a/src/test/run-pass/class-implement-iface-cross-crate.rs b/src/test/run-pass/class-implement-iface-cross-crate.rs index a66289a7ece..7aa2d9b684c 100644 --- a/src/test/run-pass/class-implement-iface-cross-crate.rs +++ b/src/test/run-pass/class-implement-iface-cross-crate.rs @@ -27,11 +27,11 @@ class cat : noisy { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } } diff --git a/src/test/run-pass/class-implement-ifaces.rs b/src/test/run-pass/class-implement-ifaces.rs index 73a2e685af1..17e0a9902ab 100644 --- a/src/test/run-pass/class-implement-ifaces.rs +++ b/src/test/run-pass/class-implement-ifaces.rs @@ -26,11 +26,11 @@ class cat : noisy { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } } diff --git a/src/test/run-pass/class-implements-multiple-ifaces.rs b/src/test/run-pass/class-implements-multiple-ifaces.rs index 968dfb07bf9..7f57aac1370 100644 --- a/src/test/run-pass/class-implements-multiple-ifaces.rs +++ b/src/test/run-pass/class-implements-multiple-ifaces.rs @@ -21,8 +21,8 @@ trait bitey { } fn vec_includes<T>(xs: ~[T], x: T) -> bool { - for each(xs) |y| { if y == x { ret true; }} - ret false; + for each(xs) |y| { if y == x { return true; }} + return false; } // vtables other than the 1st one don't seem to work @@ -68,7 +68,7 @@ class cat : noisy, scratchy, bitey { let mut rslt = none; for each(all) |thing| { if !self.scratched.contains(thing) { self.scratched.push(thing); - ret some(thing); }} + return some(thing); }} rslt } fn bite() -> body_part { @@ -102,7 +102,7 @@ fn bite_everything<T: bitey>(critter: T) -> bool { left = vec::filter(left, |p| p != part ); } else { - ret false; + return false; } } true diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/run-pass/class-separate-impl.rs index 35c462e9dc2..95f12651b66 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/run-pass/class-separate-impl.rs @@ -26,11 +26,11 @@ class cat { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } } diff --git a/src/test/run-pass/classes.rs b/src/test/run-pass/classes.rs index 175d2c35c77..dbd590fb08f 100644 --- a/src/test/run-pass/classes.rs +++ b/src/test/run-pass/classes.rs @@ -22,11 +22,11 @@ class cat { if self.how_hungry > 0 { error!{"OM NOM NOM"}; self.how_hungry -= 2; - ret true; + return true; } else { error!{"Not hungry!"}; - ret false; + return false; } } } diff --git a/src/test/run-pass/cleanup-copy-mode.rs b/src/test/run-pass/cleanup-copy-mode.rs index 479a0e3d78d..2cf1276887e 100644 --- a/src/test/run-pass/cleanup-copy-mode.rs +++ b/src/test/run-pass/cleanup-copy-mode.rs @@ -1,5 +1,5 @@ // xfail-win32 -fn adder(+x: @int, +y: @int) -> int { ret *x + *y; } +fn adder(+x: @int, +y: @int) -> int { return *x + *y; } fn failer() -> @int { fail; } fn main() { assert(result::is_err(task::try(|| { diff --git a/src/test/run-pass/complex.rs b/src/test/run-pass/complex.rs index 104c312d673..748423429cc 100644 --- a/src/test/run-pass/complex.rs +++ b/src/test/run-pass/complex.rs @@ -13,7 +13,7 @@ fn putint(i: int) { while i < 36 { putstr(~"hi"); i = i + 1; } } -fn zerg(i: int) -> int { ret i; } +fn zerg(i: int) -> int { return i; } fn foo(x: int) -> int { let mut y: t = x + 2; @@ -22,7 +22,7 @@ fn foo(x: int) -> int { let mut z: t; z = 0x55; foo(z); - ret 0; + return 0; } fn main() { diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/run-pass/conditional-compile.rs index 8e99ca0da12..da18e9fabfb 100644 --- a/src/test/run-pass/conditional-compile.rs +++ b/src/test/run-pass/conditional-compile.rs @@ -39,7 +39,7 @@ class r { mod m { // This needs to parse but would fail in typeck. Since it's not in // the current config it should not be typechecked. - fn bogus() { ret 0; } + fn bogus() { return 0; } } mod m { diff --git a/src/test/run-pass/dead-code-one-arm-if.rs b/src/test/run-pass/dead-code-one-arm-if.rs index 0785005fac9..921a1ac8cc6 100644 --- a/src/test/run-pass/dead-code-one-arm-if.rs +++ b/src/test/run-pass/dead-code-one-arm-if.rs @@ -2,4 +2,4 @@ // -*- rust -*- -fn main() { if 1 == 1 { ret; } debug!{"Paul is dead"}; } +fn main() { if 1 == 1 { return; } debug!{"Paul is dead"}; } diff --git a/src/test/run-pass/deep.rs b/src/test/run-pass/deep.rs index 461d3c9ddfd..ca84abc5f60 100644 --- a/src/test/run-pass/deep.rs +++ b/src/test/run-pass/deep.rs @@ -3,7 +3,7 @@ // -*- rust -*- fn f(x: int) -> int { - if x == 1 { ret 1; } else { let y: int = 1 + f(x - 1); ret y; } + if x == 1 { return 1; } else { let y: int = 1 + f(x - 1); return y; } } fn main() { assert (f(5000) == 5000); } diff --git a/src/test/run-pass/drop-on-ret.rs b/src/test/run-pass/drop-on-ret.rs index 16722714bc3..d0e7b572f8c 100644 --- a/src/test/run-pass/drop-on-ret.rs +++ b/src/test/run-pass/drop-on-ret.rs @@ -2,6 +2,6 @@ // -*- rust -*- -fn f() -> int { if true { let s: ~str = ~"should not leak"; ret 1; } ret 0; } +fn f() -> int { if true { let s: ~str = ~"should not leak"; return 1; } return 0; } fn main() { f(); } diff --git a/src/test/run-pass/early-ret-binop-add.rs b/src/test/run-pass/early-ret-binop-add.rs index 977536cd57c..efe2ffae100 100644 --- a/src/test/run-pass/early-ret-binop-add.rs +++ b/src/test/run-pass/early-ret-binop-add.rs @@ -1,2 +1,2 @@ -fn wsucc(n: int) -> int { 0 + { ret n + 1 } } +fn wsucc(n: int) -> int { 0 + { return n + 1 } } fn main() { } diff --git a/src/test/run-pass/early-ret-binop.rs b/src/test/run-pass/early-ret-binop.rs index 118bec708b8..cd60f9b7856 100644 --- a/src/test/run-pass/early-ret-binop.rs +++ b/src/test/run-pass/early-ret-binop.rs @@ -1,2 +1,2 @@ -fn wsucc(n: int) -> int { ({ ret n + 1 } == 0); } +fn wsucc(n: int) -> int { ({ return n + 1 } == 0); } fn main() { } diff --git a/src/test/run-pass/export-abstract-tag.rs b/src/test/run-pass/export-abstract-tag.rs index 6a840037641..eb76676ece6 100644 --- a/src/test/run-pass/export-abstract-tag.rs +++ b/src/test/run-pass/export-abstract-tag.rs @@ -7,7 +7,7 @@ mod foo { enum t { t1, } - fn f() -> t { ret t1; } + fn f() -> t { return t1; } } fn main() { let v: foo::t = foo::f(); } diff --git a/src/test/run-pass/export-unexported-dep.rs b/src/test/run-pass/export-unexported-dep.rs index 856f568e788..3392f109015 100644 --- a/src/test/run-pass/export-unexported-dep.rs +++ b/src/test/run-pass/export-unexported-dep.rs @@ -8,7 +8,7 @@ mod foo { // not exported enum t { t1, t2, } - fn f() -> t { ret t1; } + fn f() -> t { return t1; } fn g(v: t) { assert (v == t1); } } diff --git a/src/test/run-pass/expr-alt-generic-box1.rs b/src/test/run-pass/expr-alt-generic-box1.rs index aa90fb785ec..3254996d141 100644 --- a/src/test/run-pass/expr-alt-generic-box1.rs +++ b/src/test/run-pass/expr-alt-generic-box1.rs @@ -10,7 +10,7 @@ fn test_generic<T>(expected: @T, eq: compare<T>) { } fn test_box() { - fn compare_box(b1: @bool, b2: @bool) -> bool { ret *b1 == *b2; } + fn compare_box(b1: @bool, b2: @bool) -> bool { return *b1 == *b2; } test_generic::<bool>(@true, compare_box); } diff --git a/src/test/run-pass/expr-alt-generic-box2.rs b/src/test/run-pass/expr-alt-generic-box2.rs index 78383513cd4..d5fad94a464 100644 --- a/src/test/run-pass/expr-alt-generic-box2.rs +++ b/src/test/run-pass/expr-alt-generic-box2.rs @@ -10,7 +10,7 @@ fn test_generic<T: copy>(expected: T, eq: compare<T>) { } fn test_vec() { - fn compare_box(&&v1: @int, &&v2: @int) -> bool { ret v1 == v2; } + fn compare_box(&&v1: @int, &&v2: @int) -> bool { return v1 == v2; } test_generic::<@int>(@1, compare_box); } diff --git a/src/test/run-pass/expr-alt-generic-unique1.rs b/src/test/run-pass/expr-alt-generic-unique1.rs index d7d639bcbcb..35a631062a8 100644 --- a/src/test/run-pass/expr-alt-generic-unique1.rs +++ b/src/test/run-pass/expr-alt-generic-unique1.rs @@ -9,7 +9,7 @@ fn test_generic<T: copy>(expected: ~T, eq: compare<T>) { } fn test_box() { - fn compare_box(b1: ~bool, b2: ~bool) -> bool { ret *b1 == *b2; } + fn compare_box(b1: ~bool, b2: ~bool) -> bool { return *b1 == *b2; } test_generic::<bool>(~true, compare_box); } diff --git a/src/test/run-pass/expr-alt-generic-unique2.rs b/src/test/run-pass/expr-alt-generic-unique2.rs index a1923e2dd8c..95b79e9b3b9 100644 --- a/src/test/run-pass/expr-alt-generic-unique2.rs +++ b/src/test/run-pass/expr-alt-generic-unique2.rs @@ -10,7 +10,7 @@ fn test_generic<T: copy>(expected: T, eq: compare<T>) { } fn test_vec() { - fn compare_box(&&v1: ~int, &&v2: ~int) -> bool { ret v1 == v2; } + fn compare_box(&&v1: ~int, &&v2: ~int) -> bool { return v1 == v2; } test_generic::<~int>(~1, compare_box); } diff --git a/src/test/run-pass/expr-alt-generic.rs b/src/test/run-pass/expr-alt-generic.rs index 57d519b62cb..b4078a7d907 100644 --- a/src/test/run-pass/expr-alt-generic.rs +++ b/src/test/run-pass/expr-alt-generic.rs @@ -10,14 +10,14 @@ fn test_generic<T: copy>(expected: T, eq: compare<T>) { } fn test_bool() { - fn compare_bool(&&b1: bool, &&b2: bool) -> bool { ret b1 == b2; } + fn compare_bool(&&b1: bool, &&b2: bool) -> bool { return b1 == b2; } test_generic::<bool>(true, compare_bool); } fn test_rec() { type t = {a: int, b: int}; - fn compare_rec(t1: t, t2: t) -> bool { ret t1 == t2; } + fn compare_rec(t1: t, t2: t) -> bool { return t1 == t2; } test_generic::<t>({a: 1, b: 2}, compare_rec); } diff --git a/src/test/run-pass/expr-block-fn.rs b/src/test/run-pass/expr-block-fn.rs index 9fbe930b7f7..7ec1b0eb022 100644 --- a/src/test/run-pass/expr-block-fn.rs +++ b/src/test/run-pass/expr-block-fn.rs @@ -2,7 +2,7 @@ fn test_fn() { type t = extern fn() -> int; - fn ten() -> int { ret 10; } + fn ten() -> int { return 10; } let rs: t = { ten }; assert (rs() == 10); } diff --git a/src/test/run-pass/expr-block-generic-box1.rs b/src/test/run-pass/expr-block-generic-box1.rs index f4be90bfe34..a453ae2fa6e 100644 --- a/src/test/run-pass/expr-block-generic-box1.rs +++ b/src/test/run-pass/expr-block-generic-box1.rs @@ -13,7 +13,7 @@ fn test_box() { fn compare_box(b1: @bool, b2: @bool) -> bool { log(debug, *b1); log(debug, *b2); - ret *b1 == *b2; + return *b1 == *b2; } test_generic::<bool>(@true, compare_box); } diff --git a/src/test/run-pass/expr-block-generic-box2.rs b/src/test/run-pass/expr-block-generic-box2.rs index 8d8fc5020d5..7935cec7f5d 100644 --- a/src/test/run-pass/expr-block-generic-box2.rs +++ b/src/test/run-pass/expr-block-generic-box2.rs @@ -10,7 +10,7 @@ fn test_generic<T: copy>(expected: T, eq: compare<T>) { } fn test_vec() { - fn compare_vec(&&v1: @int, &&v2: @int) -> bool { ret v1 == v2; } + fn compare_vec(&&v1: @int, &&v2: @int) -> bool { return v1 == v2; } test_generic::<@int>(@1, compare_vec); } diff --git a/src/test/run-pass/expr-block-generic-unique1.rs b/src/test/run-pass/expr-block-generic-unique1.rs index c7953536546..df94544acd1 100644 --- a/src/test/run-pass/expr-block-generic-unique1.rs +++ b/src/test/run-pass/expr-block-generic-unique1.rs @@ -12,7 +12,7 @@ fn test_box() { fn compare_box(b1: ~bool, b2: ~bool) -> bool { log(debug, *b1); log(debug, *b2); - ret *b1 == *b2; + return *b1 == *b2; } test_generic::<bool>(~true, compare_box); } diff --git a/src/test/run-pass/expr-block-generic-unique2.rs b/src/test/run-pass/expr-block-generic-unique2.rs index 7b210b66f1f..51bb0274e7f 100644 --- a/src/test/run-pass/expr-block-generic-unique2.rs +++ b/src/test/run-pass/expr-block-generic-unique2.rs @@ -10,7 +10,7 @@ fn test_generic<T: copy>(expected: T, eq: compare<T>) { } fn test_vec() { - fn compare_vec(&&v1: ~int, &&v2: ~int) -> bool { ret v1 == v2; } + fn compare_vec(&&v1: ~int, &&v2: ~int) -> bool { return v1 == v2; } test_generic::<~int>(~1, compare_vec); } diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/run-pass/expr-block-generic.rs index d5a329189b5..3aff514d2ca 100644 --- a/src/test/run-pass/expr-block-generic.rs +++ b/src/test/run-pass/expr-block-generic.rs @@ -12,14 +12,14 @@ fn test_generic<T: copy>(expected: T, eq: compare<T>) { } fn test_bool() { - fn compare_bool(&&b1: bool, &&b2: bool) -> bool { ret b1 == b2; } + fn compare_bool(&&b1: bool, &&b2: bool) -> bool { return b1 == b2; } test_generic::<bool>(true, compare_bool); } fn test_rec() { type t = {a: int, b: int}; - fn compare_rec(t1: t, t2: t) -> bool { ret t1 == t2; } + fn compare_rec(t1: t, t2: t) -> bool { return t1 == t2; } test_generic::<t>({a: 1, b: 2}, compare_rec); } diff --git a/src/test/run-pass/expr-empty-ret.rs b/src/test/run-pass/expr-empty-ret.rs index 6044c6e8ff7..0a50faf4401 100644 --- a/src/test/run-pass/expr-empty-ret.rs +++ b/src/test/run-pass/expr-empty-ret.rs @@ -1,5 +1,5 @@ // Issue #521 -fn f() { let x = alt true { true { 10 } false { ret } }; } +fn f() { let x = alt true { true { 10 } false { return } }; } fn main() { } diff --git a/src/test/run-pass/expr-fn.rs b/src/test/run-pass/expr-fn.rs index b197d3c7e28..3b32df0ec79 100644 --- a/src/test/run-pass/expr-fn.rs +++ b/src/test/run-pass/expr-fn.rs @@ -30,7 +30,7 @@ fn test_block() { fn test_ret() { fn f() -> int { - ret 10 // no semi + return 10 // no semi } assert (f() == 10); diff --git a/src/test/run-pass/expr-if-generic-box1.rs b/src/test/run-pass/expr-if-generic-box1.rs index 0eea4a8ee34..13d224d73ec 100644 --- a/src/test/run-pass/expr-if-generic-box1.rs +++ b/src/test/run-pass/expr-if-generic-box1.rs @@ -10,7 +10,7 @@ fn test_generic<T>(expected: @T, not_expected: @T, eq: compare<T>) { } fn test_box() { - fn compare_box(b1: @bool, b2: @bool) -> bool { ret *b1 == *b2; } + fn compare_box(b1: @bool, b2: @bool) -> bool { return *b1 == *b2; } test_generic::<bool>(@true, @false, compare_box); } diff --git a/src/test/run-pass/expr-if-generic-box2.rs b/src/test/run-pass/expr-if-generic-box2.rs index e4379e22e80..ef56bcd41dc 100644 --- a/src/test/run-pass/expr-if-generic-box2.rs +++ b/src/test/run-pass/expr-if-generic-box2.rs @@ -10,7 +10,7 @@ fn test_generic<T: copy>(expected: T, not_expected: T, eq: compare<T>) { } fn test_vec() { - fn compare_box(&&v1: @int, &&v2: @int) -> bool { ret v1 == v2; } + fn compare_box(&&v1: @int, &&v2: @int) -> bool { return v1 == v2; } test_generic::<@int>(@1, @2, compare_box); } diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/run-pass/expr-if-generic.rs index cb44a03af2d..e664d4e242f 100644 --- a/src/test/run-pass/expr-if-generic.rs +++ b/src/test/run-pass/expr-if-generic.rs @@ -12,14 +12,14 @@ fn test_generic<T: copy>(expected: T, not_expected: T, eq: compare<T>) { } fn test_bool() { - fn compare_bool(&&b1: bool, &&b2: bool) -> bool { ret b1 == b2; } + fn compare_bool(&&b1: bool, &&b2: bool) -> bool { return b1 == b2; } test_generic::<bool>(true, false, compare_bool); } fn test_rec() { type t = {a: int, b: int}; - fn compare_rec(t1: t, t2: t) -> bool { ret t1 == t2; } + fn compare_rec(t1: t, t2: t) -> bool { return t1 == t2; } test_generic::<t>({a: 1, b: 2}, {a: 2, b: 3}, compare_rec); } diff --git a/src/test/run-pass/expr-scope.rs b/src/test/run-pass/expr-scope.rs index 53c8223c778..d974b1ec5a9 100644 --- a/src/test/run-pass/expr-scope.rs +++ b/src/test/run-pass/expr-scope.rs @@ -2,4 +2,4 @@ // xfail-fast fn f() { } -fn main() { ret ::f(); } +fn main() { return ::f(); } diff --git a/src/test/run-pass/fact.rs b/src/test/run-pass/fact.rs index bf2329a94ff..e682fde8776 100644 --- a/src/test/run-pass/fact.rs +++ b/src/test/run-pass/fact.rs @@ -9,7 +9,7 @@ fn f(x: int) -> int { if x == 1 { // debug!{"bottoming out"}; - ret 1; + return 1; } else { // debug!{"recurring"}; @@ -17,7 +17,7 @@ fn f(x: int) -> int { // debug!{"returned"}; log(debug, y); - ret y; + return y; } } diff --git a/src/test/run-pass/fixed-point-bind-box.rs b/src/test/run-pass/fixed-point-bind-box.rs index 7f1a983ce7b..7bf1b813e93 100644 --- a/src/test/run-pass/fixed-point-bind-box.rs +++ b/src/test/run-pass/fixed-point-bind-box.rs @@ -1,14 +1,14 @@ fn fix_help<A, B>(f: extern fn(fn@(A) -> B, A) -> B, x: A) -> B { - ret f({|a|fix_help(f, a)}, x); + return f({|a|fix_help(f, a)}, x); } fn fix<A, B>(f: extern fn(fn@(A) -> B, A) -> B) -> fn@(A) -> B { - ret {|a|fix_help(f, a)}; + return {|a|fix_help(f, a)}; } fn fact_(f: fn@(&&int) -> int, &&n: int) -> int { // fun fact 0 = 1 - ret if n == 0 { 1 } else { n * f(n - 1) }; + return if n == 0 { 1 } else { n * f(n - 1) }; } fn main() { diff --git a/src/test/run-pass/fixed-point-bind-unique.rs b/src/test/run-pass/fixed-point-bind-unique.rs index 029af017f65..95ebd437b88 100644 --- a/src/test/run-pass/fixed-point-bind-unique.rs +++ b/src/test/run-pass/fixed-point-bind-unique.rs @@ -1,14 +1,14 @@ fn fix_help<A: owned, B: send>(f: extern fn(fn@(A) -> B, A) -> B, x: A) -> B { - ret f({|a|fix_help(f, a)}, x); + return f({|a|fix_help(f, a)}, x); } fn fix<A: owned, B: send>(f: extern fn(fn@(A) -> B, A) -> B) -> fn@(A) -> B { - ret {|a|fix_help(f, a)}; + return {|a|fix_help(f, a)}; } fn fact_(f: fn@(&&int) -> int, &&n: int) -> int { // fun fact 0 = 1 - ret if n == 0 { 1 } else { n * f(n - 1) }; + return if n == 0 { 1 } else { n * f(n - 1) }; } fn main() { diff --git a/src/test/run-pass/float-signature.rs b/src/test/run-pass/float-signature.rs index c9cfbe40e0e..df156bccdc5 100644 --- a/src/test/run-pass/float-signature.rs +++ b/src/test/run-pass/float-signature.rs @@ -1,7 +1,7 @@ fn main() { - fn foo(n: float) -> float { ret n + 0.12345; } + fn foo(n: float) -> float { return n + 0.12345; } let n: float = 0.1; let m: float = foo(n); log(debug, m); diff --git a/src/test/run-pass/fn-lval.rs b/src/test/run-pass/fn-lval.rs index bc3eae6e707..69ba49702e4 100644 --- a/src/test/run-pass/fn-lval.rs +++ b/src/test/run-pass/fn-lval.rs @@ -4,6 +4,6 @@ // -*- rust -*- fn foo(f: extern fn(int) -> int) { } -fn id(x: int) -> int { ret x; } +fn id(x: int) -> int { return x; } fn main() { foo(id); } diff --git a/src/test/run-pass/foreign-fn-linkname.rs b/src/test/run-pass/foreign-fn-linkname.rs index 010df0158ed..85623dd21e4 100644 --- a/src/test/run-pass/foreign-fn-linkname.rs +++ b/src/test/run-pass/foreign-fn-linkname.rs @@ -13,7 +13,7 @@ extern mod libc { fn strlen(str: ~str) -> uint unsafe { // C string is terminated with a zero let bytes = str::bytes(str) + ~[0u8]; - ret libc::my_strlen(vec::unsafe::to_ptr(bytes)); + return libc::my_strlen(vec::unsafe::to_ptr(bytes)); } fn main() { diff --git a/src/test/run-pass/fun-call-variants.rs b/src/test/run-pass/fun-call-variants.rs index 408bd665534..88f817e0339 100644 --- a/src/test/run-pass/fun-call-variants.rs +++ b/src/test/run-pass/fun-call-variants.rs @@ -1,7 +1,7 @@ // -*- rust -*- -fn ho(f: fn@(int) -> int) -> int { let n: int = f(3); ret n; } +fn ho(f: fn@(int) -> int) -> int { let n: int = f(3); return n; } -fn direct(x: int) -> int { ret x + 1; } +fn direct(x: int) -> int { return x + 1; } fn main() { let a: int = direct(3); // direct diff --git a/src/test/run-pass/fun-indirect-call.rs b/src/test/run-pass/fun-indirect-call.rs index e89378fe1b5..b7337da92c8 100644 --- a/src/test/run-pass/fun-indirect-call.rs +++ b/src/test/run-pass/fun-indirect-call.rs @@ -2,7 +2,7 @@ // -*- rust -*- -fn f() -> int { ret 42; } +fn f() -> int { return 42; } fn main() { let g: extern fn() -> int = f; diff --git a/src/test/run-pass/generic-alias-box.rs b/src/test/run-pass/generic-alias-box.rs index b9bc823a8b9..c273672f781 100644 --- a/src/test/run-pass/generic-alias-box.rs +++ b/src/test/run-pass/generic-alias-box.rs @@ -1,6 +1,6 @@ -fn id<T: copy>(t: T) -> T { ret t; } +fn id<T: copy>(t: T) -> T { return t; } fn main() { let expected = @100; diff --git a/src/test/run-pass/generic-alias-unique.rs b/src/test/run-pass/generic-alias-unique.rs index 4d2811da7b1..79285589766 100644 --- a/src/test/run-pass/generic-alias-unique.rs +++ b/src/test/run-pass/generic-alias-unique.rs @@ -1,6 +1,6 @@ -fn id<T: copy send>(t: T) -> T { ret t; } +fn id<T: copy send>(t: T) -> T { return t; } fn main() { let expected = ~100; diff --git a/src/test/run-pass/generic-box.rs b/src/test/run-pass/generic-box.rs index 14fb924492a..3d871c896a8 100644 --- a/src/test/run-pass/generic-box.rs +++ b/src/test/run-pass/generic-box.rs @@ -1,6 +1,6 @@ -fn box<T: copy>(x: {x: T, y: T, z: T}) -> @{x: T, y: T, z: T} { ret @x; } +fn box<T: copy>(x: {x: T, y: T, z: T}) -> @{x: T, y: T, z: T} { return @x; } fn main() { let x: @{x: int, y: int, z: int} = box::<int>({x: 1, y: 2, z: 3}); diff --git a/src/test/run-pass/generic-derived-type.rs b/src/test/run-pass/generic-derived-type.rs index 39f4c0d1472..cb406e85980 100644 --- a/src/test/run-pass/generic-derived-type.rs +++ b/src/test/run-pass/generic-derived-type.rs @@ -1,12 +1,12 @@ -fn g<X: copy>(x: X) -> X { ret x; } +fn g<X: copy>(x: X) -> X { return x; } fn f<T: copy>(t: T) -> {a: T, b: T} { type pair = {a: T, b: T}; let x: pair = {a: t, b: t}; - ret g::<pair>(x); + return g::<pair>(x); } fn main() { diff --git a/src/test/run-pass/generic-exterior-box.rs b/src/test/run-pass/generic-exterior-box.rs index 8c042a9e76d..c683da09bdf 100644 --- a/src/test/run-pass/generic-exterior-box.rs +++ b/src/test/run-pass/generic-exterior-box.rs @@ -2,7 +2,7 @@ type recbox<T: copy> = {x: @T}; -fn reclift<T: copy>(t: T) -> recbox<T> { ret {x: @t}; } +fn reclift<T: copy>(t: T) -> recbox<T> { return {x: @t}; } fn main() { let foo: int = 17; diff --git a/src/test/run-pass/generic-exterior-unique.rs b/src/test/run-pass/generic-exterior-unique.rs index 6f985120d42..227bb7066c4 100644 --- a/src/test/run-pass/generic-exterior-unique.rs +++ b/src/test/run-pass/generic-exterior-unique.rs @@ -1,6 +1,6 @@ type recbox<T: copy> = {x: ~T}; -fn reclift<T: copy>(t: T) -> recbox<T> { ret {x: ~t}; } +fn reclift<T: copy>(t: T) -> recbox<T> { return {x: ~t}; } fn main() { let foo: int = 17; diff --git a/src/test/run-pass/generic-fn-box.rs b/src/test/run-pass/generic-fn-box.rs index 4f0bd22944e..97d827e994d 100644 --- a/src/test/run-pass/generic-fn-box.rs +++ b/src/test/run-pass/generic-fn-box.rs @@ -1,5 +1,5 @@ -fn f<T>(x: @T) -> @T { ret x; } +fn f<T>(x: @T) -> @T { return x; } fn main() { let x = f(@3); log(debug, *x); } diff --git a/src/test/run-pass/generic-fn-infer.rs b/src/test/run-pass/generic-fn-infer.rs index 31f0008fc0b..b375752d1a1 100644 --- a/src/test/run-pass/generic-fn-infer.rs +++ b/src/test/run-pass/generic-fn-infer.rs @@ -4,6 +4,6 @@ // -*- rust -*- // Issue #45: infer type parameters in function applications -fn id<T: copy>(x: T) -> T { ret x; } +fn id<T: copy>(x: T) -> T { return x; } fn main() { let x: int = 42; let y: int = id(x); assert (x == y); } diff --git a/src/test/run-pass/generic-fn-unique.rs b/src/test/run-pass/generic-fn-unique.rs index 749341c1a19..7d54afd59eb 100644 --- a/src/test/run-pass/generic-fn-unique.rs +++ b/src/test/run-pass/generic-fn-unique.rs @@ -1,4 +1,4 @@ -fn f<T: copy>(x: ~T) -> ~T { ret x; } +fn f<T: copy>(x: ~T) -> ~T { return x; } fn main() { let x = f(~3); log(debug, *x); } diff --git a/src/test/run-pass/generic-fn.rs b/src/test/run-pass/generic-fn.rs index 4aac6559fe3..fae711ae3ad 100644 --- a/src/test/run-pass/generic-fn.rs +++ b/src/test/run-pass/generic-fn.rs @@ -2,7 +2,7 @@ // -*- rust -*- -fn id<T: copy>(x: T) -> T { ret x; } +fn id<T: copy>(x: T) -> T { return x; } type triple = {x: int, y: int, z: int}; diff --git a/src/test/run-pass/generic-temporary.rs b/src/test/run-pass/generic-temporary.rs index 29a1a4482f7..f0a16e79fb0 100644 --- a/src/test/run-pass/generic-temporary.rs +++ b/src/test/run-pass/generic-temporary.rs @@ -1,6 +1,6 @@ -fn mk() -> int { ret 1; } +fn mk() -> int { return 1; } fn chk(&&a: int) { log(debug, a); assert (a == 1); } diff --git a/src/test/run-pass/generic-tup.rs b/src/test/run-pass/generic-tup.rs index 58a33b80946..b660592720c 100644 --- a/src/test/run-pass/generic-tup.rs +++ b/src/test/run-pass/generic-tup.rs @@ -1,4 +1,4 @@ -fn get_third<T: copy>(t: (T, T, T)) -> T { let (_, _, x) = t; ret x; } +fn get_third<T: copy>(t: (T, T, T)) -> T { let (_, _, x) = t; return x; } fn main() { log(debug, get_third((1, 2, 3))); diff --git a/src/test/run-pass/generic-unique.rs b/src/test/run-pass/generic-unique.rs index 686bd36888e..0572257a877 100644 --- a/src/test/run-pass/generic-unique.rs +++ b/src/test/run-pass/generic-unique.rs @@ -1,5 +1,5 @@ -fn box<T: copy>(x: {x: T, y: T, z: T}) -> ~{x: T, y: T, z: T} { ret ~x; } +fn box<T: copy>(x: {x: T, y: T, z: T}) -> ~{x: T, y: T, z: T} { return ~x; } fn main() { let x: ~{x: int, y: int, z: int} = box::<int>({x: 1, y: 2, z: 3}); diff --git a/src/test/run-pass/global-scope.rs b/src/test/run-pass/global-scope.rs index d7c1ab785ff..89181c15691 100644 --- a/src/test/run-pass/global-scope.rs +++ b/src/test/run-pass/global-scope.rs @@ -1,11 +1,11 @@ // xfail-fast -fn f() -> int { ret 1; } +fn f() -> int { return 1; } mod foo { - fn f() -> int { ret 2; } + fn f() -> int { return 2; } fn g() { assert (f() == 2); assert (::f() == 1); } } -fn main() { ret foo::g(); } +fn main() { return foo::g(); } diff --git a/src/test/run-pass/if-check.rs b/src/test/run-pass/if-check.rs index 78208ec6149..38c44945f21 100644 --- a/src/test/run-pass/if-check.rs +++ b/src/test/run-pass/if-check.rs @@ -1,7 +1,7 @@ pure fn even(x: uint) -> bool { if x < 2u { - ret false; - } else if x == 2u { ret true; } else { ret even(x - 2u); } + return false; + } else if x == 2u { return true; } else { return even(x - 2u); } } fn foo(x: uint) { diff --git a/src/test/run-pass/if-ret.rs b/src/test/run-pass/if-ret.rs index 87cd9647243..71be22dda06 100644 --- a/src/test/run-pass/if-ret.rs +++ b/src/test/run-pass/if-ret.rs @@ -1,3 +1,3 @@ -fn foo() { if (ret) { } } +fn foo() { if (return) { } } fn main() { foo(); } diff --git a/src/test/run-pass/issue-1974.rs b/src/test/run-pass/issue-1974.rs index e8d27aa5e5c..ffa6108cd52 100644 --- a/src/test/run-pass/issue-1974.rs +++ b/src/test/run-pass/issue-1974.rs @@ -3,6 +3,6 @@ fn main() { let s = ~"hej"; while s != ~"" { - ret; + return; } } \ No newline at end of file diff --git a/src/test/run-pass/issue-1989.rs b/src/test/run-pass/issue-1989.rs index 2ee30d48571..a389730f042 100644 --- a/src/test/run-pass/issue-1989.rs +++ b/src/test/run-pass/issue-1989.rs @@ -11,7 +11,7 @@ type pointy = { }; fn empty_pointy() -> @pointy { - ret @{ + return @{ mut a : none, mut f : fn@()->(){}, } diff --git a/src/test/run-pass/issue-2185.rs b/src/test/run-pass/issue-2185.rs index 67f90d6e3d6..a5e2d8ba613 100644 --- a/src/test/run-pass/issue-2185.rs +++ b/src/test/run-pass/issue-2185.rs @@ -25,7 +25,7 @@ fn foldl<A,B,IA:iterable<A>>(self: IA, +b0: B, blk: fn(B, A) -> B) -> B { do self.iter |a| { b <- blk(b, a); } - ret b; + return b; } fn range(lo: uint, hi: uint, it: fn(uint)) { diff --git a/src/test/run-pass/issue-2214.rs b/src/test/run-pass/issue-2214.rs index 7847ef3c8e0..1a986fa757a 100644 --- a/src/test/run-pass/issue-2214.rs +++ b/src/test/run-pass/issue-2214.rs @@ -2,7 +2,7 @@ import libc::{c_double, c_int}; import f64::*; fn lgamma(n: c_double, value: &mut int) -> c_double { - ret m::lgamma(n, value as &mut c_int); + return m::lgamma(n, value as &mut c_int); } #[link_name = "m"] diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index 412bcb5b66a..5ffcab99a7b 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -89,11 +89,11 @@ mod pipes { full { let mut payload = none; payload <-> (*p).payload; - ret some(option::unwrap(payload)) + return some(option::unwrap(payload)) } terminated { assert old_state == terminated; - ret none; + return none; } } } diff --git a/src/test/run-pass/issue-333.rs b/src/test/run-pass/issue-333.rs index 06202bc1c0b..3452beaf7f4 100644 --- a/src/test/run-pass/issue-333.rs +++ b/src/test/run-pass/issue-333.rs @@ -1,5 +1,5 @@ -fn quux<T: copy>(x: T) -> T { let f = id::<T>; ret f(x); } +fn quux<T: copy>(x: T) -> T { let f = id::<T>; return f(x); } -fn id<T: copy>(x: T) -> T { ret x; } +fn id<T: copy>(x: T) -> T { return x; } fn main() { assert (quux(10) == 10); } diff --git a/src/test/run-pass/ivec-add.rs b/src/test/run-pass/ivec-add.rs index 216344942e7..652336145f6 100644 --- a/src/test/run-pass/ivec-add.rs +++ b/src/test/run-pass/ivec-add.rs @@ -1,6 +1,6 @@ -fn double<T: copy>(a: T) -> ~[T] { ret ~[a] + ~[a]; } +fn double<T: copy>(a: T) -> ~[T] { return ~[a] + ~[a]; } -fn double_int(a: int) -> ~[int] { ret ~[a] + ~[a]; } +fn double_int(a: int) -> ~[int] { return ~[a] + ~[a]; } fn main() { let mut d = double(1); diff --git a/src/test/run-pass/keyword-changes-2012-07-31.rs b/src/test/run-pass/keyword-changes-2012-07-31.rs index 459648452e4..1473c433e53 100644 --- a/src/test/run-pass/keyword-changes-2012-07-31.rs +++ b/src/test/run-pass/keyword-changes-2012-07-31.rs @@ -1,4 +1,4 @@ -// ret -> return +// return -> return // mod -> module // alt -> match diff --git a/src/test/run-pass/last-use-in-block.rs b/src/test/run-pass/last-use-in-block.rs index 745fc345dc0..c1dc0b76a10 100644 --- a/src/test/run-pass/last-use-in-block.rs +++ b/src/test/run-pass/last-use-in-block.rs @@ -3,7 +3,7 @@ fn lp<T>(s: ~str, f: fn(~str) -> T) -> T { while false { let r = f(s); - ret r; + return r; } fail; } diff --git a/src/test/run-pass/last-use-in-cap-clause.rs b/src/test/run-pass/last-use-in-cap-clause.rs index fc5425f24e9..baa03abeeb9 100644 --- a/src/test/run-pass/last-use-in-cap-clause.rs +++ b/src/test/run-pass/last-use-in-cap-clause.rs @@ -3,7 +3,7 @@ fn foo() -> fn@() -> int { let k = ~22; let _u = {a: k}; - ret fn@(move k) -> int { 22 }; + return fn@(move k) -> int { 22 }; } fn main() { diff --git a/src/test/run-pass/lazy-and-or.rs b/src/test/run-pass/lazy-and-or.rs index e5d1f814047..7ad71854dc4 100644 --- a/src/test/run-pass/lazy-and-or.rs +++ b/src/test/run-pass/lazy-and-or.rs @@ -1,6 +1,6 @@ -fn incr(&x: int) -> bool { x += 1; assert (false); ret false; } +fn incr(&x: int) -> bool { x += 1; assert (false); return false; } fn main() { let x = 1 == 2 || 3 == 3; diff --git a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs b/src/test/run-pass/liveness-assign-imm-local-after-ret.rs index 028bf10201b..cbab7079a46 100644 --- a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs +++ b/src/test/run-pass/liveness-assign-imm-local-after-ret.rs @@ -1,7 +1,7 @@ fn test() { let _v: int; _v = 1; - ret; + return; _v = 2; //~ WARNING: unreachable statement } diff --git a/src/test/run-pass/log-linearized.rs b/src/test/run-pass/log-linearized.rs index eb3bca93c07..bb042f2359b 100644 --- a/src/test/run-pass/log-linearized.rs +++ b/src/test/run-pass/log-linearized.rs @@ -9,7 +9,7 @@ type smallintmap<T> = @{mut v: ~[mut option<T>]}; fn mk<T>() -> smallintmap<T> { let v: ~[mut option<T>] = ~[mut]; - ret @{mut v: v}; + return @{mut v: v}; } fn f<T,U>() { diff --git a/src/test/run-pass/macro-2.rs b/src/test/run-pass/macro-2.rs index 509238e7e48..b5d3d693f6a 100644 --- a/src/test/run-pass/macro-2.rs +++ b/src/test/run-pass/macro-2.rs @@ -3,7 +3,7 @@ fn main() { #macro[[#mylambda[x, body], { - fn f(x: int) -> int { ret body; } + fn f(x: int) -> int { return body; } f }]]; @@ -11,7 +11,7 @@ fn main() { macro_rules! mylambda_tt{ {$x:ident, $body:expr} => { - fn f($x: int) -> int { ret $body; }; + fn f($x: int) -> int { return $body; }; f } } diff --git a/src/test/run-pass/macro-by-example-1.rs b/src/test/run-pass/macro-by-example-1.rs index 020f200998d..ba8c8d93a63 100644 --- a/src/test/run-pass/macro-by-example-1.rs +++ b/src/test/run-pass/macro-by-example-1.rs @@ -6,7 +6,7 @@ fn main() { {$f:expr, ($($x:expr),*)} => {$f($($x),*)} } - fn add(a: int, b: int) -> int { ret a + b; } + fn add(a: int, b: int) -> int { return a + b; } assert(apply!{add, [1, 15]} == 16); assert(apply!{add, [1, 15]} == 16); diff --git a/src/test/run-pass/macro-by-example-2.rs b/src/test/run-pass/macro-by-example-2.rs index eda697156a9..c0693cd059a 100644 --- a/src/test/run-pass/macro-by-example-2.rs +++ b/src/test/run-pass/macro-by-example-2.rs @@ -27,7 +27,7 @@ fn main() { #macro[[#lambda[x, #<t>, body, #<s>], { - fn result(x: t) -> s { ret body } + fn result(x: t) -> s { return body } result }]]; diff --git a/src/test/run-pass/maybe-mutable.rs b/src/test/run-pass/maybe-mutable.rs index abbf50ed67b..f85c4d6d20e 100644 --- a/src/test/run-pass/maybe-mutable.rs +++ b/src/test/run-pass/maybe-mutable.rs @@ -5,7 +5,7 @@ fn len(v: ~[const int]) -> uint { let mut i = 0u; while i < vec::len(v) { i += 1u; } - ret i; + return i; } fn main() { diff --git a/src/test/run-pass/morestack3.rs b/src/test/run-pass/morestack3.rs index 2ba7945894a..7833c12b158 100644 --- a/src/test/run-pass/morestack3.rs +++ b/src/test/run-pass/morestack3.rs @@ -33,7 +33,7 @@ fn getbig(a0: int, a9 - 1); assert j == a0 - 1; } - ret a0; + return a0; } fn main() { diff --git a/src/test/run-pass/move-1-unique.rs b/src/test/run-pass/move-1-unique.rs index 64268bcabaa..ec37e14c47c 100644 --- a/src/test/run-pass/move-1-unique.rs +++ b/src/test/run-pass/move-1-unique.rs @@ -3,7 +3,7 @@ fn test(x: bool, foo: ~{x: int, y: int, z: int}) -> int { let bar = foo; let mut y: ~{x: int, y: int, z: int}; if x { y <- bar; } else { y = ~{x: 4, y: 5, z: 6}; } - ret y.y; + return y.y; } fn main() { diff --git a/src/test/run-pass/move-1.rs b/src/test/run-pass/move-1.rs index 586fa3c89aa..c510626a08c 100644 --- a/src/test/run-pass/move-1.rs +++ b/src/test/run-pass/move-1.rs @@ -2,7 +2,7 @@ fn test(x: bool, foo: @{x: int, y: int, z: int}) -> int { let bar = foo; let mut y: @{x: int, y: int, z: int}; if x { y <- bar; } else { y = @{x: 4, y: 5, z: 6}; } - ret y.y; + return y.y; } fn main() { diff --git a/src/test/run-pass/move-3-unique.rs b/src/test/run-pass/move-3-unique.rs index ad757d5cc12..02dd0ca999f 100644 --- a/src/test/run-pass/move-3-unique.rs +++ b/src/test/run-pass/move-3-unique.rs @@ -5,7 +5,7 @@ fn test(x: bool, foo: ~{x: int, y: int, z: int}) -> int { let bar = foo; let mut y: ~{x: int, y: int, z: int}; if x { y <- bar; } else { y = ~{x: 4, y: 5, z: 6}; } - ret y.y; + return y.y; } fn main() { diff --git a/src/test/run-pass/move-3.rs b/src/test/run-pass/move-3.rs index 1ba6ed29fbb..467865f8b80 100644 --- a/src/test/run-pass/move-3.rs +++ b/src/test/run-pass/move-3.rs @@ -5,7 +5,7 @@ fn test(x: bool, foo: @{x: int, y: int, z: int}) -> int { let bar = foo; let mut y: @{x: int, y: int, z: int}; if x { y <- bar; } else { y = @{x: 4, y: 5, z: 6}; } - ret y.y; + return y.y; } fn main() { diff --git a/src/test/run-pass/move-4-unique.rs b/src/test/run-pass/move-4-unique.rs index 1fffce98e52..c2049efdfcb 100644 --- a/src/test/run-pass/move-4-unique.rs +++ b/src/test/run-pass/move-4-unique.rs @@ -6,7 +6,7 @@ fn test(foo: ~{a: int, b: int, c: int}) -> ~{a: int, b: int, c: int} { let bar <- foo; let baz <- bar; let quux <- baz; - ret quux; + return quux; } fn main() { let x = ~{a: 1, b: 2, c: 3}; let y = test(x); assert (y.c == 3); } diff --git a/src/test/run-pass/move-4.rs b/src/test/run-pass/move-4.rs index aaaf05938a8..2d6e71ae346 100644 --- a/src/test/run-pass/move-4.rs +++ b/src/test/run-pass/move-4.rs @@ -7,7 +7,7 @@ fn test(foo: @{a: int, b: int, c: int}) -> @{a: int, b: int, c: int} { let bar <- foo; let baz <- bar; let quux <- baz; - ret quux; + return quux; } fn main() { let x = @{a: 1, b: 2, c: 3}; let y = test(x); assert (y.c == 3); } diff --git a/src/test/run-pass/nested-class.rs b/src/test/run-pass/nested-class.rs index b0f62cc3ea9..619f3711a2e 100644 --- a/src/test/run-pass/nested-class.rs +++ b/src/test/run-pass/nested-class.rs @@ -2,7 +2,7 @@ fn main() { class b { let i: int; - fn do_stuff() -> int { ret 37; } + fn do_stuff() -> int { return 37; } new(i:int) { self.i = i; } } diff --git a/src/test/run-pass/newlambdas-ret-infer.rs b/src/test/run-pass/newlambdas-ret-infer.rs index e550155cb60..7ddb2800e9a 100644 --- a/src/test/run-pass/newlambdas-ret-infer.rs +++ b/src/test/run-pass/newlambdas-ret-infer.rs @@ -1,9 +1,9 @@ // Test that the lambda kind is inferred correctly as a return // expression -fn shared() -> fn@() { ret || (); } +fn shared() -> fn@() { return || (); } -fn unique() -> fn~() { ret || (); } +fn unique() -> fn~() { return || (); } fn main() { } diff --git a/src/test/run-pass/newlambdas.rs b/src/test/run-pass/newlambdas.rs index dac7b8c4f1f..3b9ce49273f 100644 --- a/src/test/run-pass/newlambdas.rs +++ b/src/test/run-pass/newlambdas.rs @@ -5,7 +5,7 @@ fn f(i: int, f: fn(int) -> int) -> int { f(i) } fn g(g: fn()) { } fn ff() -> fn@(int) -> int { - ret |x| x + 1; + return |x| x + 1; } fn main() { diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs index d5f2d62bdfa..fa6b0b86012 100644 --- a/src/test/run-pass/newtype-polymorphic.rs +++ b/src/test/run-pass/newtype-polymorphic.rs @@ -1,8 +1,8 @@ enum myvec<X> = ~[X]; -fn myvec_deref<X: copy>(mv: myvec<X>) -> ~[X] { ret *mv; } +fn myvec_deref<X: copy>(mv: myvec<X>) -> ~[X] { return *mv; } -fn myvec_elt<X: copy>(mv: myvec<X>) -> X { ret mv[0]; } +fn myvec_elt<X: copy>(mv: myvec<X>) -> X { return mv[0]; } fn main() { let mv = myvec(~[1, 2, 3]); diff --git a/src/test/run-pass/newtype.rs b/src/test/run-pass/newtype.rs index f6a9be124f3..213770b0a66 100644 --- a/src/test/run-pass/newtype.rs +++ b/src/test/run-pass/newtype.rs @@ -1,6 +1,6 @@ enum mytype = {compute: extern fn(mytype) -> int, val: int}; -fn compute(i: mytype) -> int { ret i.val + 20; } +fn compute(i: mytype) -> int { return i.val + 20; } fn main() { let myval = mytype({compute: compute, val: 30}); diff --git a/src/test/run-pass/non-boolean-pure-fns.rs b/src/test/run-pass/non-boolean-pure-fns.rs index da3f19062dd..02926c0eff5 100644 --- a/src/test/run-pass/non-boolean-pure-fns.rs +++ b/src/test/run-pass/non-boolean-pure-fns.rs @@ -12,7 +12,7 @@ pure fn nonempty_list<T: copy>(ls: @list<T>) -> bool { pure_length(ls) > 0u } fn safe_head<T: copy>(ls: @list<T>) -> T { assert is_not_empty(ls); - ret head(ls); + return head(ls); } fn main() { diff --git a/src/test/run-pass/or-pattern.rs b/src/test/run-pass/or-pattern.rs index 8419fc6ee67..aca2232ffc5 100644 --- a/src/test/run-pass/or-pattern.rs +++ b/src/test/run-pass/or-pattern.rs @@ -1,7 +1,7 @@ enum blah { a(int, int, uint), b(int, int), c, } fn or_alt(q: blah) -> int { - alt q { a(x, y, _) | b(x, y) { ret x + y; } c { ret 0; } } + alt q { a(x, y, _) | b(x, y) { return x + y; } c { return 0; } } } fn main() { diff --git a/src/test/run-pass/osmain.rs b/src/test/run-pass/osmain.rs index f4736e75949..50db95026ea 100644 --- a/src/test/run-pass/osmain.rs +++ b/src/test/run-pass/osmain.rs @@ -11,7 +11,7 @@ fn run(i: int) { log(debug, i); if i == 0 { - ret; + return; } do task::task().sched_mode(task::osmain).unlinked().spawn { diff --git a/src/test/run-pass/output-slot-variants.rs b/src/test/run-pass/output-slot-variants.rs index ae21a487441..ff53e304a72 100644 --- a/src/test/run-pass/output-slot-variants.rs +++ b/src/test/run-pass/output-slot-variants.rs @@ -1,16 +1,16 @@ -fn ret_int_i() -> int { ret 10; } +fn ret_int_i() -> int { return 10; } -fn ret_ext_i() -> @int { ret @10; } +fn ret_ext_i() -> @int { return @10; } -fn ret_int_rec() -> {a: int, b: int} { ret {a: 10, b: 10}; } +fn ret_int_rec() -> {a: int, b: int} { return {a: 10, b: 10}; } -fn ret_ext_rec() -> @{a: int, b: int} { ret @{a: 10, b: 10}; } +fn ret_ext_rec() -> @{a: int, b: int} { return @{a: 10, b: 10}; } -fn ret_ext_mem() -> {a: @int, b: @int} { ret {a: @10, b: @10}; } +fn ret_ext_mem() -> {a: @int, b: @int} { return {a: @10, b: @10}; } -fn ret_ext_ext_mem() -> @{a: @int, b: @int} { ret @{a: @10, b: @10}; } +fn ret_ext_ext_mem() -> @{a: @int, b: @int} { return @{a: @10, b: @10}; } fn main() { let mut int_i: int; diff --git a/src/test/run-pass/pipe-pingpong-bounded.rs b/src/test/run-pass/pipe-pingpong-bounded.rs index c4dbc3eaefd..7aade69c9da 100644 --- a/src/test/run-pass/pipe-pingpong-bounded.rs +++ b/src/test/run-pass/pipe-pingpong-bounded.rs @@ -73,7 +73,7 @@ mod test { fn client(-chan: pingpong::client::ping) { import pingpong::client; - let chan = client::ping(chan); ret; + let chan = client::ping(chan); return; log(error, "Sent ping"); let pong(_chan) = recv(chan); log(error, "Received pong"); @@ -82,7 +82,7 @@ mod test { fn server(-chan: pingpong::server::ping) { import pingpong::server; - let ping(chan) = recv(chan); ret; + let ping(chan) = recv(chan); return; log(error, "Received ping"); let _chan = server::pong(chan); log(error, "Sent pong"); diff --git a/src/test/run-pass/pred-not-bool.rs b/src/test/run-pass/pred-not-bool.rs index 67b5a877c05..c5549eac33e 100644 --- a/src/test/run-pass/pred-not-bool.rs +++ b/src/test/run-pass/pred-not-bool.rs @@ -1,6 +1,6 @@ // this checks that a pred with a non-bool return // type is rejected, even if the pred is never used -pure fn bad(a: int) -> int { ret 37; } //~ ERROR Non-boolean return type +pure fn bad(a: int) -> int { return 37; } //~ ERROR Non-boolean return type fn main() { } diff --git a/src/test/run-pass/pure-sum.rs b/src/test/run-pass/pure-sum.rs index 1b24c65e8fa..66eeb21b754 100644 --- a/src/test/run-pass/pure-sum.rs +++ b/src/test/run-pass/pure-sum.rs @@ -6,7 +6,7 @@ pure fn sums_to(v: ~[int], sum: int) -> bool { sum0 += v[i]; i += 1u; } - ret sum0 == sum; + return sum0 == sum; } pure fn sums_to_using_uniq(v: ~[int], sum: int) -> bool { @@ -15,7 +15,7 @@ pure fn sums_to_using_uniq(v: ~[int], sum: int) -> bool { *sum0 += v[i]; i += 1u; } - ret *sum0 == sum; + return *sum0 == sum; } pure fn sums_to_using_rec(v: ~[int], sum: int) -> bool { @@ -24,7 +24,7 @@ pure fn sums_to_using_rec(v: ~[int], sum: int) -> bool { sum0.f += v[i]; i += 1u; } - ret sum0.f == sum; + return sum0.f == sum; } pure fn sums_to_using_uniq_rec(v: ~[int], sum: int) -> bool { @@ -33,7 +33,7 @@ pure fn sums_to_using_uniq_rec(v: ~[int], sum: int) -> bool { *sum0.f += v[i]; i += 1u; } - ret *sum0.f == sum; + return *sum0.f == sum; } fn main() { diff --git a/src/test/run-pass/rcvr-borrowed-to-region.rs b/src/test/run-pass/rcvr-borrowed-to-region.rs index d9cd2640b4d..5aa8dd01733 100644 --- a/src/test/run-pass/rcvr-borrowed-to-region.rs +++ b/src/test/run-pass/rcvr-borrowed-to-region.rs @@ -5,7 +5,7 @@ trait get { // Note: impl on a slice impl foo of get for &int { fn get() -> int { - ret *self; + return *self; } } diff --git a/src/test/run-pass/rcvr-borrowed-to-slice.rs b/src/test/run-pass/rcvr-borrowed-to-slice.rs index 9a9dcfb21e6..f770fed1969 100644 --- a/src/test/run-pass/rcvr-borrowed-to-slice.rs +++ b/src/test/run-pass/rcvr-borrowed-to-slice.rs @@ -7,7 +7,7 @@ impl foo of sum for &[int] { fn sum() -> int { let mut sum = 0; for vec::each(self) |e| { sum += e; } - ret sum; + return sum; } } diff --git a/src/test/run-pass/rec-tup.rs b/src/test/run-pass/rec-tup.rs index e5375403dfe..8fda72c9684 100644 --- a/src/test/run-pass/rec-tup.rs +++ b/src/test/run-pass/rec-tup.rs @@ -3,8 +3,8 @@ type point = {x: int, y: int}; type rect = (point, point); -fn fst(r: rect) -> point { let (fst, _) = r; ret fst; } -fn snd(r: rect) -> point { let (_, snd) = r; ret snd; } +fn fst(r: rect) -> point { let (fst, _) = r; return fst; } +fn snd(r: rect) -> point { let (_, snd) = r; return snd; } fn f(r: rect, x1: int, y1: int, x2: int, y2: int) { assert (fst(r).x == x1); diff --git a/src/test/run-pass/record-pat.rs b/src/test/run-pass/record-pat.rs index f4d52646e76..1adc8c5838b 100644 --- a/src/test/run-pass/record-pat.rs +++ b/src/test/run-pass/record-pat.rs @@ -4,8 +4,8 @@ enum t3 { c(t2, uint), } fn m(in: t3) -> int { alt in { - c({x: a(m), _}, _) { ret m; } - c({x: b(m), y: y}, z) { ret ((m + z) as int) + y; } + c({x: a(m), _}, _) { return m; } + c({x: b(m), y: y}, z) { return ((m + z) as int) + y; } } } diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index 2e38cc4b348..3b6c7d5962c 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -54,147 +54,147 @@ impl ptr_visitor<V: ty_visitor movable_ptr> fn visit_bot() -> bool { self.align_to::<()>(); - if ! self.inner.visit_bot() { ret false; } + if ! self.inner.visit_bot() { return false; } self.bump_past::<()>(); true } fn visit_nil() -> bool { self.align_to::<()>(); - if ! self.inner.visit_nil() { ret false; } + if ! self.inner.visit_nil() { return false; } self.bump_past::<()>(); true } fn visit_bool() -> bool { self.align_to::<bool>(); - if ! self.inner.visit_bool() { ret false; } + if ! self.inner.visit_bool() { return false; } self.bump_past::<bool>(); true } fn visit_int() -> bool { self.align_to::<int>(); - if ! self.inner.visit_int() { ret false; } + if ! self.inner.visit_int() { return false; } self.bump_past::<int>(); true } fn visit_i8() -> bool { self.align_to::<i8>(); - if ! self.inner.visit_i8() { ret false; } + if ! self.inner.visit_i8() { return false; } self.bump_past::<i8>(); true } fn visit_i16() -> bool { self.align_to::<i16>(); - if ! self.inner.visit_i16() { ret false; } + if ! self.inner.visit_i16() { return false; } self.bump_past::<i16>(); true } fn visit_i32() -> bool { self.align_to::<i32>(); - if ! self.inner.visit_i32() { ret false; } + if ! self.inner.visit_i32() { return false; } self.bump_past::<i32>(); true } fn visit_i64() -> bool { self.align_to::<i64>(); - if ! self.inner.visit_i64() { ret false; } + if ! self.inner.visit_i64() { return false; } self.bump_past::<i64>(); true } fn visit_uint() -> bool { self.align_to::<uint>(); - if ! self.inner.visit_uint() { ret false; } + if ! self.inner.visit_uint() { return false; } self.bump_past::<uint>(); true } fn visit_u8() -> bool { self.align_to::<u8>(); - if ! self.inner.visit_u8() { ret false; } + if ! self.inner.visit_u8() { return false; } self.bump_past::<u8>(); true } fn visit_u16() -> bool { self.align_to::<u16>(); - if ! self.inner.visit_u16() { ret false; } + if ! self.inner.visit_u16() { return false; } self.bump_past::<u16>(); true } fn visit_u32() -> bool { self.align_to::<u32>(); - if ! self.inner.visit_u32() { ret false; } + if ! self.inner.visit_u32() { return false; } self.bump_past::<u32>(); true } fn visit_u64() -> bool { self.align_to::<u64>(); - if ! self.inner.visit_u64() { ret false; } + if ! self.inner.visit_u64() { return false; } self.bump_past::<u64>(); true } fn visit_float() -> bool { self.align_to::<float>(); - if ! self.inner.visit_float() { ret false; } + if ! self.inner.visit_float() { return false; } self.bump_past::<float>(); true } fn visit_f32() -> bool { self.align_to::<f32>(); - if ! self.inner.visit_f32() { ret false; } + if ! self.inner.visit_f32() { return false; } self.bump_past::<f32>(); true } fn visit_f64() -> bool { self.align_to::<f64>(); - if ! self.inner.visit_f64() { ret false; } + if ! self.inner.visit_f64() { return false; } self.bump_past::<f64>(); true } fn visit_char() -> bool { self.align_to::<char>(); - if ! self.inner.visit_char() { ret false; } + if ! self.inner.visit_char() { return false; } self.bump_past::<char>(); true } fn visit_str() -> bool { self.align_to::<~str>(); - if ! self.inner.visit_str() { ret false; } + if ! self.inner.visit_str() { return false; } self.bump_past::<~str>(); true } fn visit_estr_box() -> bool { self.align_to::<@str>(); - if ! self.inner.visit_estr_box() { ret false; } + if ! self.inner.visit_estr_box() { return false; } self.bump_past::<@str>(); true } fn visit_estr_uniq() -> bool { self.align_to::<~str>(); - if ! self.inner.visit_estr_uniq() { ret false; } + if ! self.inner.visit_estr_uniq() { return false; } self.bump_past::<~str>(); true } fn visit_estr_slice() -> bool { self.align_to::<&static/str>(); - if ! self.inner.visit_estr_slice() { ret false; } + if ! self.inner.visit_estr_slice() { return false; } self.bump_past::<&static/str>(); true } @@ -203,35 +203,35 @@ impl ptr_visitor<V: ty_visitor movable_ptr> sz: uint, align: uint) -> bool { self.align(align); - if ! self.inner.visit_estr_fixed(n, sz, align) { ret false; } + if ! self.inner.visit_estr_fixed(n, sz, align) { return false; } self.bump(sz); true } fn visit_box(mtbl: uint, inner: *tydesc) -> bool { self.align_to::<@u8>(); - if ! self.inner.visit_box(mtbl, inner) { ret false; } + if ! self.inner.visit_box(mtbl, inner) { return false; } self.bump_past::<@u8>(); true } fn visit_uniq(mtbl: uint, inner: *tydesc) -> bool { self.align_to::<~u8>(); - if ! self.inner.visit_uniq(mtbl, inner) { ret false; } + if ! self.inner.visit_uniq(mtbl, inner) { return false; } self.bump_past::<~u8>(); true } fn visit_ptr(mtbl: uint, inner: *tydesc) -> bool { self.align_to::<*u8>(); - if ! self.inner.visit_ptr(mtbl, inner) { ret false; } + if ! self.inner.visit_ptr(mtbl, inner) { return false; } self.bump_past::<*u8>(); true } fn visit_rptr(mtbl: uint, inner: *tydesc) -> bool { self.align_to::<&static/u8>(); - if ! self.inner.visit_rptr(mtbl, inner) { ret false; } + if ! self.inner.visit_rptr(mtbl, inner) { return false; } self.bump_past::<&static/u8>(); true } @@ -242,34 +242,34 @@ impl ptr_visitor<V: ty_visitor movable_ptr> // or else possibly we could have some weird interface wherein we // read-off a word from inner's pointers, but the read-word has to // always be the same in all sub-pointers? Dubious. - if ! self.inner.visit_vec(mtbl, inner) { ret false; } + if ! self.inner.visit_vec(mtbl, inner) { return false; } true } fn visit_vec(mtbl: uint, inner: *tydesc) -> bool { self.align_to::<~[u8]>(); - if ! self.inner.visit_vec(mtbl, inner) { ret false; } + if ! self.inner.visit_vec(mtbl, inner) { return false; } self.bump_past::<~[u8]>(); true } fn visit_evec_box(mtbl: uint, inner: *tydesc) -> bool { self.align_to::<@[u8]>(); - if ! self.inner.visit_evec_box(mtbl, inner) { ret false; } + if ! self.inner.visit_evec_box(mtbl, inner) { return false; } self.bump_past::<@[u8]>(); true } fn visit_evec_uniq(mtbl: uint, inner: *tydesc) -> bool { self.align_to::<~[u8]>(); - if ! self.inner.visit_evec_uniq(mtbl, inner) { ret false; } + if ! self.inner.visit_evec_uniq(mtbl, inner) { return false; } self.bump_past::<~[u8]>(); true } fn visit_evec_slice(mtbl: uint, inner: *tydesc) -> bool { self.align_to::<&static/[u8]>(); - if ! self.inner.visit_evec_slice(mtbl, inner) { ret false; } + if ! self.inner.visit_evec_slice(mtbl, inner) { return false; } self.bump_past::<&static/[u8]>(); true } @@ -278,7 +278,7 @@ impl ptr_visitor<V: ty_visitor movable_ptr> mtbl: uint, inner: *tydesc) -> bool { self.align(align); if ! self.inner.visit_evec_fixed(n, sz, align, mtbl, inner) { - ret false; + return false; } self.bump(sz); true @@ -286,25 +286,25 @@ impl ptr_visitor<V: ty_visitor movable_ptr> fn visit_enter_rec(n_fields: uint, sz: uint, align: uint) -> bool { self.align(align); - if ! self.inner.visit_enter_rec(n_fields, sz, align) { ret false; } + if ! self.inner.visit_enter_rec(n_fields, sz, align) { return false; } true } fn visit_rec_field(i: uint, name: &str, mtbl: uint, inner: *tydesc) -> bool { - if ! self.inner.visit_rec_field(i, name, mtbl, inner) { ret false; } + if ! self.inner.visit_rec_field(i, name, mtbl, inner) { return false; } true } fn visit_leave_rec(n_fields: uint, sz: uint, align: uint) -> bool { - if ! self.inner.visit_leave_rec(n_fields, sz, align) { ret false; } + if ! self.inner.visit_leave_rec(n_fields, sz, align) { return false; } true } fn visit_enter_class(n_fields: uint, sz: uint, align: uint) -> bool { self.align(align); if ! self.inner.visit_enter_class(n_fields, sz, align) { - ret false; + return false; } true } @@ -312,63 +312,63 @@ impl ptr_visitor<V: ty_visitor movable_ptr> fn visit_class_field(i: uint, name: &str, mtbl: uint, inner: *tydesc) -> bool { if ! self.inner.visit_class_field(i, name, mtbl, inner) { - ret false; + return false; } true } fn visit_leave_class(n_fields: uint, sz: uint, align: uint) -> bool { if ! self.inner.visit_leave_class(n_fields, sz, align) { - ret false; + return false; } true } fn visit_enter_tup(n_fields: uint, sz: uint, align: uint) -> bool { self.align(align); - if ! self.inner.visit_enter_tup(n_fields, sz, align) { ret false; } + if ! self.inner.visit_enter_tup(n_fields, sz, align) { return false; } true } fn visit_tup_field(i: uint, inner: *tydesc) -> bool { - if ! self.inner.visit_tup_field(i, inner) { ret false; } + if ! self.inner.visit_tup_field(i, inner) { return false; } true } fn visit_leave_tup(n_fields: uint, sz: uint, align: uint) -> bool { - if ! self.inner.visit_leave_tup(n_fields, sz, align) { ret false; } + if ! self.inner.visit_leave_tup(n_fields, sz, align) { return false; } true } fn visit_enter_fn(purity: uint, proto: uint, n_inputs: uint, retstyle: uint) -> bool { if ! self.inner.visit_enter_fn(purity, proto, n_inputs, retstyle) { - ret false + return false } true } fn visit_fn_input(i: uint, mode: uint, inner: *tydesc) -> bool { - if ! self.inner.visit_fn_input(i, mode, inner) { ret false; } + if ! self.inner.visit_fn_input(i, mode, inner) { return false; } true } fn visit_fn_output(retstyle: uint, inner: *tydesc) -> bool { - if ! self.inner.visit_fn_output(retstyle, inner) { ret false; } + if ! self.inner.visit_fn_output(retstyle, inner) { return false; } true } fn visit_leave_fn(purity: uint, proto: uint, n_inputs: uint, retstyle: uint) -> bool { if ! self.inner.visit_leave_fn(purity, proto, n_inputs, retstyle) { - ret false; + return false; } true } fn visit_enter_enum(n_variants: uint, sz: uint, align: uint) -> bool { self.align(align); - if ! self.inner.visit_enter_enum(n_variants, sz, align) { ret false; } + if ! self.inner.visit_enter_enum(n_variants, sz, align) { return false; } true } @@ -378,13 +378,13 @@ impl ptr_visitor<V: ty_visitor movable_ptr> name: &str) -> bool { if ! self.inner.visit_enter_enum_variant(variant, disr_val, n_fields, name) { - ret false; + return false; } true } fn visit_enum_variant_field(i: uint, inner: *tydesc) -> bool { - if ! self.inner.visit_enum_variant_field(i, inner) { ret false; } + if ! self.inner.visit_enum_variant_field(i, inner) { return false; } true } @@ -394,65 +394,65 @@ impl ptr_visitor<V: ty_visitor movable_ptr> name: &str) -> bool { if ! self.inner.visit_leave_enum_variant(variant, disr_val, n_fields, name) { - ret false; + return false; } true } fn visit_leave_enum(n_variants: uint, sz: uint, align: uint) -> bool { - if ! self.inner.visit_leave_enum(n_variants, sz, align) { ret false; } + if ! self.inner.visit_leave_enum(n_variants, sz, align) { return false; } true } fn visit_trait() -> bool { self.align_to::<ty_visitor>(); - if ! self.inner.visit_trait() { ret false; } + if ! self.inner.visit_trait() { return false; } self.bump_past::<ty_visitor>(); true } fn visit_var() -> bool { - if ! self.inner.visit_var() { ret false; } + if ! self.inner.visit_var() { return false; } true } fn visit_var_integral() -> bool { - if ! self.inner.visit_var_integral() { ret false; } + if ! self.inner.visit_var_integral() { return false; } true } fn visit_param(i: uint) -> bool { - if ! self.inner.visit_param(i) { ret false; } + if ! self.inner.visit_param(i) { return false; } true } fn visit_self() -> bool { self.align_to::<&static/u8>(); - if ! self.inner.visit_self() { ret false; } + if ! self.inner.visit_self() { return false; } self.align_to::<&static/u8>(); true } fn visit_type() -> bool { - if ! self.inner.visit_type() { ret false; } + if ! self.inner.visit_type() { return false; } true } fn visit_opaque_box() -> bool { self.align_to::<@u8>(); - if ! self.inner.visit_opaque_box() { ret false; } + if ! self.inner.visit_opaque_box() { return false; } self.bump_past::<@u8>(); true } fn visit_constr(inner: *tydesc) -> bool { - if ! self.inner.visit_constr(inner) { ret false; } + if ! self.inner.visit_constr(inner) { return false; } true } fn visit_closure_ptr(ck: uint) -> bool { self.align_to::<fn@()>(); - if ! self.inner.visit_closure_ptr(ck) { ret false; } + if ! self.inner.visit_closure_ptr(ck) { return false; } self.bump_past::<fn@()>(); true } diff --git a/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs b/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs index e9a3d0b3ec3..2fa7db00815 100644 --- a/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs +++ b/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs @@ -5,7 +5,7 @@ fn get_x(x: &character) -> &int { // interesting case because the scope of this // borrow of the unique pointer is in fact // larger than the fn itself - ret &x.pos.x; + return &x.pos.x; } fn main() { diff --git a/src/test/run-pass/regions-addr-of-ret.rs b/src/test/run-pass/regions-addr-of-ret.rs index f4e1221e3db..2a78eea2f81 100644 --- a/src/test/run-pass/regions-addr-of-ret.rs +++ b/src/test/run-pass/regions-addr-of-ret.rs @@ -1,5 +1,5 @@ fn f(x : &a/int) -> &a/int { - ret &*x; + return &*x; } fn main() { diff --git a/src/test/run-pass/regions-infer-borrow-scope.rs b/src/test/run-pass/regions-infer-borrow-scope.rs index 0f099672f40..2378052b24a 100644 --- a/src/test/run-pass/regions-infer-borrow-scope.rs +++ b/src/test/run-pass/regions-infer-borrow-scope.rs @@ -1,7 +1,7 @@ type point = {x: int, y: int}; fn x_coord(p: &point) -> &int { - ret &p.x; + return &p.x; } fn main() { diff --git a/src/test/run-pass/regions-mock-trans-impls.rs b/src/test/run-pass/regions-mock-trans-impls.rs index de7f0c2739f..6b7848c267c 100644 --- a/src/test/run-pass/regions-mock-trans-impls.rs +++ b/src/test/run-pass/regions-mock-trans-impls.rs @@ -17,7 +17,7 @@ type ccx = { impl arena for arena { fn alloc_inner(sz: uint, _align: uint) -> *() unsafe { - ret unsafe::reinterpret_cast(libc::malloc(sz as libc::size_t)); + return unsafe::reinterpret_cast(libc::malloc(sz as libc::size_t)); } fn alloc(tydesc: *()) -> *() { unsafe { @@ -28,7 +28,7 @@ impl arena for arena { } fn h(bcx : &bcx) -> &bcx { - ret new(*bcx.fcx.arena) { fcx: bcx.fcx }; + return new(*bcx.fcx.arena) { fcx: bcx.fcx }; } fn g(fcx : &fcx) { @@ -42,7 +42,7 @@ fn g(fcx : &fcx) { fn f(ccx : &ccx) { let a = arena(()); let fcx = { arena: &a, ccx: ccx }; - ret g(&fcx); + return g(&fcx); } fn main() { diff --git a/src/test/run-pass/regions-mock-trans.rs b/src/test/run-pass/regions-mock-trans.rs index 15d3b7a4e14..5bbc8412afc 100644 --- a/src/test/run-pass/regions-mock-trans.rs +++ b/src/test/run-pass/regions-mock-trans.rs @@ -16,12 +16,12 @@ type ccx = { }; fn alloc(_bcx : &arena) -> &bcx unsafe { - ret unsafe::reinterpret_cast( + return unsafe::reinterpret_cast( libc::malloc(sys::size_of::<bcx/&blk>() as libc::size_t)); } fn h(bcx : &bcx) -> &bcx { - ret alloc(bcx.fcx.arena); + return alloc(bcx.fcx.arena); } fn g(fcx : &fcx) { @@ -35,7 +35,7 @@ fn g(fcx : &fcx) { fn f(ccx : &ccx) { let a = arena(()); let fcx = { arena: &a, ccx: ccx }; - ret g(&fcx); + return g(&fcx); } fn main() { diff --git a/src/test/run-pass/regions-self-impls.rs b/src/test/run-pass/regions-self-impls.rs index 07457aa492b..40c1ea0e360 100644 --- a/src/test/run-pass/regions-self-impls.rs +++ b/src/test/run-pass/regions-self-impls.rs @@ -5,7 +5,7 @@ trait get_chowder { } impl clam of get_chowder for clam { - fn get_chowder() -> &self/int { ret self.chowder; } + fn get_chowder() -> &self/int { return self.chowder; } } fn main() { diff --git a/src/test/run-pass/resource-destruct.rs b/src/test/run-pass/resource-destruct.rs index 9565f7691e9..4cd713c4e3a 100644 --- a/src/test/run-pass/resource-destruct.rs +++ b/src/test/run-pass/resource-destruct.rs @@ -1,6 +1,6 @@ class shrinky_pointer { let i: @@mut int; - fn look_at() -> int { ret **(self.i); } + fn look_at() -> int { return **(self.i); } new(i: @@mut int) { self.i = i; } drop { log(error, ~"Hello!"); **(self.i) -= 1; } } diff --git a/src/test/run-pass/ret-bang.rs b/src/test/run-pass/ret-bang.rs index 122188643de..eb92aa1386e 100644 --- a/src/test/run-pass/ret-bang.rs +++ b/src/test/run-pass/ret-bang.rs @@ -5,7 +5,7 @@ fn my_err(s: ~str) -> ! { log(error, s); fail; } fn okay(i: uint) -> int { - if i == 3u { my_err(~"I don't like three"); } else { ret 42; } + if i == 3u { my_err(~"I don't like three"); } else { return 42; } } fn main() { okay(4u); } diff --git a/src/test/run-pass/ret-break-cont-in-block.rs b/src/test/run-pass/ret-break-cont-in-block.rs index 5dc448a3e6c..f66b6ebf0a9 100644 --- a/src/test/run-pass/ret-break-cont-in-block.rs +++ b/src/test/run-pass/ret-break-cont-in-block.rs @@ -9,7 +9,7 @@ fn iter<T>(v: ~[T], it: fn(T) -> bool) { fn find_pos<T>(n: T, h: ~[T]) -> option<uint> { let mut i = 0u; for iter(h) |e| { - if e == n { ret some(i); } + if e == n { return some(i); } i += 1u; } none @@ -20,7 +20,7 @@ fn bail_deep(x: ~[~[bool]]) { for iter(x) |x| { for iter(x) |x| { assert !seen; - if x { seen = true; ret; } + if x { seen = true; return; } } } assert !seen; @@ -29,10 +29,10 @@ fn bail_deep(x: ~[~[bool]]) { fn ret_deep() -> ~str { for iter(~[1, 2]) |e| { for iter(~[3, 4]) |x| { - if e + x > 4 { ret ~"hi"; } + if e + x > 4 { return ~"hi"; } } } - ret ~"bye"; + return ~"bye"; } fn main() { diff --git a/src/test/run-pass/ret-none.rs b/src/test/run-pass/ret-none.rs index 468dbf5f3f2..1533bb9ef09 100644 --- a/src/test/run-pass/ret-none.rs +++ b/src/test/run-pass/ret-none.rs @@ -2,6 +2,6 @@ enum option<T> { none, some(T), } -fn f<T: copy>() -> option<T> { ret none; } +fn f<T: copy>() -> option<T> { return none; } fn main() { f::<int>(); } diff --git a/src/test/run-pass/return-nil.rs b/src/test/run-pass/return-nil.rs index a7a55e60971..07ce9818193 100644 --- a/src/test/run-pass/return-nil.rs +++ b/src/test/run-pass/return-nil.rs @@ -1,5 +1,5 @@ -fn f() { let x: () = (); ret x; } +fn f() { let x: () = (); return x; } fn main() { let x = f(); } diff --git a/src/test/run-pass/self-shadowing-import.rs b/src/test/run-pass/self-shadowing-import.rs index 7887990f080..af2d419c1d6 100644 --- a/src/test/run-pass/self-shadowing-import.rs +++ b/src/test/run-pass/self-shadowing-import.rs @@ -1,7 +1,7 @@ mod a { mod b { mod a { - fn foo() -> int { ret 1; } + fn foo() -> int { return 1; } } } } diff --git a/src/test/run-pass/sendfn-deep-copy.rs b/src/test/run-pass/sendfn-deep-copy.rs index 666c6805593..94c63a283e4 100644 --- a/src/test/run-pass/sendfn-deep-copy.rs +++ b/src/test/run-pass/sendfn-deep-copy.rs @@ -9,7 +9,7 @@ fn mk_counter<A:copy>() -> fn~(A) -> (A,uint) { // The only reason that the counter is generic is so that it closes // over both a type descriptor and some data. let v = ~[mut 0u]; - ret fn~(a: A) -> (A,uint) { + return fn~(a: A) -> (A,uint) { let n = v[0]; v[0] = n + 1u; (a, n) diff --git a/src/test/run-pass/sendfn-generic-fn.rs b/src/test/run-pass/sendfn-generic-fn.rs index 2a4d675c321..df3b476358b 100644 --- a/src/test/run-pass/sendfn-generic-fn.rs +++ b/src/test/run-pass/sendfn-generic-fn.rs @@ -8,7 +8,7 @@ fn main() { test05(); } type pair<A,B> = { a: A, b: B }; fn make_generic_record<A: copy, B: copy>(a: A, b: B) -> pair<A,B> { - ret {a: a, b: b}; + return {a: a, b: b}; } fn test05_start(&&f: fn~(&&float, &&~str) -> pair<float, ~str>) { @@ -25,7 +25,7 @@ fn test05_start(&&f: fn~(&&float, &&~str) -> pair<float, ~str>) { fn spawn<A: copy, B: copy>(f: extern fn(fn~(A,B)->pair<A,B>)) { let arg = fn~(a: A, b: B) -> pair<A,B> { - ret make_generic_record(a, b); + return make_generic_record(a, b); }; task::spawn(|| f(arg) ); } diff --git a/src/test/run-pass/sendfn-is-a-block.rs b/src/test/run-pass/sendfn-is-a-block.rs index 1476a015828..21af730caba 100644 --- a/src/test/run-pass/sendfn-is-a-block.rs +++ b/src/test/run-pass/sendfn-is-a-block.rs @@ -1,8 +1,8 @@ fn test(f: fn(uint) -> uint) -> uint { - ret f(22u); + return f(22u); } fn main() { - let y = test(fn~(x: uint) -> uint { ret 4u * x; }); + let y = test(fn~(x: uint) -> uint { return 4u * x; }); assert y == 88u; } \ No newline at end of file diff --git a/src/test/run-pass/tag-align-dyn-u64.rs b/src/test/run-pass/tag-align-dyn-u64.rs index 18f612b19ad..e96a632431a 100644 --- a/src/test/run-pass/tag-align-dyn-u64.rs +++ b/src/test/run-pass/tag-align-dyn-u64.rs @@ -10,12 +10,12 @@ type t_rec = { }; fn mk_rec() -> t_rec { - ret { c8:0u8, t:a_tag(0u64) }; + return { c8:0u8, t:a_tag(0u64) }; } fn is_8_byte_aligned(&&u: a_tag<u64>) -> bool { let p = ptr::addr_of(u) as uint; - ret (p & 7u) == 0u; + return (p & 7u) == 0u; } fn main() { diff --git a/src/test/run-pass/tag-align-dyn-variants.rs b/src/test/run-pass/tag-align-dyn-variants.rs index 10ea8f80b65..9ceede21207 100644 --- a/src/test/run-pass/tag-align-dyn-variants.rs +++ b/src/test/run-pass/tag-align-dyn-variants.rs @@ -13,12 +13,12 @@ type t_rec<A,B> = { }; fn mk_rec<A:copy,B:copy>(a: A, b: B) -> t_rec<A,B> { - ret { chA:0u8, tA:varA(a), chB:1u8, tB:varB(b) }; + return { chA:0u8, tA:varA(a), chB:1u8, tB:varB(b) }; } fn is_aligned<A>(amnt: uint, &&u: A) -> bool { let p = ptr::addr_of(u) as uint; - ret (p & (amnt-1u)) == 0u; + return (p & (amnt-1u)) == 0u; } fn variant_data_is_aligned<A,B>(amnt: uint, &&u: a_tag<A,B>) -> bool { diff --git a/src/test/run-pass/tag-align-u64.rs b/src/test/run-pass/tag-align-u64.rs index f0df400cf19..b05fceebeab 100644 --- a/src/test/run-pass/tag-align-u64.rs +++ b/src/test/run-pass/tag-align-u64.rs @@ -10,12 +10,12 @@ type t_rec = { }; fn mk_rec() -> t_rec { - ret { c8:0u8, t:a_tag(0u64) }; + return { c8:0u8, t:a_tag(0u64) }; } fn is_8_byte_aligned(&&u: a_tag) -> bool { let p = ptr::addr_of(u) as u64; - ret (p & 7u64) == 0u64; + return (p & 7u64) == 0u64; } fn main() { diff --git a/src/test/run-pass/tail-call-arg-leak.rs b/src/test/run-pass/tail-call-arg-leak.rs index 9b9631867e2..f35e6cc24cc 100644 --- a/src/test/run-pass/tail-call-arg-leak.rs +++ b/src/test/run-pass/tail-call-arg-leak.rs @@ -2,6 +2,6 @@ // use of tail calls causes arg slot leaks, issue #160. -fn inner(dummy: ~str, b: bool) { if b { ret inner(dummy, false); } } +fn inner(dummy: ~str, b: bool) { if b { return inner(dummy, false); } } fn main() { inner(~"hi", true); } diff --git a/src/test/run-pass/tail-cps.rs b/src/test/run-pass/tail-cps.rs index 88344eb3174..2b921bd7726 100644 --- a/src/test/run-pass/tail-cps.rs +++ b/src/test/run-pass/tail-cps.rs @@ -2,18 +2,18 @@ // -*- rust -*- -fn checktrue(rs: bool) -> bool { assert (rs); ret true; } +fn checktrue(rs: bool) -> bool { assert (rs); return true; } fn main() { let k = checktrue; evenk(42, k); oddk(45, k); } fn evenk(n: int, k: extern fn(bool) -> bool) -> bool { debug!{"evenk"}; log(debug, n); - if n == 0 { ret k(true); } else { ret oddk(n - 1, k); } + if n == 0 { return k(true); } else { return oddk(n - 1, k); } } fn oddk(n: int, k: extern fn(bool) -> bool) -> bool { debug!{"oddk"}; log(debug, n); - if n == 0 { ret k(false); } else { ret evenk(n - 1, k); } + if n == 0 { return k(false); } else { return evenk(n - 1, k); } } diff --git a/src/test/run-pass/tail-direct.rs b/src/test/run-pass/tail-direct.rs index bfb0b19340e..ad95a0d831f 100644 --- a/src/test/run-pass/tail-direct.rs +++ b/src/test/run-pass/tail-direct.rs @@ -4,6 +4,6 @@ // -*- rust -*- fn main() { assert (even(42)); assert (odd(45)); } -fn even(n: int) -> bool { if n == 0 { ret true; } else { ret odd(n - 1); } } +fn even(n: int) -> bool { if n == 0 { return true; } else { return odd(n - 1); } } -fn odd(n: int) -> bool { if n == 0 { ret false; } else { ret even(n - 1); } } +fn odd(n: int) -> bool { if n == 0 { return false; } else { return even(n - 1); } } diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs index 3064583b752..a6091fc3170 100644 --- a/src/test/run-pass/terminate-in-initializer.rs +++ b/src/test/run-pass/terminate-in-initializer.rs @@ -8,7 +8,7 @@ fn test_break() { loop { let x: @int = break; } } fn test_cont() { let mut i = 0; while i < 1 { i += 1; let x: @int = again; } } -fn test_ret() { let x: @int = ret; } +fn test_ret() { let x: @int = return; } fn test_fail() { fn f() { let x: @int = fail; } diff --git a/src/test/run-pass/test-ignore-cfg.rs b/src/test/run-pass/test-ignore-cfg.rs index 49fc6e88ec4..c983a442f7a 100644 --- a/src/test/run-pass/test-ignore-cfg.rs +++ b/src/test/run-pass/test-ignore-cfg.rs @@ -18,7 +18,7 @@ fn shouldnotignore() { #[test] fn checktests() { - // Pull the tests out of the secret test module + // Pull the tests out of the secreturn test module let tests = __test::tests(); let shouldignore = option::get( diff --git a/src/test/run-pass/type-namespace.rs b/src/test/run-pass/type-namespace.rs index 03c8ce0972a..3aef58301ce 100644 --- a/src/test/run-pass/type-namespace.rs +++ b/src/test/run-pass/type-namespace.rs @@ -1,5 +1,5 @@ type a = {a: int}; -fn a(a: a) -> int { ret a.a; } +fn a(a: a) -> int { return a.a; } fn main() { let x: a = {a: 1}; assert (a(x) == 1); } diff --git a/src/test/run-pass/type-ptr.rs b/src/test/run-pass/type-ptr.rs index dd572d8655c..d980ad34b9b 100644 --- a/src/test/run-pass/type-ptr.rs +++ b/src/test/run-pass/type-ptr.rs @@ -1,5 +1,5 @@ -fn f(a: *int) -> *int { ret a; } +fn f(a: *int) -> *int { return a; } -fn g(a: *int) -> *int { let b = f(a); ret b; } +fn g(a: *int) -> *int { let b = f(a); return b; } -fn main(args: ~[~str]) { ret; } +fn main(args: ~[~str]) { return; } diff --git a/src/test/run-pass/uniq-cc-generic.rs b/src/test/run-pass/uniq-cc-generic.rs index d72c8f82cba..5c7e2228ab4 100644 --- a/src/test/run-pass/uniq-cc-generic.rs +++ b/src/test/run-pass/uniq-cc-generic.rs @@ -13,7 +13,7 @@ fn make_uniq_closure<A:send copy>(a: A) -> fn~() -> uint { } fn empty_pointy() -> @pointy { - ret @{ + return @{ mut a : none, d : make_uniq_closure(~"hi") } diff --git a/src/test/run-pass/uniq-cc.rs b/src/test/run-pass/uniq-cc.rs index f238e3e4e9f..95007591783 100644 --- a/src/test/run-pass/uniq-cc.rs +++ b/src/test/run-pass/uniq-cc.rs @@ -10,7 +10,7 @@ type pointy = { }; fn empty_pointy() -> @pointy { - ret @{ + return @{ mut a : none, c : ~22, d : fn~()->(){}, diff --git a/src/test/run-pass/unit.rs b/src/test/run-pass/unit.rs index 7fb75242349..ccbd1564658 100644 --- a/src/test/run-pass/unit.rs +++ b/src/test/run-pass/unit.rs @@ -2,11 +2,11 @@ // -*- rust -*- -fn f(u: ()) { ret u; } +fn f(u: ()) { return u; } fn main() { let u1: () = (); let mut u2: () = f(u1); u2 = (); - ret (); + return (); } diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/run-pass/unreachable-code-1.rs index fba080ac7f5..75fe81e5cd7 100644 --- a/src/test/run-pass/unreachable-code-1.rs +++ b/src/test/run-pass/unreachable-code-1.rs @@ -7,7 +7,7 @@ fn call_id() { id(c); //~ WARNING unreachable statement } -fn call_id_3() { id(ret) && id(ret); } +fn call_id_3() { id(return) && id(return); } fn main() { } diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/run-pass/unreachable-code.rs index 0d1a4991751..2747ed2755e 100644 --- a/src/test/run-pass/unreachable-code.rs +++ b/src/test/run-pass/unreachable-code.rs @@ -7,23 +7,23 @@ fn call_id() { id(c); } -fn call_id_2() { id(true) && id(ret); } +fn call_id_2() { id(true) && id(return); } -fn call_id_3() { id(ret) && id(ret); } +fn call_id_3() { id(return) && id(return); } fn log_fail() { log(error, fail); } -fn log_ret() { log(error, ret); } +fn log_ret() { log(error, return); } fn log_break() { loop { log(error, break); } } fn log_again() { loop { log(error, again); } } -fn ret_ret() -> int { ret (ret 2) + 3; } +fn ret_ret() -> int { return (return 2) + 3; } fn ret_guard() { alt 2 { - x if (ret) { x; } + x if (return) { x; } _ {} } } diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs b/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs index af2b09cc37a..d7ad4e2faf1 100644 --- a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs +++ b/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs @@ -2,7 +2,7 @@ // // See also: compile-fail/unsafe-fn-called-from-safe.rs -unsafe fn f() { ret; } +unsafe fn f() { return; } fn g() { unsafe { diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs b/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs index 445fdff80aa..9cfc86bafbe 100644 --- a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs +++ b/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs @@ -2,12 +2,12 @@ // // See also: compile-fail/unsafe-fn-called-from-safe.rs -unsafe fn f() { ret; } +unsafe fn f() { return; } unsafe fn g() { f(); } fn main() { - ret; + return; } diff --git a/src/test/run-pass/use-import-export.rs b/src/test/run-pass/use-import-export.rs index 99b87578d8d..798bcb8c84f 100644 --- a/src/test/run-pass/use-import-export.rs +++ b/src/test/run-pass/use-import-export.rs @@ -1,11 +1,11 @@ mod foo { - fn x() -> int { ret 1; } + fn x() -> int { return 1; } } mod bar { - fn y() -> int { ret 1; } + fn y() -> int { return 1; } } fn main() { foo::x(); bar::y(); } diff --git a/src/test/run-pass/use-uninit-alt.rs b/src/test/run-pass/use-uninit-alt.rs index 3280e61b855..76e1c95ca58 100644 --- a/src/test/run-pass/use-uninit-alt.rs +++ b/src/test/run-pass/use-uninit-alt.rs @@ -3,7 +3,7 @@ fn foo<T>(o: myoption<T>) -> int { let mut x: int = 5; alt o { none::<T> { } some::<T>(t) { x += 1; } } - ret x; + return x; } enum myoption<T> { none, some(T), } diff --git a/src/test/run-pass/use-uninit-alt2.rs b/src/test/run-pass/use-uninit-alt2.rs index 283c4c630a3..0479d3c9555 100644 --- a/src/test/run-pass/use-uninit-alt2.rs +++ b/src/test/run-pass/use-uninit-alt2.rs @@ -3,7 +3,7 @@ fn foo<T>(o: myoption<T>) -> int { let mut x: int; alt o { none::<T> { fail; } some::<T>(t) { x = 5; } } - ret x; + return x; } enum myoption<T> { none, some(T), } diff --git a/src/test/run-pass/utf8_idents.rs b/src/test/run-pass/utf8_idents.rs index 993a6c9aa42..3d842c2731c 100644 --- a/src/test/run-pass/utf8_idents.rs +++ b/src/test/run-pass/utf8_idents.rs @@ -31,5 +31,5 @@ fn საჭმელად_გემრიელი_სადილი() -> int assert 10 == ארוחת_צהריי; assert ランチ + 午餐 + μεσημεριανό == 30; assert ăn_trưa + อาหารกลางวัน == 20; - ret (абед + լանչ) >> غداء; + return (абед + լանչ) >> غداء; } diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/run-pass/weird-exprs.rs index 0b0f20a8b31..5dd7d91640e 100644 --- a/src/test/run-pass/weird-exprs.rs +++ b/src/test/run-pass/weird-exprs.rs @@ -1,14 +1,14 @@ // Just a grab bag of stuff that you wouldn't want to actually write. -fn strange() -> bool { let _x: bool = ret true; } +fn strange() -> bool { let _x: bool = return true; } fn funny() { fn f(_x: ()) { } - f(ret); + f(return); } fn what() { - fn the(x: @mut bool) { ret while !*x { *x = true; }; } + fn the(x: @mut bool) { return while !*x { *x = true; }; } let i = @mut false; let dont = {||the(i)}; dont(); @@ -17,23 +17,23 @@ fn what() { fn zombiejesus() { loop { - while (ret) { - if (ret) { - alt (ret) { + while (return) { + if (return) { + alt (return) { 1 { - if (ret) { - ret + if (return) { + return } else { - ret + return } } - _ { ret } + _ { return } }; - } else if (ret) { - ret; + } else if (return) { + return; } } - if (ret) { break; } + if (return) { break; } } } @@ -46,14 +46,14 @@ fn notsure() { } fn hammertime() -> int { - let _x = log(debug, true == (ret 0)); + let _x = log(debug, true == (return 0)); } fn canttouchthis() -> uint { pure fn p() -> bool { true } let _a = (assert (true)) == (assert (p())); let _c = (assert (p())) == (); - let _b: bool = (log(debug, 0) == (ret 0u)); + let _b: bool = (log(debug, 0) == (return 0u)); } fn angrydome() { diff --git a/src/test/run-pass/while-prelude-drop.rs b/src/test/run-pass/while-prelude-drop.rs index dcc19b8ca20..6315a92ca2d 100644 --- a/src/test/run-pass/while-prelude-drop.rs +++ b/src/test/run-pass/while-prelude-drop.rs @@ -2,12 +2,12 @@ enum t { a, b(~str), } fn make(i: int) -> t { - if i > 10 { ret a; } + if i > 10 { return a; } let mut s = ~"hello"; // Ensure s is non-const. s += ~"there"; - ret b(s); + return b(s); } fn main() { diff --git a/src/test/run-pass/zip-same-length.rs b/src/test/run-pass/zip-same-length.rs index 3ae9f1c1eba..8e05abe75f3 100644 --- a/src/test/run-pass/zip-same-length.rs +++ b/src/test/run-pass/zip-same-length.rs @@ -10,7 +10,7 @@ fn enum_chars(start: u8, end: u8) -> ~[char] { let mut i = start; let mut r = ~[]; while i <= end { vec::push(r, i as char); i += 1u as u8; } - ret r; + return r; } fn enum_uints(start: uint, end: uint) -> ~[uint] { @@ -18,7 +18,7 @@ fn enum_uints(start: uint, end: uint) -> ~[uint] { let mut i = start; let mut r = ~[]; while i <= end { vec::push(r, i); i += 1u; } - ret r; + return r; } fn main() { |