---

yaml
---
r: 96063
b: refs/heads/dist-snap
c: 33ee433
h: refs/heads/master
i:
  96061: e802fa5
  96059: f01cc88
  96055: 8c519ff
  96047: 0302ac2
  96031: a3fddda
  95999: cb618e0
v: v3

Author: willingc

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 3b0d48634f546055e17cf23a6bcde1bbfbc16b15
+refs/heads/dist-snap: 33ee4335b97947dca1efc3fbc833eba60d842164
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/test/bench/shootout-ackermann.rs

@@ -10,7 +10,6 @@
 
 extern mod extra;
 
-use std::int;
 use std::os;
 
 fn ack(m: int, n: int) -> int {

branches/dist-snap/src/test/bench/shootout-chameneos-redux.rs

@@ -17,7 +17,6 @@ use std::comm::{stream, SharedChan};
 use std::option;
 use std::os;
 use std::task;
-use std::uint;
 
 fn print_complements() {
     let all = [Blue, Red, Yellow];

branches/dist-snap/src/test/bench/shootout-fibo.rs

@@ -10,7 +10,6 @@
 
 extern mod extra;
 
-use std::int;
 use std::os;
 
 fn fib(n: int) -> int {

branches/dist-snap/src/test/bench/shootout-nbody.rs

@@ -1,6 +1,3 @@
-// xfail-test reading from os::args()[1] - bogus!
-
-use std::from_str::FromStr;
 use std::os;
 
 static PI: f64 = 3.141592653589793;
@@ -139,13 +136,23 @@ fn offset_momentum(bodies: &mut [Planet, ..N_BODIES]) {
 }
 
 fn main() {
-    let n: i32 = FromStr::from_str(os::args()[1]).unwrap();
+    let args = os::args();
+    let args = if os::getenv("RUST_BENCH").is_some() {
+        ~[~"", ~"1000"]
+    } else if args.len() <= 1u {
+        ~[~"", ~"1000"]
+    } else {
+        args
+    };
+
+    let n: i32 = from_str::<i32>(args[1]).unwrap();
     let mut bodies = BODIES;
 
     offset_momentum(&mut bodies);
-    println!("{:.9f}", energy(&bodies) as float);
+    println!("{:.9f}", energy(&bodies) as f64);
 
     advance(&mut bodies, 0.01, n);
 
-    println!("{:.9f}", energy(&bodies) as float);
+    println!("{:.9f}", energy(&bodies) as f64);
 }
+