diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-12 15:42:39 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-08-12 16:13:13 -0700 |
| commit | ee7d03f7d7691e7ada44c29e09edebb2cf3791c5 (patch) | |
| tree | 3488e2d12fbd03333e7204f7a5f6c562865ac863 /src/test/bench | |
| parent | 594c7fb0c6eb997afa7da32a2a6b4f0f78522c3f (diff) | |
| download | rust-ee7d03f7d7691e7ada44c29e09edebb2cf3791c5.tar.gz rust-ee7d03f7d7691e7ada44c29e09edebb2cf3791c5.zip | |
Convert most working tests to ivecs
I tried to pay attention to what was actually being tested so, e.g. when I test was just using a vec as a boxed thing, I converted to boxed ints, etc. Haven't converted the macro tests yet. Not sure what to do there.
Diffstat (limited to 'src/test/bench')
| -rw-r--r-- | src/test/bench/shootout-nbody.rs | 14 | ||||
| -rw-r--r-- | src/test/bench/shootout-pfib.rs | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs index 08ef4995ad4..5be089671d9 100644 --- a/src/test/bench/shootout-nbody.rs +++ b/src/test/bench/shootout-nbody.rs @@ -12,9 +12,9 @@ fn main() { // during 'make check' under valgrind // 5000000 // 50000000 - let inputs: vec[int] = [50000, 500000]; + let inputs: [int] = ~[50000, 500000]; - let bodies: vec[Body::props] = NBodySystem::MakeNBodySystem(); + let bodies: [Body::props] = NBodySystem::MakeNBodySystem(); for n: int in inputs { @@ -31,10 +31,10 @@ fn main() { mod NBodySystem { - fn MakeNBodySystem() -> vec[Body::props] { + fn MakeNBodySystem() -> [Body::props] { // these each return a Body::props - let bodies: vec[Body::props] = - [Body::sun(), Body::jupiter(), Body::saturn(), Body::uranus(), + let bodies: [Body::props] = + ~[Body::sun(), Body::jupiter(), Body::saturn(), Body::uranus(), Body::neptune()]; let px: float = 0.0; @@ -56,7 +56,7 @@ mod NBodySystem { ret bodies; } - fn advance(bodies: vec[Body::props], dt: float) { + fn advance(bodies: &[Body::props], dt: float) { let i: int = 0; while i < 5 { @@ -95,7 +95,7 @@ mod NBodySystem { b.z += dt * b.vz; } - fn energy(bodies: vec[Body::props]) -> float { + fn energy(bodies: &[Body::props]) -> float { let dx: float; let dy: float; let dz: float; diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 101883d2ba0..dec058bb592 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -69,9 +69,9 @@ fn stress_task(id: int) { } fn stress(num_tasks: int) { - let tasks = []; + let tasks = ~[]; for each i: int in range(0, num_tasks) { - tasks += [spawn stress_task(i)]; + tasks += ~[spawn stress_task(i)]; } for each i: int in range(0, num_tasks) { task::join(tasks.(i)); } } |
