From c71a8ea183afa53312c8a91724ae93ff87124667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Lecrenier?= <loic.lecrenier@me.com>
Date: Tue, 17 Jan 2023 13:10:38 +0100
Subject: [PATCH] Update to latest milli and deserr

---
 Cargo.lock                   | 47 ++++++++++++------------------------
 meilisearch-types/Cargo.toml |  4 +--
 meilisearch-types/src/lib.rs |  3 ++-
 meilisearch/Cargo.toml       |  2 +-
 4 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9bbaa0525..5c41a3406 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1009,39 +1009,20 @@ dependencies = [
 
 [[package]]
 name = "deserr"
-version = "0.1.4"
-dependencies = [
- "deserr-internal 0.1.4",
- "serde-cs",
- "serde_json",
-]
-
-[[package]]
-name = "deserr"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86290491a2b5c21a1a5083da8dae831006761258fabd5617309c3eebc5f89468"
+checksum = "5d3c6417f0bf7561774690e3d47f9659b0cbc3614c7af7bfda404fda7a2c11d3"
 dependencies = [
- "deserr-internal 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "deserr-internal",
  "serde-cs",
  "serde_json",
 ]
 
 [[package]]
 name = "deserr-internal"
-version = "0.1.4"
-dependencies = [
- "convert_case 0.5.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "deserr-internal"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7131de1c27581bc376a22166c9f570be91b76cb096be2f6aecf224c27bf7c49a"
+checksum = "196415cbd3b782cddecbdd69da18cd9b19e1bb0bdbb649e87b5afd83fa8d322b"
 dependencies = [
  "convert_case 0.5.0",
  "proc-macro2",
@@ -1319,7 +1300,8 @@ dependencies = [
 
 [[package]]
 name = "filter-parser"
-version = "0.38.0"
+version = "0.39.1"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.1#0c7d1f761e5db6d086f27d3f0f47a97c7f4a5f08"
 dependencies = [
  "nom",
  "nom_locate",
@@ -1337,7 +1319,8 @@ dependencies = [
 
 [[package]]
 name = "flatten-serde-json"
-version = "0.38.0"
+version = "0.39.1"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.1#0c7d1f761e5db6d086f27d3f0f47a97c7f4a5f08"
 dependencies = [
  "serde_json",
 ]
@@ -1901,7 +1884,8 @@ dependencies = [
 
 [[package]]
 name = "json-depth-checker"
-version = "0.38.0"
+version = "0.39.1"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.1#0c7d1f761e5db6d086f27d3f0f47a97c7f4a5f08"
 dependencies = [
  "serde_json",
 ]
@@ -2308,7 +2292,7 @@ dependencies = [
  "cargo_toml",
  "clap 4.0.32",
  "crossbeam-channel",
- "deserr 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "deserr",
  "dump",
  "either",
  "env_logger",
@@ -2399,7 +2383,7 @@ dependencies = [
  "anyhow",
  "convert_case 0.6.0",
  "csv",
- "deserr 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "deserr",
  "either",
  "enum-iterator",
  "file-store",
@@ -2447,7 +2431,8 @@ dependencies = [
 
 [[package]]
 name = "milli"
-version = "0.38.0"
+version = "0.39.1"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.1#0c7d1f761e5db6d086f27d3f0f47a97c7f4a5f08"
 dependencies = [
  "bimap",
  "bincode",
@@ -2457,7 +2442,7 @@ dependencies = [
  "concat-arrays",
  "crossbeam-channel",
  "csv",
- "deserr 0.1.4",
+ "deserr",
  "either",
  "filter-parser",
  "flatten-serde-json",
diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml
index 467454b4e..8d7f673d9 100644
--- a/meilisearch-types/Cargo.toml
+++ b/meilisearch-types/Cargo.toml
@@ -9,14 +9,14 @@ actix-web = { version = "4.2.1", default-features = false }
 anyhow = "1.0.65"
 convert_case = "0.6.0"
 csv = "1.1.6"
-deserr = "0.1.4"
+deserr = "0.1.5"
 either = { version = "1.6.1", features = ["serde"] }
 enum-iterator = "1.1.3"
 file-store = { path = "../file-store" }
 flate2 = "1.0.24"
 fst = "0.4.7"
 memmap2 = "0.5.7"
-milli = { path = "/Users/meilisearch/Documents/milli2/milli", default-features = false }
+milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.39.1", default-features = false }
 roaring = { version = "0.10.0", features = ["serde"] }
 serde = { version = "1.0.145", features = ["derive"] }
 serde-cs = "0.2.4"
diff --git a/meilisearch-types/src/lib.rs b/meilisearch-types/src/lib.rs
index 14602b5aa..1e2985379 100644
--- a/meilisearch-types/src/lib.rs
+++ b/meilisearch-types/src/lib.rs
@@ -8,10 +8,11 @@ pub mod settings;
 pub mod star_or;
 pub mod tasks;
 pub mod versioning;
+pub use milli;
 pub use milli::{heed, Index};
+pub use serde_cs;
 use uuid::Uuid;
 pub use versioning::VERSION_FILE_NAME;
-pub use {milli, serde_cs};
 
 pub type Document = serde_json::Map<String, serde_json::Value>;
 pub type InstanceUid = Uuid;
diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml
index be852c02e..9a0c9bd0b 100644
--- a/meilisearch/Cargo.toml
+++ b/meilisearch/Cargo.toml
@@ -19,7 +19,7 @@ byte-unit = { version = "4.0.14", default-features = false, features = ["std", "
 bytes = "1.2.1"
 clap = { version = "4.0.9", features = ["derive", "env"] }
 crossbeam-channel = "0.5.6"
-deserr = "0.1.4"
+deserr = "0.1.5"
 dump = { path = "../dump" }
 either = "1.8.0"
 env_logger = "0.9.1"