Various cleanups

bencher_compat/benches/bencher_example.rs

@@ -1,22 +1,22 @@
-#[macro_use]
-extern crate criterion_bencher_compat;
-
-use criterion_bencher_compat::Bencher;
-
-fn a(bench: &mut Bencher) {
-    bench.iter(|| {
-        (0..1000).fold(0, |x, y| x + y)
-    })
-}
-
-fn b(bench: &mut Bencher) {
-    const N: usize = 1024;
-    bench.iter(|| {
-        vec![0u8; N]
-    });
-
-    bench.bytes = N as u64;
-}
-
-benchmark_group!(benches, a, b);
+#[macro_use]
+extern crate criterion_bencher_compat;
+
+use criterion_bencher_compat::Bencher;
+
+fn a(bench: &mut Bencher) {
+    bench.iter(|| {
+        (0..1000).fold(0, |x, y| x + y)
+    })
+}
+
+fn b(bench: &mut Bencher) {
+    const N: usize = 1024;
+    bench.iter(|| {
+        vec![0u8; N]
+    });
+
+    bench.bytes = N as u64;
+}
+
+benchmark_group!(benches, a, b);
 benchmark_main!(benches);

benches/benchmarks/sampling_mode.rs

@@ -1,26 +1,26 @@
-use criterion::{criterion_group, Criterion, SamplingMode};
-use std::thread::sleep;
-use std::time::Duration;
-
-fn sampling_mode_tests(c: &mut Criterion) {
-    let mut group = c.benchmark_group("sampling_mode");
-
-    group.sampling_mode(SamplingMode::Auto);
-    group.bench_function("Auto", |bencher| {
-        bencher.iter(|| sleep(Duration::from_millis(0)))
-    });
-
-    group.sampling_mode(SamplingMode::Linear);
-    group.bench_function("Linear", |bencher| {
-        bencher.iter(|| sleep(Duration::from_millis(0)))
-    });
-
-    group.sampling_mode(SamplingMode::Flat);
-    group.bench_function("Flat", |bencher| {
-        bencher.iter(|| sleep(Duration::from_millis(10)))
-    });
-
-    group.finish();
-}
-
-criterion_group!(benches, sampling_mode_tests,);
+use criterion::{criterion_group, Criterion, SamplingMode};
+use std::thread::sleep;
+use std::time::Duration;
+
+fn sampling_mode_tests(c: &mut Criterion) {
+    let mut group = c.benchmark_group("sampling_mode");
+
+    group.sampling_mode(SamplingMode::Auto);
+    group.bench_function("Auto", |bencher| {
+        bencher.iter(|| sleep(Duration::from_millis(0)))
+    });
+
+    group.sampling_mode(SamplingMode::Linear);
+    group.bench_function("Linear", |bencher| {
+        bencher.iter(|| sleep(Duration::from_millis(0)))
+    });
+
+    group.sampling_mode(SamplingMode::Flat);
+    group.bench_function("Flat", |bencher| {
+        bencher.iter(|| sleep(Duration::from_millis(10)))
+    });
+
+    group.finish();
+}
+
+criterion_group!(benches, sampling_mode_tests,);

macro/benches/test_macro_bench.rs

@@ -1,27 +1,27 @@
-#![feature(custom_test_frameworks)]
-#![test_runner(criterion::runner)]
-
-use criterion::{Criterion, black_box};
-use criterion_macro::criterion;
-
-fn fibonacci(n: u64) -> u64 {
-    match n {
-        0 | 1 => 1,
-        n => fibonacci(n - 1) + fibonacci(n - 2),
-    }
-}
-
-fn custom_criterion() -> Criterion {
-    Criterion::default()
-        .sample_size(50)
-}
-
-#[criterion]
-fn bench_simple(c: &mut Criterion) {
-    c.bench_function("Fibonacci-Simple", |b| b.iter(|| fibonacci(black_box(10))));
-}
-
-#[criterion(custom_criterion())]
-fn bench_custom(c: &mut Criterion) {
-    c.bench_function("Fibonacci-Custom", |b| b.iter(|| fibonacci(black_box(20))));
+#![feature(custom_test_frameworks)]
+#![test_runner(criterion::runner)]
+
+use criterion::{Criterion, black_box};
+use criterion_macro::criterion;
+
+fn fibonacci(n: u64) -> u64 {
+    match n {
+        0 | 1 => 1,
+        n => fibonacci(n - 1) + fibonacci(n - 2),
+    }
+}
+
+fn custom_criterion() -> Criterion {
+    Criterion::default()
+        .sample_size(50)
+}
+
+#[criterion]
+fn bench_simple(c: &mut Criterion) {
+    c.bench_function("Fibonacci-Simple", |b| b.iter(|| fibonacci(black_box(10))));
+}
+
+#[criterion(custom_criterion())]
+fn bench_custom(c: &mut Criterion) {
+    c.bench_function("Fibonacci-Custom", |b| b.iter(|| fibonacci(black_box(20))));
 }

macro/src/lib.rs

@@ -1,56 +1,56 @@
-extern crate proc_macro;
-use proc_macro::TokenStream;
-use proc_macro2::{Ident, TokenTree};
-use quote::quote_spanned;
-
-#[proc_macro_attribute]
-pub fn criterion(attr: TokenStream, item: TokenStream) -> TokenStream {
-    let attr = proc_macro2::TokenStream::from(attr);
-    let item = proc_macro2::TokenStream::from(item);
-
-    let span = proc_macro2::Span::call_site();
-
-    let init = if stream_length(attr.clone()) != 0 {
-        attr
-    }
-    else {
-        quote_spanned!(span=> criterion::Criterion::default())
-    };
-
-    let function_name = find_name(item.clone());
-    let wrapped_name = Ident::new(&format!("criterion_wrapped_{}", function_name.to_string()), span);
-
-    let output = quote_spanned!(span=>
-        #[test_case]
-        pub fn #wrapped_name() {
-            #item
-
-            let mut c = #init.configure_from_args();
-            #function_name(&mut c);
-        }
-    );
-
-    output.into()
-}
-
-fn stream_length(stream: proc_macro2::TokenStream) -> usize {
-    stream.into_iter().count()
-}
-
-fn find_name(stream: proc_macro2::TokenStream) -> Ident {
-    let mut iter = stream.into_iter();
-    while let Some(tok) = iter.next() {
-        if let TokenTree::Ident(ident) = tok {
-            if ident == "fn" {
-                break;
-            }
-        }
-    }
-    
-    if let Some(TokenTree::Ident(name)) = iter.next() {
-        name
-    }
-    else {
-        panic!("Unable to find function name")
-    }
+extern crate proc_macro;
+use proc_macro::TokenStream;
+use proc_macro2::{Ident, TokenTree};
+use quote::quote_spanned;
+
+#[proc_macro_attribute]
+pub fn criterion(attr: TokenStream, item: TokenStream) -> TokenStream {
+    let attr = proc_macro2::TokenStream::from(attr);
+    let item = proc_macro2::TokenStream::from(item);
+
+    let span = proc_macro2::Span::call_site();
+
+    let init = if stream_length(attr.clone()) != 0 {
+        attr
+    }
+    else {
+        quote_spanned!(span=> criterion::Criterion::default())
+    };
+
+    let function_name = find_name(item.clone());
+    let wrapped_name = Ident::new(&format!("criterion_wrapped_{}", function_name.to_string()), span);
+
+    let output = quote_spanned!(span=>
+        #[test_case]
+        pub fn #wrapped_name() {
+            #item
+
+            let mut c = #init.configure_from_args();
+            #function_name(&mut c);
+        }
+    );
+
+    output.into()
+}
+
+fn stream_length(stream: proc_macro2::TokenStream) -> usize {
+    stream.into_iter().count()
+}
+
+fn find_name(stream: proc_macro2::TokenStream) -> Ident {
+    let mut iter = stream.into_iter();
+    while let Some(tok) = iter.next() {
+        if let TokenTree::Ident(ident) = tok {
+            if ident == "fn" {
+                break;
+            }
+        }
+    }
+
+    if let Some(TokenTree::Ident(name)) = iter.next() {
+        name
+    }
+    else {
+        panic!("Unable to find function name")
+    }
 }

plot/src/data.rs

@@ -155,7 +155,7 @@ where
 {
     type Scale = (f64, f64, f64, f64, f64);
 
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::many_single_char_names))]
+    #[allow(clippy::many_single_char_names)]
     fn append_to(self, buffer: &mut Vec<u8>, scale: (f64, f64, f64, f64, f64)) {
         let (a, b, c, d, e) = self;
 

plot/src/lib.rs

@@ -366,10 +366,10 @@
 #![deny(bare_trait_objects)]
 // This lint has lots of false positives ATM, see
 // https://github.com/Manishearth/rust-clippy/issues/761
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::new_without_default))]
+#![allow(clippy::new_without_default)]
 // False positives with images
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::doc_markdown))]
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::many_single_char_names))]
+#![allow(clippy::doc_markdown)]
+#![allow(clippy::many_single_char_names)]
 
 extern crate cast;
 #[macro_use]

plot/src/proxy.rs

@@ -7,7 +7,7 @@ use std::borrow::Cow;
 use std::path::Path;
 
 /// Generic constructor for `Font`
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::inline_always))]
+#[allow(clippy::inline_always)]
 #[inline(always)]
 pub fn Font<S>(string: S) -> FontType
 where
@@ -17,7 +17,7 @@ where
 }
 
 /// Generic constructor for `Label`
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::inline_always))]
+#[allow(clippy::inline_always)]
 #[inline(always)]
 pub fn Label<S>(string: S) -> LabelType
 where
@@ -27,7 +27,7 @@ where
 }
 
 /// Generic constructor for `Title`
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::inline_always))]
+#[allow(clippy::inline_always)]
 #[inline(always)]
 pub fn Title<S>(string: S) -> TitleType
 where
@@ -37,7 +37,7 @@ where
 }
 
 /// Generic constructor for `Output`
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::inline_always))]
+#[allow(clippy::inline_always)]
 #[inline(always)]
 pub fn Output<P>(path: P) -> OutputType
 where

src/analysis/compare.rs

@@ -12,7 +12,7 @@ use crate::report::BenchmarkId;
 use crate::{fs, Criterion, SavedSample};
 
 // Common comparison procedure
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::type_complexity))]
+#[allow(clippy::type_complexity)]
 pub(crate) fn common<M: Measurement>(
     id: &BenchmarkId,
     avg_times: &Sample<f64>,