diff options
| author | bors <bors@rust-lang.org> | 2016-01-17 12:23:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-17 12:23:57 +0000 |
| commit | bff52927f582e2ca8dea799bd58f06e654295e21 (patch) | |
| tree | 2286b17c8092d1e6a9a026ef979dd7ecd333b348 /src/libtest | |
| parent | 0b524edb043c22a577968290fed1a4ff9936a28a (diff) | |
| parent | 00a4eeadaf10156e2e2b7a0c050c2ca1ac826f76 (diff) | |
| download | rust-bff52927f582e2ca8dea799bd58f06e654295e21.tar.gz rust-bff52927f582e2ca8dea799bd58f06e654295e21.zip | |
Auto merge of #30975 - Manishearth:rollup, r=Manishearth
- Successful merges: #30938, #30940, #30943, #30949, #30952, #30957, #30959 - Failed merges:
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index dcc344c4ffd..00c9d30c563 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -1275,8 +1275,7 @@ pub mod bench { let ns_iter_summ = bs.auto_bench(f); let ns_iter = cmp::max(ns_iter_summ.median as u64, 1); - let iter_s = 1_000_000_000 / ns_iter; - let mb_s = (bs.bytes * iter_s) / 1_000_000; + let mb_s = bs.bytes * 1000 / ns_iter; BenchSamples { ns_iter_summ: ns_iter_summ, |