From 507a7bad964ab59ee3c5c0cef0b21d057809f7c5 Mon Sep 17 00:00:00 2001
From: Kerollmops <clement@meilisearch.com>
Date: Mon, 16 Jan 2023 17:35:54 +0100
Subject: [PATCH] Use the local milli subcrate

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

diff --git a/Cargo.lock b/Cargo.lock
index ab9c0732c..1959006d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -415,7 +415,7 @@ dependencies = [
  "criterion",
  "csv",
  "flate2",
- "milli 1.0.0",
+ "milli",
  "mimalloc",
  "rand",
  "rand_chacha",
@@ -1408,15 +1408,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "filter-parser"
-version = "0.39.0"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.0#e6bea999740b153871f665abce869ffbb5aa94c5"
-dependencies = [
- "nom",
- "nom_locate",
-]
-
 [[package]]
 name = "filter-parser"
 version = "1.0.0"
@@ -1437,14 +1428,6 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "flatten-serde-json"
-version = "0.39.0"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.0#e6bea999740b153871f665abce869ffbb5aa94c5"
-dependencies = [
- "serde_json",
-]
-
 [[package]]
 name = "flatten-serde-json"
 version = "1.0.0"
@@ -2069,14 +2052,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json-depth-checker"
-version = "0.39.0"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.0#e6bea999740b153871f665abce869ffbb5aa94c5"
-dependencies = [
- "serde_json",
-]
-
 [[package]]
 name = "json-depth-checker"
 version = "1.0.0"
@@ -2588,7 +2563,7 @@ dependencies = [
  "insta",
  "meili-snap",
  "memmap2",
- "milli 0.39.0",
+ "milli",
  "proptest",
  "proptest-derive",
  "roaring",
@@ -2626,52 +2601,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "milli"
-version = "0.39.0"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.0#e6bea999740b153871f665abce869ffbb5aa94c5"
-dependencies = [
- "bimap",
- "bincode",
- "bstr 1.1.0",
- "byteorder",
- "charabia",
- "concat-arrays",
- "crossbeam-channel",
- "csv",
- "deserr",
- "either",
- "filter-parser 0.39.0",
- "flatten-serde-json 0.39.0",
- "fst",
- "fxhash",
- "geoutils",
- "grenad",
- "heed",
- "itertools",
- "json-depth-checker 0.39.0",
- "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"
@@ -2687,8 +2616,8 @@ dependencies = [
  "csv",
  "deserr",
  "either",
- "filter-parser 1.0.0",
- "flatten-serde-json 1.0.0",
+ "filter-parser",
+ "flatten-serde-json",
  "fst",
  "fuzzcheck",
  "fxhash",
@@ -2697,7 +2626,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 bd596ba2d..cbb380874 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.39.0", default-features = false }
+milli = { path = "../milli", default-features = false }
 proptest = { version = "1.0.0", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 roaring = { version = "0.10.0", features = ["serde"] }