Use criterion for benches

Cargo.toml

@@ -25,3 +25,14 @@ nightly = ["no_cc"]
 cc = "1.0"
 
 [dependencies]
+
+[dev-dependencies]
+criterion = { version = "0.3", features = ["cargo_bench_support", "html_reports"] }
+
+[[bench]]
+name = "clear_on_drop"
+harness = false
+
+[[bench]]
+name = "clear_stack_on_return"
+harness = false

benches/clear_on_drop.rs

@@ -1,40 +1,53 @@
-#![feature(test)]
+use criterion::{criterion_group, criterion_main, Criterion};
 
-extern crate test;
-use test::Bencher;
-
-extern crate clear_on_drop;
 use clear_on_drop::ClearOnDrop;
 
-#[bench]
-fn clear_on_drop_small(b: &mut Bencher) {
+fn clear_on_drop_small(c: &mut Criterion) {
     #[derive(Default)]
     struct Data {
         _data: u64,
     }
 
     let mut place = Data::default();
-    b.iter(|| { ClearOnDrop::new(&mut place); })
+    c.bench_function("clear_on_drop_small", |b| {
+        b.iter(|| {
+            ClearOnDrop::new(&mut place);
+        })
+    });
 }
 
-#[bench]
-fn clear_on_drop_medium(b: &mut Bencher) {
+fn clear_on_drop_medium(c: &mut Criterion) {
     #[derive(Default)]
     struct Data {
         _data: [u64; 32],
     }
 
     let mut place = Data::default();
-    b.iter(|| { ClearOnDrop::new(&mut place); })
+    c.bench_function("clear_on_drop_medium", |b| {
+        b.iter(|| {
+            ClearOnDrop::new(&mut place);
+        })
+    });
 }
 
-#[bench]
-fn clear_on_drop_large(b: &mut Bencher) {
+fn clear_on_drop_large(c: &mut Criterion) {
     #[derive(Default)]
     struct Data {
         _data: [[u64; 32]; 32],
     }
 
     let mut place = Data::default();
-    b.iter(|| { ClearOnDrop::new(&mut place); })
+    c.bench_function("clear_on_drop_large", |b| {
+        b.iter(|| {
+            ClearOnDrop::new(&mut place);
+        })
+    });
 }
+
+criterion_group!(
+    benches,
+    clear_on_drop_small,
+    clear_on_drop_medium,
+    clear_on_drop_large
+);
+criterion_main!(benches);

benches/clear_stack_on_return.rs

@@ -1,27 +1,36 @@
-#![feature(test)]
+use criterion::{criterion_group, criterion_main, Criterion};
 
-extern crate test;
-use test::Bencher;
-
-extern crate clear_on_drop;
 use clear_on_drop::{clear_stack_on_return, clear_stack_on_return_fnonce};
 
-#[bench]
-fn clear_stack_on_return_tiny(b: &mut Bencher) {
-    b.iter(|| clear_stack_on_return(1, || 0x41))
+fn clear_stack_on_return_tiny(c: &mut Criterion) {
+    c.bench_function("clear_stack_on_return_tiny", |b| {
+        b.iter(|| clear_stack_on_return(1, || 0x41))
+    });
 }
 
-#[bench]
-fn clear_stack_on_return_small(b: &mut Bencher) {
-    b.iter(|| clear_stack_on_return(2, || 0x41))
+fn clear_stack_on_return_small(c: &mut Criterion) {
+    c.bench_function("clear_stack_on_return_small", |b| {
+        b.iter(|| clear_stack_on_return(2, || 0x41))
+    });
 }
 
-#[bench]
-fn clear_stack_on_return_fnonce_tiny(b: &mut Bencher) {
-    b.iter(|| clear_stack_on_return_fnonce(1, || 0x41))
+fn clear_stack_on_return_fnonce_tiny(c: &mut Criterion) {
+    c.bench_function("clear_stack_on_return_fnonce_tiny", |b| {
+        b.iter(|| clear_stack_on_return_fnonce(1, || 0x41))
+    });
 }
 
-#[bench]
-fn clear_stack_on_return_fnonce_small(b: &mut Bencher) {
-    b.iter(|| clear_stack_on_return_fnonce(2, || 0x41))
+fn clear_stack_on_return_fnonce_small(c: &mut Criterion) {
+    c.bench_function("clear_stack_on_return_fnonce_small", |b| {
+        b.iter(|| clear_stack_on_return_fnonce(2, || 0x41))
+    });
 }
+
+criterion_group!(
+    benches,
+    clear_stack_on_return_tiny,
+    clear_stack_on_return_small,
+    clear_stack_on_return_fnonce_tiny,
+    clear_stack_on_return_fnonce_small
+);
+criterion_main!(benches);

build.rs

@@ -1,5 +1,3 @@
-extern crate cc;
-
 fn main() {
     if !cfg!(feature = "no_cc") {
         cc::Build::new()

src/lib.rs

@@ -54,9 +54,6 @@
 //! the `no_cc` feature, works on stable Rust, and does not need a C
 //! compiler.
 
-#[cfg(test)]
-extern crate core;
-
 pub mod clear;
 mod clear_on_drop;
 mod clear_stack_on_return;