From 82645a31df6081fb1a29ee03e2cc2e297ca1f60e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 26 May 2015 07:21:12 -0700 Subject: [PATCH] Don't print to stdout on `cargo bench` --- Cargo.toml | 4 ++++ benches/shootout-pidigits.rs | 31 ++++++++++++------------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fb6e777..4e003e3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,3 +16,7 @@ rational, and complex types. [dependencies] rustc-serialize = "0.3.13" rand = "0.3.8" + +[[bench]] +name = "shootout-pidigits" +harness = false diff --git a/benches/shootout-pidigits.rs b/benches/shootout-pidigits.rs index 8067af4..7ddb3d1 100644 --- a/benches/shootout-pidigits.rs +++ b/benches/shootout-pidigits.rs @@ -38,16 +38,12 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED // OF THE POSSIBILITY OF SUCH DAMAGE. -#![feature(test)] - extern crate num; -extern crate test; use std::str::FromStr; +use std::io; + use num::traits::{FromPrimitive, ToPrimitive}; - -use test::Bencher; - use num::{BigInt, Integer, One, Zero}; struct Context { @@ -93,7 +89,7 @@ impl Context { } } -fn pidigits(n: isize) { +fn pidigits(n: isize, out: &mut io::Write) -> io::Result<()> { let mut k = 0; let mut context = Context::new(); @@ -106,33 +102,30 @@ fn pidigits(n: isize) { if d != -1 {break;} } - print!("{}", d); - if i % 10 == 0 {print!("\t:{}\n", i);} + try!(write!(out, "{}", d)); + if i % 10 == 0 { try!(write!(out, "\t:{}\n", i)); } context.eliminate_digit(d); } let m = n % 10; if m != 0 { - for _ in (m..10) { print!(" "); } - print!("\t:{}\n", n); + for _ in (m..10) { try!(write!(out, " ")); } + try!(write!(out, "\t:{}\n", n)); } + Ok(()) } -static DEFAULT_DIGITS: isize = 512; +const DEFAULT_DIGITS: isize = 512; -#[bench] -fn use_bencher(b: &mut Bencher) { - b.iter(|| pidigits(DEFAULT_DIGITS)) -} - -#[allow(dead_code)] fn main() { let args = std::env::args().collect::>(); let n = if args.len() < 2 { DEFAULT_DIGITS + } else if args[1] == "--bench" { + return pidigits(DEFAULT_DIGITS, &mut std::io::sink()).unwrap() } else { FromStr::from_str(&args[1]).unwrap() }; - pidigits(n); + pidigits(n, &mut std::io::stdout()).unwrap(); }