Skip to content

Commit dbbb847

Browse files
committed
Handle fallout in bench tests
1 parent eab6bb2 commit dbbb847

17 files changed

+18
-5
lines changed

src/test/bench/core-map.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ fn vector<M: MutableMap<uint, uint>>(map: &mut M, n_keys: uint, dist: &[uint]) {
9090

9191
fn main() {
9292
let args = os::args();
93+
let args = args.as_slice();
9394
let n_keys = {
9495
if args.len() == 2 {
9596
from_str::<uint>(args[1]).unwrap()

src/test/bench/core-set.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ fn empty_results() -> Results {
155155

156156
fn main() {
157157
let args = os::args();
158+
let args = args.as_slice();
158159
let num_keys = {
159160
if args.len() == 2 {
160161
from_str::<uint>(args[1]).unwrap()

src/test/bench/core-std.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use std::vec;
2424
use std::io::File;
2525

2626
macro_rules! bench (
27-
($argv:expr, $id:ident) => (maybe_run_test($argv, stringify!($id).to_owned(), $id))
27+
($argv:expr, $id:ident) => (maybe_run_test($argv.as_slice(), stringify!($id).to_owned(), $id))
2828
)
2929

3030
fn main() {

src/test/bench/rt-messaging-ping-pong.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ fn ping_pong_bench(n: uint, m: uint) {
6161
fn main() {
6262

6363
let args = os::args();
64+
let args = args.as_slice();
6465
let n = if args.len() == 3 {
6566
from_str::<uint>(args[1]).unwrap()
6667
} else {

src/test/bench/rt-parfib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fn parfib(n: uint) -> uint {
3131
fn main() {
3232

3333
let args = os::args();
34+
let args = args.as_slice();
3435
let n = if args.len() == 2 {
3536
from_str::<uint>(args[1]).unwrap()
3637
} else {

src/test/bench/rt-spawn-rate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ fn start(argc: int, argv: **u8) -> int {
2828
fn main() {
2929

3030
let args = os::args();
31+
let args = args.as_slice();
3132
let n = if args.len() == 2 {
3233
from_str::<uint>(args[1]).unwrap()
3334
} else {

src/test/bench/shootout-binarytrees.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ fn bottom_up_tree<'r>(arena: &'r TypedArena<Tree<'r>>, item: int, depth: int)
4040

4141
fn main() {
4242
let args = std::os::args();
43+
let args = args.as_slice();
4344
let n = if std::os::getenv("RUST_BENCH").is_some() {
4445
17
4546
} else if args.len() <= 1u {

src/test/bench/shootout-chameneos-redux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ fn main() {
194194
let nn = if std::os::getenv("RUST_BENCH").is_some() {
195195
200000
196196
} else {
197-
std::os::args().get(1).and_then(|arg| from_str(*arg)).unwrap_or(600)
197+
std::os::args().as_slice().get(1).and_then(|arg| from_str(*arg)).unwrap_or(600)
198198
};
199199

200200
print_complements();

src/test/bench/shootout-fannkuch-redux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn fannkuch(n: uint, i: uint) -> (int, int) {
5353
}
5454

5555
fn main() {
56-
let n = std::os::args().get(1).and_then(|arg| from_str(*arg)).unwrap_or(2u);
56+
let n = std::os::args().as_slice().get(1).and_then(|arg| from_str(*arg)).unwrap_or(2u);
5757

5858
let (tx, rx) = channel();
5959
for i in range(0, n) {

src/test/bench/shootout-fasta-redux.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ impl<'a, W: Writer> RandomFasta<'a, W> {
177177

178178
fn main() {
179179
let args = os::args();
180+
let args = args.as_slice();
180181
let n = if args.len() > 1 {
181182
from_str::<uint>(args[1]).unwrap()
182183
} else {

0 commit comments

Comments
 (0)