From 0a2ca075d3c2a2d916fa56c76720b33990145738 Mon Sep 17 00:00:00 2001
From: nd419 <5161147+neeldug@users.noreply.github.com>
Date: Thu, 8 Oct 2020 13:37:58 +0100
Subject: [PATCH 1/2] fix(core): fix benchmark in core with types

forces a dereference onto query and then creates an option to wrap the
query

Closes 994
---
 meilisearch-core/benches/search_benchmark.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meilisearch-core/benches/search_benchmark.rs b/meilisearch-core/benches/search_benchmark.rs
index 73a39780d..5345427ff 100644
--- a/meilisearch-core/benches/search_benchmark.rs
+++ b/meilisearch-core/benches/search_benchmark.rs
@@ -15,7 +15,7 @@ use meilisearch_core::settings::{Settings, SettingsUpdate};
 use meilisearch_schema::Schema;
 use serde_json::Value;
 
-use criterion::{criterion_group, criterion_main, Criterion, BenchmarkId};
+use criterion::{black_box, criterion_group, criterion_main, Criterion, BenchmarkId};
 
 fn prepare_database(path: &Path) -> Database {
     let database = Database::open_or_create(path, DatabaseOptions::default()).unwrap();
@@ -98,7 +98,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
         let bench_name = BenchmarkId::from_parameter(format!("{:?}", query));
         group.bench_with_input(bench_name, &query, |b, query| b.iter(|| {
             let builder = index.query_builder();
-            builder.query(&reader, query, 0..20).unwrap();
+            builder.query(&reader, Some(*query), 0..20).unwrap();
         }));
     }
     group.finish();

From f741942226db6f942e20dd7daf4802bed77d91be Mon Sep 17 00:00:00 2001
From: nd419 <5161147+neeldug@users.noreply.github.com>
Date: Thu, 15 Oct 2020 15:57:34 +0100
Subject: [PATCH 2/2] Remove redundant black_box import

---
 Cargo.lock                                   | 6 +++---
 meilisearch-core/benches/search_benchmark.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3abc34c71..3dfc74f7c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1914,7 +1914,8 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 [[package]]
 name = "pest"
 version = "2.1.3"
-source = "git+https://github.com/pest-parser/pest.git?rev=51fd1d49f1041f7839975664ef71fe15c7dcaf67#51fd1d49f1041f7839975664ef71fe15c7dcaf67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
 dependencies = [
  "ucd-trie",
 ]
@@ -1922,8 +1923,7 @@ dependencies = [
 [[package]]
 name = "pest"
 version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+source = "git+https://github.com/pest-parser/pest.git?rev=51fd1d49f1041f7839975664ef71fe15c7dcaf67#51fd1d49f1041f7839975664ef71fe15c7dcaf67"
 dependencies = [
  "ucd-trie",
 ]
diff --git a/meilisearch-core/benches/search_benchmark.rs b/meilisearch-core/benches/search_benchmark.rs
index 5345427ff..3a14ccf67 100644
--- a/meilisearch-core/benches/search_benchmark.rs
+++ b/meilisearch-core/benches/search_benchmark.rs
@@ -15,7 +15,7 @@ use meilisearch_core::settings::{Settings, SettingsUpdate};
 use meilisearch_schema::Schema;
 use serde_json::Value;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion, BenchmarkId};
+use criterion::{criterion_group, criterion_main, Criterion, BenchmarkId};
 
 fn prepare_database(path: &Path) -> Database {
     let database = Database::open_or_create(path, DatabaseOptions::default()).unwrap();