From 5eaaa0e98cbeed7ce3a5a8044f6c578481526cc4 Mon Sep 17 00:00:00 2001
From: logaritmisk <anders.e.olsson@gmail.com>
Date: Tue, 6 Feb 2018 12:39:32 +0100
Subject: [PATCH] Update. Fmt.

---
 .gitignore       |  2 --
 Cargo.toml       |  2 +-
 benches/bench.rs | 18 +++++++++---------
 src/lib.rs       | 40 ++++++++--------------------------------
 4 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ca769f..e13de17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 /target/
 
 Cargo.lock
-
-/.criterion/
diff --git a/Cargo.toml b/Cargo.toml
index 6eb50e4..ff8ba26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ serde = "1.0"
 serde_derive = "1.0"
 
 [dev-dependencies]
-criterion = { git = "https://github.com/japaric/criterion.rs.git" }
+criterion = "0.2"
 rand = "0.4"
 
 [[bench]]
diff --git a/benches/bench.rs b/benches/bench.rs
index ec038e5..144efab 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -3,21 +3,21 @@ extern crate criterion;
 
 extern crate byte_ngram;
 
-use criterion::Criterion;
+use criterion::{Benchmark, Criterion, Throughput};
 
 use byte_ngram::*;
 
 fn criterion_benchmark(c: &mut Criterion) {
     let data = "Blackmail is such an ugly word. I prefer extortion. The 'x' makes it sound cool.";
 
-    let len = from_slice(&data[..]).len();
-
-    c.bench_function("from_slice", |b| {
-        b.iter(|| assert_eq!(len, from_slice(&data[..]).len()))
-    });
-    c.bench_function("ByteNgramReader", |b| {
-        b.iter(|| assert_eq!(len, Ngrams::from(&data).count()))
-    });
+    c.bench(
+        "parse",
+        Benchmark::new("from_slice", move |b| {
+            b.iter(|| from_slice(&data[..]).len())
+        }).with_function("Ngrams::from", move |b| {
+            b.iter(|| Ngrams::from(&data).count())
+        }).throughput(Throughput::Bytes(data.len() as u32)),
+    );
 }
 
 criterion_group!(benches, criterion_benchmark);
diff --git a/src/lib.rs b/src/lib.rs
index 01a32bb..79778fb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -188,22 +188,10 @@ mod tests {
 
     #[test]
     fn test_lhs() {
-        assert_eq!(
-            Ngram::from_slice("ab").lhs(),
-            Ngram::from_slice("a")
-        );
-        assert_eq!(
-            Ngram::from_slice("abc").lhs(),
-            Ngram::from_slice("ab")
-        );
-        assert_eq!(
-            Ngram::from_slice("abcd").lhs(),
-            Ngram::from_slice("abc")
-        );
-        assert_eq!(
-            Ngram::from_slice("abcde").lhs(),
-            Ngram::from_slice("abcd")
-        );
+        assert_eq!(Ngram::from_slice("ab").lhs(), Ngram::from_slice("a"));
+        assert_eq!(Ngram::from_slice("abc").lhs(), Ngram::from_slice("ab"));
+        assert_eq!(Ngram::from_slice("abcd").lhs(), Ngram::from_slice("abc"));
+        assert_eq!(Ngram::from_slice("abcde").lhs(), Ngram::from_slice("abcd"));
         assert_eq!(
             Ngram::from_slice("abcdef").lhs(),
             Ngram::from_slice("abcde")
@@ -216,22 +204,10 @@ mod tests {
 
     #[test]
     fn test_rhs() {
-        assert_eq!(
-            Ngram::from_slice("ab").rhs(),
-            Ngram::from_slice("b")
-        );
-        assert_eq!(
-            Ngram::from_slice("abc").rhs(),
-            Ngram::from_slice("bc")
-        );
-        assert_eq!(
-            Ngram::from_slice("abcd").rhs(),
-            Ngram::from_slice("bcd")
-        );
-        assert_eq!(
-            Ngram::from_slice("abcde").rhs(),
-            Ngram::from_slice("bcde")
-        );
+        assert_eq!(Ngram::from_slice("ab").rhs(), Ngram::from_slice("b"));
+        assert_eq!(Ngram::from_slice("abc").rhs(), Ngram::from_slice("bc"));
+        assert_eq!(Ngram::from_slice("abcd").rhs(), Ngram::from_slice("bcd"));
+        assert_eq!(Ngram::from_slice("abcde").rhs(), Ngram::from_slice("bcde"));
         assert_eq!(
             Ngram::from_slice("abcdef").rhs(),
             Ngram::from_slice("bcdef")