From 3fa4d838657731ec2b9b675a1e122d0b1eb89131 Mon Sep 17 00:00:00 2001 From: Cesar Eduardo Barros Date: Fri, 24 Nov 2017 08:33:10 -0200 Subject: [PATCH] Fix bench --- src/blake2.rs | 12 ++++++++---- src/lib.rs | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/blake2.rs b/src/blake2.rs index 554b25b..4fa602d 100644 --- a/src/blake2.rs +++ b/src/blake2.rs @@ -357,16 +357,20 @@ macro_rules! blake2_bench_impl { ($state:ident, $bytes:expr) => { #[cfg(all(feature = "bench", test))] mod bench { + use std::iter::repeat; + use std::vec::Vec; use test::Bencher; use blake2::selftest_seq; use super::$state; - #[cfg_attr(feature = "clippy", allow(cast_possible_truncation))] - fn bench_blake2(bytes: u64, b: &mut Bencher) { - let data = selftest_seq(bytes as usize); + fn bench_blake2(bytes: usize, b: &mut Bencher) { + let data: Vec = repeat(selftest_seq(1024)) + .flat_map(|v| v) + .take(bytes) + .collect(); - b.bytes = bytes; + b.bytes = bytes as u64; b.iter(|| { let mut state = $state::new($bytes); state.update(&data[..]); diff --git a/src/lib.rs b/src/lib.rs index 55f3cfa..eca7b4a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,7 +20,7 @@ #![cfg_attr(feature = "simd_opt", feature(cfg_target_feature))] #![cfg_attr(feature = "simd_asm", feature(asm))] -#[cfg(feature = "std")] +#[cfg(any(feature = "std", all(feature = "bench", test)))] #[macro_use] extern crate std;