snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-22 18:17:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Use an existing revision of milli

Browse Source
This commit is contained in:
many 2021-09-28 17:50:21 +02:00 committed by mpostma
parent 61e5eed493
commit 2a14948123
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Cargo.lock generated
View File

@ -305,6 +305,20 @@ name = "as-slice"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45403b49e3954a4b8428a0ac21a4b7afadccf92bfd96273f1a58cd4812496ae0"
<<<<<<< HEAD
=======
dependencies = [
"generic-array 0.12.4",
"generic-array 0.13.3",
"generic-array 0.14.4",
"stable_deref_trait",
]
[[package]]
name = "assert-json-diff"
version = "1.0.1"
source = "git+https://github.com/qdequele/assert-json-diff?branch=master#9012a0c8866d0f2db0ef9a6242e4a19d1e8c67e4"
>>>>>>> 9d9543fd (Use an existing revision of milli)
dependencies = [
"generic-array 0.12.4",
"generic-array 0.13.3",
@ -1778,7 +1792,12 @@ dependencies = [
[[package]]
name = "milli"
<<<<<<< HEAD
version = "0.16.0"
=======
version = "0.14.0"
source = "git+https://github.com/meilisearch/milli.git?rev=9d9010e#9d9010e45ff1eddd8a7715423ad0988a35ee34b6"
>>>>>>> 9d9543fd (Use an existing revision of milli)
dependencies = [
"bimap",
"bincode",

1
meilisearch-lib/Cargo.toml
View File

@ -31,7 +31,6 @@ log = "0.4.14"
meilisearch-error = { path = "../meilisearch-error" }
meilisearch-tokenizer = { git = "https://github.com/meilisearch/tokenizer.git", tag = "v0.2.5" }
memmap = "0.7.0"
#milli = { git = "https://github.com/meilisearch/milli.git", branch = "main" }
milli = { path = "../../milli/milli" }
mime = "0.3.16"
num_cpus = "1.13.0"