Skip to content

Commit e776047

Browse files
committed
Make a bunch of tests stop using the deprecated vector syntax.
1 parent c9e8b7d commit e776047

35 files changed

+63
-63
lines changed

src/test/bench/core-uint-to-str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
fn main(args: [str]/~) {
22
let args = if os::getenv("RUST_BENCH").is_some() {
3-
["", "10000000"]
3+
["", "10000000"]/~
44
} else if args.len() <= 1u {
5-
["", "100000"]
5+
["", "100000"]/~
66
} else {
77
args
88
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ fn collect_dvec(num: uint) -> [mut uint]/~ {
2222

2323
fn main(args: [str]/~) {
2424
let args = if os::getenv("RUST_BENCH").is_some() {
25-
["", "50000000"]
25+
["", "50000000"]/~
2626
} else if args.len() <= 1u {
27-
["", "100000"]
27+
["", "100000"]/~
2828
} else {
2929
args
3030
};

src/test/bench/graph500-bfs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ fn validate(edges: [(node_id, node_id)]/~,
373373

374374
fn main(args: [str]/~) {
375375
let args = if os::getenv("RUST_BENCH").is_some() {
376-
["", "15", "48"]
376+
["", "15", "48"]/~
377377
} else if args.len() <= 1u {
378-
["", "10", "16"]
378+
["", "10", "16"]/~
379379
} else {
380380
args
381381
};

src/test/bench/msgsend-ring-new.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ fn thread_ring(i: uint,
2323

2424
fn main(args: [str]/~) {
2525
let args = if os::getenv("RUST_BENCH").is_some() {
26-
["", "100", "10000"]
26+
["", "100", "10000"]/~
2727
} else if args.len() <= 1u {
28-
["", "100", "1000"]
28+
["", "100", "1000"]/~
2929
} else {
3030
args
3131
};

src/test/bench/msgsend-ring.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ fn thread_ring(i: uint,
2323

2424
fn main(args: [str]/~) {
2525
let args = if os::getenv("RUST_BENCH").is_some() {
26-
["", "100", "10000"]
26+
["", "100", "10000"]/~
2727
} else if args.len() <= 1u {
28-
["", "100", "1000"]
28+
["", "100", "1000"]/~
2929
} else {
3030
args
3131
};

src/test/bench/msgsend.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ fn run(args: [str]/~) {
6060

6161
fn main(args: [str]/~) {
6262
let args = if os::getenv("RUST_BENCH").is_some() {
63-
["", "1000000", "10000"]
63+
["", "1000000", "10000"]/~
6464
} else if args.len() <= 1u {
65-
["", "10000", "4"]
65+
["", "10000", "4"]/~
6666
} else {
6767
args
6868
};

src/test/bench/shootout-ackermann.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ fn ack(m: int, n: int) -> int {
1414

1515
fn main(args: [str]/~) {
1616
let args = if os::getenv("RUST_BENCH").is_some() {
17-
["", "12"]
17+
["", "12"]/~
1818
} else if args.len() <= 1u {
19-
["", "8"]
19+
["", "8"]/~
2020
} else {
2121
args
2222
};

src/test/bench/shootout-binarytrees.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ fn bottom_up_tree(arena: &a.arena::arena, item: int, depth: int) -> &a.tree {
2424

2525
fn main(args: [str]/~) {
2626
let args = if os::getenv("RUST_BENCH").is_some() {
27-
["", "17"]
27+
["", "17"]/~
2828
} else if args.len() <= 1u {
29-
["", "8"]
29+
["", "8"]/~
3030
} else {
3131
args
3232
};

src/test/bench/shootout-fannkuchredux.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ fn fannkuch(n: int) -> int {
6060

6161
fn main(args: [str]/~) {
6262
let args = if os::getenv("RUST_BENCH").is_some() {
63-
["", "10"]
63+
["", "10"]/~
6464
} else if args.len() <= 1u {
65-
["", "8"]
65+
["", "8"]/~
6666
} else {
6767
args
6868
};

src/test/bench/shootout-fasta.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ fn acid(ch: char, prob: u32) -> aminoacids { ret {ch: ch, prob: prob}; }
7777
fn main(args: [str]/~) {
7878
let args = if os::getenv("RUST_BENCH").is_some() {
7979
// alioth tests k-nucleotide with this data at 25,000,000
80-
["", "5000000"]
80+
["", "5000000"]/~
8181
} else if args.len() <= 1u {
82-
["", "1000"]
82+
["", "1000"]/~
8383
} else {
8484
args
8585
};

src/test/bench/shootout-fibo.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ fn fib(n: int) -> int {
1010

1111
fn main(args: [str]/~) {
1212
let args = if os::getenv("RUST_BENCH").is_some() {
13-
["", "40"]
13+
["", "40"]/~
1414
} else if args.len() <= 1u {
15-
["", "30"]
15+
["", "30"]/~
1616
} else {
1717
args
1818
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ fn main(args: [str]/~) {
187187

188188
// finish...
189189
for sizes.eachi { |ii, _sz|
190-
comm::send(to_child[ii], []);
190+
comm::send(to_child[ii], []/~);
191191
}
192192

193193
// now fetch and print result messages

src/test/bench/shootout-mandelbrot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ fn writer(path: str, writech: comm::chan<comm::chan<line>>, size: uint)
142142

143143
fn main(args: [str]/~) {
144144
let args = if os::getenv("RUST_BENCH").is_some() {
145-
["", "4000", "10"]
145+
["", "4000", "10"]/~
146146
} else {
147147
args
148148
};

src/test/bench/shootout-nbody.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ native mod libc {
1515

1616
fn main(args: [str]/~) {
1717
let args = if os::getenv("RUST_BENCH").is_some() {
18-
["", "4000000"]
18+
["", "4000000"]/~
1919
} else if args.len() <= 1u {
20-
["", "100000"]
20+
["", "100000"]/~
2121
} else {
2222
args
2323
};

src/test/bench/shootout-pfib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ fn stress(num_tasks: int) {
8080

8181
fn main(args: [str]/~) {
8282
let args = if os::getenv("RUST_BENCH").is_some() {
83-
["", "20"]
83+
["", "20"]/~
8484
} else if args.len() <= 1u {
85-
["", "8"]
85+
["", "8"]/~
8686
} else {
8787
args
8888
};

src/test/bench/shootout-spectralnorm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ fn eval_AtA_times_u(u: [const float]/~, AtAu: [mut float]/~) {
4242

4343
fn main(args: [str]/~) {
4444
let args = if os::getenv("RUST_BENCH").is_some() {
45-
["", "2000"]
45+
["", "2000"]/~
4646
} else if args.len() <= 1u {
47-
["", "1000"]
47+
["", "1000"]/~
4848
} else {
4949
args
5050
};

src/test/bench/shootout-threadring.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ fn roundtrip(id: int, p: comm::port<int>, ch: comm::chan<int>) {
3939

4040
fn main(args: [str]/~) {
4141
let args = if os::getenv("RUST_BENCH").is_some() {
42-
["", "2000000"]
42+
["", "2000000"]/~
4343
} else if args.len() <= 1u {
44-
["", "1000"]
44+
["", "1000"]/~
4545
} else {
4646
args
4747
};

src/test/bench/std-smallintmap.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ fn check_sequential(min: uint, max: uint, map: smallintmap<uint>) {
1919

2020
fn main(args: [str]/~) {
2121
let args = if os::getenv("RUST_BENCH").is_some() {
22-
["", "100000", "100"]
22+
["", "100000", "100"]/~
2323
} else if args.len() <= 1u {
24-
["", "10000", "50"]
24+
["", "10000", "50"]/~
2525
} else {
2626
args
2727
};
@@ -49,4 +49,4 @@ fn main(args: [str]/~) {
4949
io::stdout().write_str(#fmt(" : %f op/sec\n", maxf/checkf));
5050
io::stdout().write_str(#fmt("get() : %? seconds\n", appendf));
5151
io::stdout().write_str(#fmt(" : %f op/sec\n", maxf/appendf));
52-
}
52+
}

src/test/bench/task-perf-one-million.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ fn calc(children: uint, parent_ch: comm::chan<msg>) {
4747

4848
fn main(args: [str]/~) {
4949
let args = if os::getenv("RUST_BENCH").is_some() {
50-
["", "100000"]
50+
["", "100000"]/~
5151
} else if args.len() <= 1u {
52-
["", "100"]
52+
["", "100"]/~
5353
} else {
5454
args
5555
};

src/test/bench/task-perf-spawnalot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ fn g() { }
1010

1111
fn main(args: [str]/~) {
1212
let args = if os::getenv("RUST_BENCH").is_some() {
13-
["", "400"]
13+
["", "400"]/~
1414
} else if args.len() <= 1u {
15-
["", "10"]
15+
["", "10"]/~
1616
} else {
1717
args
1818
};

src/test/run-fail/unwind-misc-1.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ fn main() {
1818
let map = map::hashmap(hash, eq);
1919
let mut arr = []/~;
2020
for uint::range(0u, 10u) {|i|
21-
arr += [@"key stuff"];
22-
map.insert(arr, arr + [@"value stuff"]);
21+
arr += [@"key stuff"]/~;
22+
map.insert(arr, arr + [@"value stuff"]/~);
2323
}
24-
map.insert([@"boom"], []);
24+
map.insert([@"boom"]/~, []/~);
2525
}

src/test/run-pass/argv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn main(args: [str]/~) {
2-
let vs: [str] = ["hi", "there", "this", "is", "a", "vec"];
2+
let vs: [str]/~ = ["hi", "there", "this", "is", "a", "vec"]/~;
33
let vvs: [[str]/~]/~ = [args, vs]/~;
44
for vvs.each {|vs| for vs.each {|s| log(debug, s); } }
55
}

src/test/run-pass/autobind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ fn g(act: fn([int]/~) -> int) -> int { ret act([1, 2, 3]/~); }
55
fn main() {
66
assert (g(f) == 1);
77
let f1: fn([str]/~) -> str = f;
8-
assert (f1(["x", "y", "z"]) == "x");
8+
assert (f1(["x", "y", "z"]/~) == "x");
99
}

src/test/run-pass/class-poly-methods-cross-crate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import cci_class_6::kitties::*;
55

66
fn main() {
77
let nyan : cat<char> = cat::<char>(52u, 99, ['p']/~);
8-
let kitty = cat(1000u, 2, ["tabby"]);
8+
let kitty = cat(1000u, 2, ["tabby"]/~);
99
assert(nyan.how_hungry == 99);
1010
assert(kitty.how_hungry == 2);
1111
nyan.speak([1u,2u,3u]/~);
1212
assert(nyan.meow_count() == 55u);
13-
kitty.speak(["meow", "mew", "purr", "chirp"]);
13+
kitty.speak(["meow", "mew", "purr", "chirp"]/~);
1414
assert(kitty.meow_count() == 1004u);
1515
}

src/test/run-pass/class-poly-methods.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ class cat<U> {
1818

1919
fn main() {
2020
let nyan : cat<int> = cat::<int>(52u, 99, [9]/~);
21-
let kitty = cat(1000u, 2, ["tabby"]);
21+
let kitty = cat(1000u, 2, ["tabby"]/~);
2222
assert(nyan.how_hungry == 99);
2323
assert(kitty.how_hungry == 2);
2424
nyan.speak([1,2,3]/~);
2525
assert(nyan.meow_count() == 55u);
26-
kitty.speak(["meow", "mew", "purr", "chirp"]);
26+
kitty.speak(["meow", "mew", "purr", "chirp"]/~);
2727
assert(kitty.meow_count() == 1004u);
2828
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

22

3-
fn main(args: [str]) { log(debug, args[0]); }
3+
fn main(args: [str]/~) { log(debug, args[0]); }

src/test/run-pass/hashmap-memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@ mod map_reduce {
9494
}
9595

9696
fn main() {
97-
map_reduce::map_reduce(["../src/test/run-pass/hashmap-memory.rs"]);
97+
map_reduce::map_reduce(["../src/test/run-pass/hashmap-memory.rs"]/~);
9898
}

src/test/run-pass/iface-generic.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fn bar<U: to_str, T: map<U>>(x: T) -> [str]/~ {
3030
}
3131

3232
fn main() {
33-
assert foo([1]) == ["hi"];
34-
assert bar::<int, [int]>([4, 5]) == ["4", "5"];
35-
assert bar::<str, [str]>(["x", "y"]) == ["x", "y"];
36-
assert bar::<(), [()]>([()]) == ["()"];
33+
assert foo([1]) == ["hi"]/~;
34+
assert bar::<int, [int]>([4, 5]) == ["4", "5"]/~;
35+
assert bar::<str, [str]>(["x", "y"]/~) == ["x", "y"]/~;
36+
assert bar::<(), [()]>([()]) == ["()"]/~;
3737
}

src/test/run-pass/issue-2631-b.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import std::map::str_hash;
1010
import dvec;
1111

1212
fn main() {
13-
let v = [mut @"hi"];
13+
let v = [mut @"hi"]/~;
1414
let m: req::header_map = str_hash();
1515
m.insert("METHOD", @dvec::from_vec(v));
1616
request::<int>(m);

src/test/run-pass/log-str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fn main() {
22
assert "~[1, 2, 3]" == sys::log_str([1, 2, 3]/~);
3-
assert #fmt["%?/%6?", [1, 2, 3], "hi"] == "~[1, 2, 3]/ ~\"hi\"";
3+
assert #fmt["%?/%6?", [1, 2, 3]/~, "hi"] == "~[1, 2, 3]/ ~\"hi\"";
44
}

src/test/run-pass/monad.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ fn transform(x: option<int>) -> option<str> {
2222
fn main() {
2323
assert transform(some(10)) == some("11");
2424
assert transform(none) == none;
25-
assert ["hi"].bind {|x| [x, x + "!"]}.bind {|x| [x, x + "?"]} ==
26-
["hi", "hi?", "hi!", "hi!?"];
25+
assert ["hi"]/~.bind {|x| [x, x + "!"]/~}.bind {|x| [x, x + "?"]/~} ==
26+
["hi", "hi?", "hi!", "hi!?"]/~;
2727
}

src/test/run-pass/operator-overloading-leaks.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
impl methods<T: copy> for [T]/~ {
44
fn -(x: [T]/&) -> [T]/~ {
5-
[x[0], x[0], x[0]]
5+
[x[0], x[0], x[0]]/~
66
}
77

88
fn foo(x: [T]/&) -> [T]/~ {
9-
[x[0], x[0], x[0]]
9+
[x[0], x[0], x[0]]/~
1010
}
1111
}
1212

src/test/run-pass/ret-break-cont-in-block.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn main() {
4747

4848
assert find_pos(1, [0, 1, 2, 3]/~) == some(1u);
4949
assert find_pos(1, [0, 4, 2, 3]/~) == none;
50-
assert find_pos("hi", ["foo", "bar", "baz", "hi"]) == some(3u);
50+
assert find_pos("hi", ["foo", "bar", "baz", "hi"]/~) == some(3u);
5151

5252
bail_deep([[false, false]/~, [true, true]/~, [false, true]/~]/~);
5353
bail_deep([[true]/~]/~);

src/test/run-pass/shape_intrinsic_tag_then_rec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type ty = spanned<ty_>;
2323
fn main() {
2424
let sp: span = {lo: 57451u, hi: 57542u, expanded_from: os_none};
2525
let t: @ty = @{ data: 3u, span: sp };
26-
let p_: path_ = { global: true, idents: ["hi"], types: [t] };
26+
let p_: path_ = { global: true, idents: ["hi"]/~, types: [t] };
2727
let p: path = { data: p_, span: sp };
2828
let x = { sp: sp, path: p };
2929
log(error, x.path);

src/test/run-pass/swap-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
fn swap<T>(v: [mut T], i: int, j: int) { v[i] <-> v[j]; }
1+
fn swap<T>(v: [mut T]/~, i: int, j: int) { v[i] <-> v[j]; }
22

33
fn main() {
44
let a: [mut int]/~ = [mut 0, 1, 2, 3, 4, 5, 6]/~;

0 commit comments

Comments
 (0)