diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/core-uint-to-str.rs index a711ae5dd46..44211aad3f3 100644 --- a/src/test/bench/core-uint-to-str.rs +++ b/src/test/bench/core-uint-to-str.rs @@ -1,8 +1,8 @@ fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "10000000"] + ["", "10000000"]/~ } else if args.len() <= 1u { - ["", "100000"] + ["", "100000"]/~ } else { args }; diff --git a/src/test/bench/core-vec-append.rs b/src/test/bench/core-vec-append.rs index e46cf25fade..34d756bb1e4 100644 --- a/src/test/bench/core-vec-append.rs +++ b/src/test/bench/core-vec-append.rs @@ -22,9 +22,9 @@ fn collect_dvec(num: uint) -> [mut uint]/~ { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "50000000"] + ["", "50000000"]/~ } else if args.len() <= 1u { - ["", "100000"] + ["", "100000"]/~ } else { args }; diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs index edad5e0dbba..0c768d05a0e 100644 --- a/src/test/bench/graph500-bfs.rs +++ b/src/test/bench/graph500-bfs.rs @@ -373,9 +373,9 @@ fn validate(edges: [(node_id, node_id)]/~, fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "15", "48"] + ["", "15", "48"]/~ } else if args.len() <= 1u { - ["", "10", "16"] + ["", "10", "16"]/~ } else { args }; diff --git a/src/test/bench/msgsend-ring-new.rs b/src/test/bench/msgsend-ring-new.rs index b8e74520b8f..b23bd25436b 100644 --- a/src/test/bench/msgsend-ring-new.rs +++ b/src/test/bench/msgsend-ring-new.rs @@ -23,9 +23,9 @@ fn thread_ring(i: uint, fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "100", "10000"] + ["", "100", "10000"]/~ } else if args.len() <= 1u { - ["", "100", "1000"] + ["", "100", "1000"]/~ } else { args }; diff --git a/src/test/bench/msgsend-ring.rs b/src/test/bench/msgsend-ring.rs index 5b59005e572..754061a5955 100644 --- a/src/test/bench/msgsend-ring.rs +++ b/src/test/bench/msgsend-ring.rs @@ -23,9 +23,9 @@ fn thread_ring(i: uint, fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "100", "10000"] + ["", "100", "10000"]/~ } else if args.len() <= 1u { - ["", "100", "1000"] + ["", "100", "1000"]/~ } else { args }; diff --git a/src/test/bench/msgsend.rs b/src/test/bench/msgsend.rs index cea712635a0..eef7b0d7257 100644 --- a/src/test/bench/msgsend.rs +++ b/src/test/bench/msgsend.rs @@ -60,9 +60,9 @@ fn run(args: [str]/~) { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "1000000", "10000"] + ["", "1000000", "10000"]/~ } else if args.len() <= 1u { - ["", "10000", "4"] + ["", "10000", "4"]/~ } else { args }; diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout-ackermann.rs index 8f1f95b2581..7d74e453523 100644 --- a/src/test/bench/shootout-ackermann.rs +++ b/src/test/bench/shootout-ackermann.rs @@ -14,9 +14,9 @@ fn ack(m: int, n: int) -> int { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "12"] + ["", "12"]/~ } else if args.len() <= 1u { - ["", "8"] + ["", "8"]/~ } else { args }; diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs index b2769a36e89..bcda26ce183 100644 --- a/src/test/bench/shootout-binarytrees.rs +++ b/src/test/bench/shootout-binarytrees.rs @@ -24,9 +24,9 @@ fn bottom_up_tree(arena: &a.arena::arena, item: int, depth: int) -> &a.tree { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "17"] + ["", "17"]/~ } else if args.len() <= 1u { - ["", "8"] + ["", "8"]/~ } else { args }; diff --git a/src/test/bench/shootout-fannkuchredux.rs b/src/test/bench/shootout-fannkuchredux.rs index 7a518e8c394..b4bdc8d7ba9 100644 --- a/src/test/bench/shootout-fannkuchredux.rs +++ b/src/test/bench/shootout-fannkuchredux.rs @@ -60,9 +60,9 @@ fn fannkuch(n: int) -> int { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "10"] + ["", "10"]/~ } else if args.len() <= 1u { - ["", "8"] + ["", "8"]/~ } else { args }; diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs index 0670f928adb..bd903b373b4 100644 --- a/src/test/bench/shootout-fasta.rs +++ b/src/test/bench/shootout-fasta.rs @@ -77,9 +77,9 @@ fn acid(ch: char, prob: u32) -> aminoacids { ret {ch: ch, prob: prob}; } fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { // alioth tests k-nucleotide with this data at 25,000,000 - ["", "5000000"] + ["", "5000000"]/~ } else if args.len() <= 1u { - ["", "1000"] + ["", "1000"]/~ } else { args }; diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs index 2f076343cfd..79d5f6cc08a 100644 --- a/src/test/bench/shootout-fibo.rs +++ b/src/test/bench/shootout-fibo.rs @@ -10,9 +10,9 @@ fn fib(n: int) -> int { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "40"] + ["", "40"]/~ } else if args.len() <= 1u { - ["", "30"] + ["", "30"]/~ } else { args }; diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index e83b660b9bb..fc9c999a533 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -187,7 +187,7 @@ fn main(args: [str]/~) { // finish... for sizes.eachi { |ii, _sz| - comm::send(to_child[ii], []); + comm::send(to_child[ii], []/~); } // now fetch and print result messages diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index 8b91f8310e7..2d06ae1324c 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -142,7 +142,7 @@ fn writer(path: str, writech: comm::chan>, size: uint) fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "4000", "10"] + ["", "4000", "10"]/~ } else { args }; diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs index 518d1c39d85..6e5e6717861 100644 --- a/src/test/bench/shootout-nbody.rs +++ b/src/test/bench/shootout-nbody.rs @@ -15,9 +15,9 @@ native mod libc { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "4000000"] + ["", "4000000"]/~ } else if args.len() <= 1u { - ["", "100000"] + ["", "100000"]/~ } else { args }; diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index b81d27df5b5..63578897639 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -80,9 +80,9 @@ fn stress(num_tasks: int) { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "20"] + ["", "20"]/~ } else if args.len() <= 1u { - ["", "8"] + ["", "8"]/~ } else { args }; diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout-spectralnorm.rs index 37e3380554b..4678ce41ca8 100644 --- a/src/test/bench/shootout-spectralnorm.rs +++ b/src/test/bench/shootout-spectralnorm.rs @@ -42,9 +42,9 @@ fn eval_AtA_times_u(u: [const float]/~, AtAu: [mut float]/~) { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "2000"] + ["", "2000"]/~ } else if args.len() <= 1u { - ["", "1000"] + ["", "1000"]/~ } else { args }; diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout-threadring.rs index 9d8c5cc165b..7e16160f765 100644 --- a/src/test/bench/shootout-threadring.rs +++ b/src/test/bench/shootout-threadring.rs @@ -39,9 +39,9 @@ fn roundtrip(id: int, p: comm::port, ch: comm::chan) { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "2000000"] + ["", "2000000"]/~ } else if args.len() <= 1u { - ["", "1000"] + ["", "1000"]/~ } else { args }; diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs index b043264ff93..ac25e864278 100644 --- a/src/test/bench/std-smallintmap.rs +++ b/src/test/bench/std-smallintmap.rs @@ -19,9 +19,9 @@ fn check_sequential(min: uint, max: uint, map: smallintmap) { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "100000", "100"] + ["", "100000", "100"]/~ } else if args.len() <= 1u { - ["", "10000", "50"] + ["", "10000", "50"]/~ } else { args }; @@ -49,4 +49,4 @@ fn main(args: [str]/~) { io::stdout().write_str(#fmt(" : %f op/sec\n", maxf/checkf)); io::stdout().write_str(#fmt("get() : %? seconds\n", appendf)); io::stdout().write_str(#fmt(" : %f op/sec\n", maxf/appendf)); -} \ No newline at end of file +} diff --git a/src/test/bench/task-perf-one-million.rs b/src/test/bench/task-perf-one-million.rs index 14896a3e73e..be33193f4f0 100644 --- a/src/test/bench/task-perf-one-million.rs +++ b/src/test/bench/task-perf-one-million.rs @@ -47,9 +47,9 @@ fn calc(children: uint, parent_ch: comm::chan) { fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "100000"] + ["", "100000"]/~ } else if args.len() <= 1u { - ["", "100"] + ["", "100"]/~ } else { args }; diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/task-perf-spawnalot.rs index 686a2175061..05260e1fd3e 100644 --- a/src/test/bench/task-perf-spawnalot.rs +++ b/src/test/bench/task-perf-spawnalot.rs @@ -10,9 +10,9 @@ fn g() { } fn main(args: [str]/~) { let args = if os::getenv("RUST_BENCH").is_some() { - ["", "400"] + ["", "400"]/~ } else if args.len() <= 1u { - ["", "10"] + ["", "10"]/~ } else { args }; diff --git a/src/test/run-fail/unwind-misc-1.rs b/src/test/run-fail/unwind-misc-1.rs index 442efe3be25..abd91751460 100644 --- a/src/test/run-fail/unwind-misc-1.rs +++ b/src/test/run-fail/unwind-misc-1.rs @@ -18,8 +18,8 @@ fn main() { let map = map::hashmap(hash, eq); let mut arr = []/~; for uint::range(0u, 10u) {|i| - arr += [@"key stuff"]; - map.insert(arr, arr + [@"value stuff"]); + arr += [@"key stuff"]/~; + map.insert(arr, arr + [@"value stuff"]/~); } - map.insert([@"boom"], []); + map.insert([@"boom"]/~, []/~); } diff --git a/src/test/run-pass/argv.rs b/src/test/run-pass/argv.rs index d49f54115ec..42f724f1861 100644 --- a/src/test/run-pass/argv.rs +++ b/src/test/run-pass/argv.rs @@ -1,5 +1,5 @@ fn main(args: [str]/~) { - let vs: [str] = ["hi", "there", "this", "is", "a", "vec"]; + let vs: [str]/~ = ["hi", "there", "this", "is", "a", "vec"]/~; let vvs: [[str]/~]/~ = [args, vs]/~; for vvs.each {|vs| for vs.each {|s| log(debug, s); } } } diff --git a/src/test/run-pass/autobind.rs b/src/test/run-pass/autobind.rs index e4a0db4f15d..24d80c23150 100644 --- a/src/test/run-pass/autobind.rs +++ b/src/test/run-pass/autobind.rs @@ -5,5 +5,5 @@ fn g(act: fn([int]/~) -> int) -> int { ret act([1, 2, 3]/~); } fn main() { assert (g(f) == 1); let f1: fn([str]/~) -> str = f; - assert (f1(["x", "y", "z"]) == "x"); + assert (f1(["x", "y", "z"]/~) == "x"); } diff --git a/src/test/run-pass/class-poly-methods-cross-crate.rs b/src/test/run-pass/class-poly-methods-cross-crate.rs index b21f1d4f709..9bdfb8af1d9 100644 --- a/src/test/run-pass/class-poly-methods-cross-crate.rs +++ b/src/test/run-pass/class-poly-methods-cross-crate.rs @@ -5,11 +5,11 @@ import cci_class_6::kitties::*; fn main() { let nyan : cat = cat::(52u, 99, ['p']/~); - let kitty = cat(1000u, 2, ["tabby"]); + let kitty = cat(1000u, 2, ["tabby"]/~); assert(nyan.how_hungry == 99); assert(kitty.how_hungry == 2); nyan.speak([1u,2u,3u]/~); assert(nyan.meow_count() == 55u); - kitty.speak(["meow", "mew", "purr", "chirp"]); + kitty.speak(["meow", "mew", "purr", "chirp"]/~); assert(kitty.meow_count() == 1004u); } diff --git a/src/test/run-pass/class-poly-methods.rs b/src/test/run-pass/class-poly-methods.rs index 0b6b3865d56..9cd9224be93 100644 --- a/src/test/run-pass/class-poly-methods.rs +++ b/src/test/run-pass/class-poly-methods.rs @@ -18,11 +18,11 @@ class cat { fn main() { let nyan : cat = cat::(52u, 99, [9]/~); - let kitty = cat(1000u, 2, ["tabby"]); + let kitty = cat(1000u, 2, ["tabby"]/~); assert(nyan.how_hungry == 99); assert(kitty.how_hungry == 2); nyan.speak([1,2,3]/~); assert(nyan.meow_count() == 55u); - kitty.speak(["meow", "mew", "purr", "chirp"]); + kitty.speak(["meow", "mew", "purr", "chirp"]/~); assert(kitty.meow_count() == 1004u); } diff --git a/src/test/run-pass/command-line-args.rs b/src/test/run-pass/command-line-args.rs index 02ba8f16996..bc74be14d8b 100644 --- a/src/test/run-pass/command-line-args.rs +++ b/src/test/run-pass/command-line-args.rs @@ -1,3 +1,3 @@ -fn main(args: [str]) { log(debug, args[0]); } +fn main(args: [str]/~) { log(debug, args[0]); } diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs index ccbb07fce1f..b0abb2ed6db 100644 --- a/src/test/run-pass/hashmap-memory.rs +++ b/src/test/run-pass/hashmap-memory.rs @@ -94,5 +94,5 @@ mod map_reduce { } fn main() { - map_reduce::map_reduce(["../src/test/run-pass/hashmap-memory.rs"]); + map_reduce::map_reduce(["../src/test/run-pass/hashmap-memory.rs"]/~); } diff --git a/src/test/run-pass/iface-generic.rs b/src/test/run-pass/iface-generic.rs index 21345ed9850..f52498c1182 100644 --- a/src/test/run-pass/iface-generic.rs +++ b/src/test/run-pass/iface-generic.rs @@ -30,8 +30,8 @@ fn bar>(x: T) -> [str]/~ { } fn main() { - assert foo([1]) == ["hi"]; - assert bar::([4, 5]) == ["4", "5"]; - assert bar::(["x", "y"]) == ["x", "y"]; - assert bar::<(), [()]>([()]) == ["()"]; + assert foo([1]) == ["hi"]/~; + assert bar::([4, 5]) == ["4", "5"]/~; + assert bar::(["x", "y"]/~) == ["x", "y"]/~; + assert bar::<(), [()]>([()]) == ["()"]/~; } diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/run-pass/issue-2631-b.rs index 5e0e0302839..81c4f4bbedb 100644 --- a/src/test/run-pass/issue-2631-b.rs +++ b/src/test/run-pass/issue-2631-b.rs @@ -10,7 +10,7 @@ import std::map::str_hash; import dvec; fn main() { - let v = [mut @"hi"]; + let v = [mut @"hi"]/~; let m: req::header_map = str_hash(); m.insert("METHOD", @dvec::from_vec(v)); request::(m); diff --git a/src/test/run-pass/log-str.rs b/src/test/run-pass/log-str.rs index e9b0f1e0c6d..5c086717748 100644 --- a/src/test/run-pass/log-str.rs +++ b/src/test/run-pass/log-str.rs @@ -1,4 +1,4 @@ fn main() { assert "~[1, 2, 3]" == sys::log_str([1, 2, 3]/~); - assert #fmt["%?/%6?", [1, 2, 3], "hi"] == "~[1, 2, 3]/ ~\"hi\""; + assert #fmt["%?/%6?", [1, 2, 3]/~, "hi"] == "~[1, 2, 3]/ ~\"hi\""; } diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs index e171cad58fb..671311018b5 100644 --- a/src/test/run-pass/monad.rs +++ b/src/test/run-pass/monad.rs @@ -22,6 +22,6 @@ fn transform(x: option) -> option { fn main() { assert transform(some(10)) == some("11"); assert transform(none) == none; - assert ["hi"].bind {|x| [x, x + "!"]}.bind {|x| [x, x + "?"]} == - ["hi", "hi?", "hi!", "hi!?"]; + assert ["hi"]/~.bind {|x| [x, x + "!"]/~}.bind {|x| [x, x + "?"]/~} == + ["hi", "hi?", "hi!", "hi!?"]/~; } diff --git a/src/test/run-pass/operator-overloading-leaks.rs b/src/test/run-pass/operator-overloading-leaks.rs index 07186db4da9..bcb344f5acd 100644 --- a/src/test/run-pass/operator-overloading-leaks.rs +++ b/src/test/run-pass/operator-overloading-leaks.rs @@ -2,11 +2,11 @@ impl methods for [T]/~ { fn -(x: [T]/&) -> [T]/~ { - [x[0], x[0], x[0]] + [x[0], x[0], x[0]]/~ } fn foo(x: [T]/&) -> [T]/~ { - [x[0], x[0], x[0]] + [x[0], x[0], x[0]]/~ } } 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 94d78b5f556..ff2b8030326 100644 --- a/src/test/run-pass/ret-break-cont-in-block.rs +++ b/src/test/run-pass/ret-break-cont-in-block.rs @@ -47,7 +47,7 @@ fn main() { assert find_pos(1, [0, 1, 2, 3]/~) == some(1u); assert find_pos(1, [0, 4, 2, 3]/~) == none; - assert find_pos("hi", ["foo", "bar", "baz", "hi"]) == some(3u); + assert find_pos("hi", ["foo", "bar", "baz", "hi"]/~) == some(3u); bail_deep([[false, false]/~, [true, true]/~, [false, true]/~]/~); bail_deep([[true]/~]/~); diff --git a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs index 3a40b378f14..d041040772b 100644 --- a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs +++ b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs @@ -23,7 +23,7 @@ type ty = spanned; fn main() { let sp: span = {lo: 57451u, hi: 57542u, expanded_from: os_none}; let t: @ty = @{ data: 3u, span: sp }; - let p_: path_ = { global: true, idents: ["hi"], types: [t] }; + let p_: path_ = { global: true, idents: ["hi"]/~, types: [t] }; let p: path = { data: p_, span: sp }; let x = { sp: sp, path: p }; log(error, x.path); diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs index a70ffba452e..b0a7bd30d81 100644 --- a/src/test/run-pass/swap-2.rs +++ b/src/test/run-pass/swap-2.rs @@ -1,4 +1,4 @@ -fn swap(v: [mut T], i: int, j: int) { v[i] <-> v[j]; } +fn swap(v: [mut T]/~, i: int, j: int) { v[i] <-> v[j]; } fn main() { let a: [mut int]/~ = [mut 0, 1, 2, 3, 4, 5, 6]/~;