From a377a492185169c3bc272758df66ea2eddd46653 Mon Sep 17 00:00:00 2001
From: Kerollmops <clement@meilisearch.com>
Date: Mon, 6 Feb 2023 16:44:43 +0100
Subject: [PATCH] Make meiliserach depend on the local milli

---
 Cargo.lock                   | 81 +++---------------------------------
 meilisearch-types/Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 77 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 87f243e70..66b1fd10d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -415,7 +415,7 @@ dependencies = [
  "criterion",
  "csv",
  "flate2",
- "milli 1.0.0",
+ "milli",
  "mimalloc",
  "rand",
  "rand_chacha",
@@ -1422,15 +1422,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "filter-parser"
-version = "0.41.1"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.1#758b4acea7cecd689650bee65949b49cf09ddaa3"
-dependencies = [
- "nom",
- "nom_locate",
-]
-
 [[package]]
 name = "filter-parser"
 version = "1.0.0"
@@ -1451,14 +1442,6 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "flatten-serde-json"
-version = "0.41.1"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.1#758b4acea7cecd689650bee65949b49cf09ddaa3"
-dependencies = [
- "serde_json",
-]
-
 [[package]]
 name = "flatten-serde-json"
 version = "1.0.0"
@@ -2083,14 +2066,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json-depth-checker"
-version = "0.41.1"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.1#758b4acea7cecd689650bee65949b49cf09ddaa3"
-dependencies = [
- "serde_json",
-]
-
 [[package]]
 name = "json-depth-checker"
 version = "1.0.0"
@@ -2603,7 +2578,7 @@ dependencies = [
  "insta",
  "meili-snap",
  "memmap2",
- "milli 0.41.1",
+ "milli",
  "roaring",
  "serde",
  "serde-cs",
@@ -2640,52 +2615,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "milli"
-version = "0.41.1"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.1#758b4acea7cecd689650bee65949b49cf09ddaa3"
-dependencies = [
- "bimap",
- "bincode",
- "bstr 1.1.0",
- "byteorder",
- "charabia",
- "concat-arrays",
- "crossbeam-channel",
- "csv",
- "deserr 0.3.0",
- "either",
- "filter-parser 0.41.1",
- "flatten-serde-json 0.41.1",
- "fst",
- "fxhash",
- "geoutils",
- "grenad",
- "heed",
- "itertools",
- "json-depth-checker 0.41.1",
- "levenshtein_automata",
- "log",
- "logging_timer",
- "memmap2",
- "obkv",
- "once_cell",
- "ordered-float",
- "rayon",
- "roaring",
- "rstar",
- "serde",
- "serde_json",
- "slice-group-by",
- "smallstr",
- "smallvec",
- "smartstring",
- "tempfile",
- "thiserror",
- "time",
- "uuid 1.2.2",
-]
-
 [[package]]
 name = "milli"
 version = "1.0.0"
@@ -2701,8 +2630,8 @@ dependencies = [
  "csv",
  "deserr 0.1.4",
  "either",
- "filter-parser 1.0.0",
- "flatten-serde-json 1.0.0",
+ "filter-parser",
+ "flatten-serde-json",
  "fst",
  "fuzzcheck",
  "fxhash",
@@ -2711,7 +2640,7 @@ dependencies = [
  "heed",
  "insta",
  "itertools",
- "json-depth-checker 1.0.0",
+ "json-depth-checker",
  "levenshtein_automata",
  "log",
  "logging_timer",
diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml
index 54efe1f56..7c30a34c5 100644
--- a/meilisearch-types/Cargo.toml
+++ b/meilisearch-types/Cargo.toml
@@ -16,7 +16,7 @@ file-store = { path = "../file-store" }
 flate2 = "1.0.24"
 fst = "0.4.7"
 memmap2 = "0.5.7"
-milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.41.1", default-features = false }
+milli = { path = "../milli", default-features = false }
 roaring = { version = "0.10.0", features = ["serde"] }
 serde = { version = "1.0.145", features = ["derive"] }
 serde-cs = "0.2.4"