Skip to content

Commit 1f6db7f

Browse files
committedMay 6, 2014
auto merge of #13822 : EdorianDark/rust/master, r=cmr
New attempt to generalize stats, after #12606. Since #12355 did not get merged, i want go get first get my change done and the try to fix sum.
2 parents c600dc0 + a8da4f7 commit 1f6db7f

File tree

2 files changed

+115
-98
lines changed

2 files changed

+115
-98
lines changed
 

‎src/libtest/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ pub fn opt_shard(maybestr: Option<~str>) -> Option<(uint,uint)> {
413413

414414
#[deriving(Clone, Eq)]
415415
pub struct BenchSamples {
416-
ns_iter_summ: stats::Summary,
416+
ns_iter_summ: stats::Summary<f64>,
417417
mb_s: uint,
418418
}
419419

@@ -1249,7 +1249,7 @@ impl Bencher {
12491249
}
12501250

12511251
// This is a more statistics-driven benchmark algorithm
1252-
pub fn auto_bench(&mut self, f: |&mut Bencher|) -> stats::Summary {
1252+
pub fn auto_bench(&mut self, f: |&mut Bencher|) -> stats::Summary<f64> {
12531253

12541254
// Initial bench run to get ballpark figure.
12551255
let mut n = 1_u64;

0 commit comments

Comments
 (0)
Please sign in to comment.