mirror of
				https://github.com/meilisearch/meilisearch.git
				synced 2025-11-04 01:46:28 +00:00 
			
		
		
		
	Merge remote-tracking branch 'origin/main' into search-refactor
Conflicts | resolution ----------|----------- Cargo.lock | added mimalloc Cargo.toml | took origin/main version milli/src/search/criteria/exactness.rs | deleted after checking it was only clippy changes milli/src/search/query_tree.rs | deleted after checking it was only clippy changes
This commit is contained in:
		@@ -12,40 +12,40 @@ readme.workspace = true
 | 
			
		||||
license.workspace = true
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
bimap = { version = "0.6.2", features = ["serde"] }
 | 
			
		||||
bimap = { version = "0.6.3", features = ["serde"] }
 | 
			
		||||
bincode = "1.3.3"
 | 
			
		||||
bstr = "1.0.1"
 | 
			
		||||
bstr = "1.4.0"
 | 
			
		||||
byteorder = "1.4.3"
 | 
			
		||||
charabia = { version = "0.7.1", default-features = false }
 | 
			
		||||
charabia = { version = "0.7.2", default-features = false }
 | 
			
		||||
concat-arrays = "0.1.2"
 | 
			
		||||
crossbeam-channel = "0.5.6"
 | 
			
		||||
crossbeam-channel = "0.5.8"
 | 
			
		||||
deserr = "0.5.0"
 | 
			
		||||
either = "1.8.0"
 | 
			
		||||
either = "1.8.1"
 | 
			
		||||
flatten-serde-json = { path = "../flatten-serde-json" }
 | 
			
		||||
fst = "0.4.7"
 | 
			
		||||
fxhash = "0.2.1"
 | 
			
		||||
geoutils = "0.5.1"
 | 
			
		||||
grenad = { version = "0.4.3", default-features = false, features = ["tempfile"] }
 | 
			
		||||
grenad = { version = "0.4.4", default-features = false, features = ["tempfile"] }
 | 
			
		||||
heed = { git = "https://github.com/meilisearch/heed", tag = "v0.12.5", default-features = false, features = ["lmdb", "sync-read-txn"] }
 | 
			
		||||
json-depth-checker = { path = "../json-depth-checker" }
 | 
			
		||||
levenshtein_automata = { version = "0.2.1", features = ["fst_automaton"] }
 | 
			
		||||
memmap2 = "0.5.7"
 | 
			
		||||
memmap2 = "0.5.10"
 | 
			
		||||
obkv = "0.2.0"
 | 
			
		||||
once_cell = "1.15.0"
 | 
			
		||||
ordered-float = "3.2.0"
 | 
			
		||||
rayon = "1.5.3"
 | 
			
		||||
once_cell = "1.17.1"
 | 
			
		||||
ordered-float = "3.6.0"
 | 
			
		||||
rayon = "1.7.0"
 | 
			
		||||
roaring = "0.10.1"
 | 
			
		||||
rstar = { version = "0.9.3", features = ["serde"] }
 | 
			
		||||
serde = { version = "1.0.145", features = ["derive"] }
 | 
			
		||||
serde_json = { version = "1.0.85", features = ["preserve_order"] }
 | 
			
		||||
rstar = { version = "0.10.0", features = ["serde"] }
 | 
			
		||||
serde = { version = "1.0.160", features = ["derive"] }
 | 
			
		||||
serde_json = { version = "1.0.95", features = ["preserve_order"] }
 | 
			
		||||
slice-group-by = "0.3.0"
 | 
			
		||||
smallstr =  { version = "0.3.0", features = ["serde"] }
 | 
			
		||||
smallvec = "1.10.0"
 | 
			
		||||
smartstring = "1.0.1"
 | 
			
		||||
tempfile = "3.3.0"
 | 
			
		||||
thiserror = "1.0.37"
 | 
			
		||||
time = { version = "0.3.15", features = ["serde-well-known", "formatting", "parsing", "macros"] }
 | 
			
		||||
uuid = { version = "1.1.2", features = ["v4"] }
 | 
			
		||||
tempfile = "3.5.0"
 | 
			
		||||
thiserror = "1.0.40"
 | 
			
		||||
time = { version = "0.3.20", features = ["serde-well-known", "formatting", "parsing", "macros"] }
 | 
			
		||||
uuid = { version = "1.3.1", features = ["v4"] }
 | 
			
		||||
 | 
			
		||||
filter-parser = { path = "../filter-parser" }
 | 
			
		||||
 | 
			
		||||
@@ -55,12 +55,12 @@ itertools = "0.10.5"
 | 
			
		||||
# logging
 | 
			
		||||
log = "0.4.17"
 | 
			
		||||
logging_timer = "1.1.0"
 | 
			
		||||
csv = "1.1.6"
 | 
			
		||||
csv = "1.2.1"
 | 
			
		||||
 | 
			
		||||
[dev-dependencies]
 | 
			
		||||
mimalloc = { version = "0.1.29", default-features = false }
 | 
			
		||||
big_s = "1.0.2"
 | 
			
		||||
insta = "1.21.0"
 | 
			
		||||
insta = "1.29.0"
 | 
			
		||||
maplit = "1.0.2"
 | 
			
		||||
md5 = "0.7.0"
 | 
			
		||||
rand = {version = "0.8.5", features = ["small_rng"] }
 | 
			
		||||
@@ -90,3 +90,6 @@ korean = ["charabia/korean"]
 | 
			
		||||
 | 
			
		||||
# allow thai specialized tokenization
 | 
			
		||||
thai = ["charabia/thai"]
 | 
			
		||||
 | 
			
		||||
# allow greek specialized tokenization
 | 
			
		||||
greek = ["charabia/greek"]
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user