From d9d04198458d0efb7385139a667d502487cb55b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 14:38:48 +0100 Subject: [PATCH 01/13] Update the dependencies --- Cargo.lock | 81 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72701288f..500c77534 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -389,7 +389,7 @@ dependencies = [ "byteorder", "heed", "log", - "memmap2 0.9.0", + "memmap2 0.9.3", "ordered-float 4.2.0", "rand", "rayon", @@ -699,13 +699,13 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.3.1" -source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +version = "0.3.3" +source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" dependencies = [ "byteorder", "gemm", "half 2.3.1", - "memmap2 0.7.1", + "memmap2 0.9.3", "num-traits", "num_cpus", "rand", @@ -719,8 +719,8 @@ dependencies = [ [[package]] name = "candle-nn" -version = "0.3.1" -source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +version = "0.3.3" +source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" dependencies = [ "candle-core", "half 2.3.1", @@ -733,8 +733,8 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.3.1" -source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +version = "0.3.3" +source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" dependencies = [ "byteorder", "candle-core", @@ -1538,6 +1538,18 @@ dependencies = [ "encoding_rs", ] +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.28", +] + [[package]] name = "enum-iterator" version = "1.4.1" @@ -1827,9 +1839,9 @@ dependencies = [ [[package]] name = "gemm" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3afa707040531a7527477fd63a81ea4f6f3d26037a2f96776e57fb843b258e" +checksum = "e97d506c68f4fb12325b52a638e7d54cc87e3593a4ded0de60218b6dfd65f645" dependencies = [ "dyn-stack", "gemm-c32", @@ -1847,9 +1859,9 @@ dependencies = [ [[package]] name = "gemm-c32" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc3973a4c30c73f26a099113953d0c772bb17ee2e07976c0a06b8fe1f38a57d" +checksum = "0dd16f26e8f34661edc906d8c9522b59ec1655c865a98a58950d0246eeaca9da" dependencies = [ "dyn-stack", "gemm-common", @@ -1862,9 +1874,9 @@ dependencies = [ [[package]] name = "gemm-c64" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30362894b93dada374442cb2edf4512ddf19513c9bec88e06a445bcb6b22e64f" +checksum = "a8e34381bc060b47fbd25522a281799ef763cd27f43bbd1783d935774659242a" dependencies = [ "dyn-stack", "gemm-common", @@ -1877,9 +1889,9 @@ dependencies = [ [[package]] name = "gemm-common" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "988499faa80566b046b4fee2c5f15af55b5a20c1fe8486b112ebb34efa045ad6" +checksum = "22518a76339b09276f77c3166c44262e55f633712fe8a44fd0573505887feeab" dependencies = [ "bytemuck", "dyn-stack", @@ -1892,13 +1904,14 @@ dependencies = [ "raw-cpuid", "rayon", "seq-macro", + "sysctl", ] [[package]] name = "gemm-f16" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6cf2854a12371684c38d9a865063a27661812a3ff5803454c5742e8f5a388ce" +checksum = "70409bbf3ef83b38cbe4a58cd4b797c1c27902505bdd926a588ea61b6c550a84" dependencies = [ "dyn-stack", "gemm-common", @@ -1914,9 +1927,9 @@ dependencies = [ [[package]] name = "gemm-f32" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bc84003cf6d950a7c7ca714ad6db281b6cef5c7d462f5cd9ad90ea2409c7227" +checksum = "5ea3068edca27f100964157211782eba19e961aa4d0d2bdac3e1775a51aa7680" dependencies = [ "dyn-stack", "gemm-common", @@ -1929,9 +1942,9 @@ dependencies = [ [[package]] name = "gemm-f64" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35187ef101a71eed0ecd26fb4a6255b4192a12f1c5335f3a795698f2d9b6cf33" +checksum = "5fd41e8f5a60dce8d8acd852a3f4b22f8e18be957e1937731be692c037652510" dependencies = [ "dyn-stack", "gemm-common", @@ -3646,16 +3659,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", - "stable_deref_trait", ] [[package]] name = "memmap2" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" dependencies = [ "libc", + "stable_deref_trait", ] [[package]] @@ -4749,9 +4762,9 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safetensors" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93279b86b3de76f820a8854dd06cbc33cfa57a417b19c47f6a25280112fb1df" +checksum = "1659ef1c27917eb58c2d53664b5506d0b68c9cb9b460d3e0901011cf71269a8e" dependencies = [ "serde", "serde_json", @@ -5126,6 +5139,20 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.4.1", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + [[package]] name = "sysinfo" version = "0.29.7" From 5869ca7716e30a9f48ecb3182bc41ef3229328eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 15:05:03 +0100 Subject: [PATCH 02/13] Upgrade all compatible dependencies --- Cargo.lock | 646 ++++++++++++++++++----------------- benchmarks/Cargo.toml | 18 +- dump/Cargo.toml | 28 +- file-store/Cargo.toml | 8 +- filter-parser/Cargo.toml | 6 +- fuzzers/Cargo.toml | 12 +- index-scheduler/Cargo.toml | 26 +- meili-snap/Cargo.toml | 4 +- meilisearch-auth/Cargo.toml | 18 +- meilisearch-types/Cargo.toml | 34 +- meilisearch/Cargo.toml | 116 +++---- meilitool/Cargo.toml | 8 +- milli/Cargo.toml | 56 +-- 13 files changed, 504 insertions(+), 476 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 500c77534..a1bc8f183 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b340e9cfa5b08690aae90fb61beb44e9b06f44fe3d0f93781aaa58cfba86245e" +checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" dependencies = [ "actix-utils", "actix-web", @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.3.1" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +checksum = "129d4c88e98860e1758c5de288d1632b07970a16d59bdf7b8d66053d582bb71f" dependencies = [ "actix-codec", "actix-rt", @@ -46,8 +46,8 @@ dependencies = [ "actix-tls", "actix-utils", "ahash 0.8.3", - "base64 0.21.5", - "bitflags 1.3.2", + "base64 0.21.7", + "bitflags 2.4.1", "brotli", "bytes", "bytestring", @@ -56,7 +56,7 @@ dependencies = [ "flate2", "futures-core", "h2", - "http 0.2.9", + "http 0.2.11", "httparse", "httpdate", "itoa", @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -90,7 +90,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" dependencies = [ "bytestring", - "http 0.2.9", + "http 0.2.11", "regex", "serde", "tracing", @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" +checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" dependencies = [ "actix-macros", "futures-core", @@ -138,19 +138,22 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.3" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" +checksum = "72616e7fbec0aa99c6f3164677fa48ff5a60036d0799c98cab894a44f3e0efc3" dependencies = [ - "actix-codec", "actix-rt", "actix-service", "actix-utils", "futures-core", - "log", + "impl-more", "pin-project-lite", + "rustls 0.21.6", + "rustls-webpki", + "tokio", "tokio-rustls 0.23.4", "tokio-util", + "tracing", "webpki-roots 0.22.6", ] @@ -166,9 +169,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.3.1" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" +checksum = "e43428f3bf11dee6d166b00ec2df4e3aa8cc1606aaa0b7433c146852e2f4e03b" dependencies = [ "actix-codec", "actix-http", @@ -180,7 +183,7 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash 0.8.3", "bytes", "bytestring", "cfg-if", @@ -189,7 +192,6 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http 0.2.9", "itoa", "language-tags", "log", @@ -201,7 +203,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.4.9", + "socket2 0.5.5", "time", "url", ] @@ -310,9 +312,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", @@ -358,9 +360,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" dependencies = [ "backtrace", ] @@ -373,9 +375,9 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" dependencies = [ "derive_arbitrary", ] @@ -427,18 +429,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -479,9 +481,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -573,9 +575,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -584,9 +586,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -594,9 +596,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "regex-automata 0.4.3", @@ -642,7 +644,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -653,9 +655,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytestring" @@ -870,9 +872,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "80932e03c33999b9235edb8655bc9df3204adc9887c2f95b50cb1deb9fd54253" dependencies = [ "clap_builder", "clap_derive", @@ -880,9 +882,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "d6c0db58c659eef1c73e444d298c27322a1b52f6927d2ad470c0c0f96fa7b8fa" dependencies = [ "anstream", "anstyle", @@ -899,7 +901,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -956,12 +958,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "convert_case" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" - [[package]] name = "convert_case" version = "0.6.0" @@ -1075,11 +1071,10 @@ checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -1089,56 +1084,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1158,9 +1143,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -1170,9 +1155,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -1183,8 +1168,18 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", ] [[package]] @@ -1201,17 +1196,42 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.48", +] + [[package]] name = "darling_macro" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote", + "syn 2.0.48", +] + [[package]] name = "deduplicating_array" version = "0.1.5" @@ -1233,13 +1253,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -1257,7 +1277,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ - "darling", + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", @@ -1288,9 +1308,9 @@ dependencies = [ [[package]] name = "deserr" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d55a63aabcb2f7893231e6b8ddf8acc00814d20a64463e52cf9b603ec326ee" +checksum = "3418e814bb893a61b25a60db71dccab7cb70035d94ffe58c9b4a70387ac42083" dependencies = [ "actix-http", "actix-utils", @@ -1305,14 +1325,14 @@ dependencies = [ [[package]] name = "deserr-internal" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4d5c86e5d887d880c7a3572a8041bfb3011acc81df86318855ea2cae66f3ef" +checksum = "9cadd9624c995ecbd6d6c81ec0804fbbb335e3acba5326a06067ccd33295a37e" dependencies = [ - "convert_case 0.5.0", + "convert_case 0.6.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -1382,7 +1402,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -1407,7 +1427,7 @@ dependencies = [ "anyhow", "big_s", "flate2", - "http 0.2.9", + "http 0.2.11", "log", "maplit", "meili-snap", @@ -1422,7 +1442,7 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -1547,34 +1567,34 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "enum-iterator" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1607,9 +1627,9 @@ checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" [[package]] name = "fancy-regex" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" dependencies = [ "bit-set", "regex", @@ -1617,15 +1637,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "faux" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3b5e56a69ca67c241191cd9d484e14fb0fe89f5e539c2e8448eafd1f65c1f0" +checksum = "14b55a7f424e532314115b5cdc6d9711b15ac453bfe0dcfa212baebc5efacd60" dependencies = [ "faux_macros", "paste", @@ -1633,15 +1653,15 @@ dependencies = [ [[package]] name = "faux_macros" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c9bb4a2c13ffb3a93a39902aaf4e7190a1706a4779b6db0449aee433d26c4a" +checksum = "d15473d7f83b54a44826907af16ae5727eaacaf6e53b51474016d3efd9aa35d5" dependencies = [ - "darling", + "darling 0.20.3", "proc-macro2", "quote", - "syn 1.0.109", - "uuid 0.8.2", + "syn 2.0.48", + "uuid", ] [[package]] @@ -1651,7 +1671,7 @@ dependencies = [ "faux", "tempfile", "thiserror", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -1728,9 +1748,9 @@ checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1743,9 +1763,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1753,15 +1773,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1770,38 +1790,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2042,7 +2062,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.9", + "http 0.2.11", "indexmap 1.9.3", "slab", "tokio", @@ -2090,9 +2110,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heapless" @@ -2190,9 +2210,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2217,7 +2237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http 0.2.9", + "http 0.2.11", "pin-project-lite", ] @@ -2250,7 +2270,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.9", + "http 0.2.11", "http-body", "httparse", "httpdate", @@ -2270,7 +2290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ "futures-util", - "http 0.2.9", + "http 0.2.11", "hyper", "rustls 0.21.6", "tokio", @@ -2654,7 +2674,7 @@ checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -2774,6 +2794,12 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "impl-more" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" + [[package]] name = "index-scheduler" version = "1.6.0" @@ -2804,7 +2830,7 @@ dependencies = [ "thiserror", "time", "ureq", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -2819,12 +2845,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "serde", ] @@ -2852,9 +2878,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -2905,13 +2931,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", "rustix 0.38.26", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2946,7 +2972,7 @@ checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" dependencies = [ "cedarwood", "fxhash", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "lazy_static", "phf", "phf_codegen", @@ -2985,9 +3011,9 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -3050,9 +3076,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.33" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" dependencies = [ "cc", "libc", @@ -3336,7 +3362,7 @@ checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -3461,14 +3487,14 @@ checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "manifest-dir-macros" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450e5ef583bc05177c4975b9ea907047091a9f62e74e81fcafb99dbffac51e7e" +checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -3523,9 +3549,9 @@ dependencies = [ "futures", "futures-util", "hex", - "http 0.2.9", + "http 0.2.11", "index-scheduler", - "indexmap 2.0.0", + "indexmap 2.1.0", "insta", "is-terminal", "itertools 0.11.0", @@ -3542,7 +3568,7 @@ dependencies = [ "num_cpus", "obkv", "once_cell", - "ordered-float 3.7.0", + "ordered-float 3.9.2", "parking_lot", "permissive-json-pointer", "pin-project-lite", @@ -3553,7 +3579,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.20.8", + "rustls 0.20.9", "rustls-pemfile", "segment", "serde", @@ -3576,7 +3602,7 @@ dependencies = [ "toml", "url", "urlencoding", - "uuid 1.5.0", + "uuid", "vergen", "walkdir", "yaup", @@ -3587,7 +3613,7 @@ dependencies = [ name = "meilisearch-auth" version = "1.6.0" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "enum-iterator", "hmac", "maplit", @@ -3599,7 +3625,7 @@ dependencies = [ "sha2", "thiserror", "time", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -3629,7 +3655,7 @@ dependencies = [ "thiserror", "time", "tokio", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -3643,14 +3669,14 @@ dependencies = [ "meilisearch-auth", "meilisearch-types", "time", - "uuid 1.5.0", + "uuid", ] [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -3671,15 +3697,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "milli" version = "1.6.0" @@ -3709,7 +3726,7 @@ dependencies = [ "grenad", "heed", "hf-hub", - "indexmap 2.0.0", + "indexmap 2.1.0", "insta", "itertools 0.11.0", "json-depth-checker", @@ -3724,7 +3741,7 @@ dependencies = [ "mimalloc", "obkv", "once_cell", - "ordered-float 3.7.0", + "ordered-float 3.9.2", "puffin", "rand", "rand_pcg", @@ -3744,14 +3761,14 @@ dependencies = [ "time", "tokenizers", "tokio", - "uuid 1.5.0", + "uuid", ] [[package]] name = "mimalloc" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" dependencies = [ "libmimalloc-sys", ] @@ -3817,7 +3834,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -3837,9 +3854,9 @@ dependencies = [ [[package]] name = "nom_locate" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e299bf5ea7b212e811e71174c5d1a5d065c4c0ad0c8691ecb1f97e3e66025e" +checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3" dependencies = [ "bytecount", "memchr", @@ -3929,9 +3946,9 @@ checksum = "6c459142426056c639ff88d053ebaaaeca0ee1411c94362892398ef4ccd81080" [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" @@ -3969,9 +3986,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "3.7.0" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] @@ -4125,7 +4142,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -4179,7 +4196,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -4193,9 +4210,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4307,9 +4324,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -4381,9 +4398,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4524,14 +4541,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -4543,22 +4560,16 @@ dependencies = [ "memchr", ] -[[package]] -name = "regex-automata" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - [[package]] name = "regex-automata" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] [[package]] name = "regex-syntax" @@ -4567,18 +4578,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] -name = "reqwest" -version = "0.11.22" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", - "http 0.2.9", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -4628,11 +4645,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "roaring" version = "0.10.2" @@ -4707,12 +4738,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -4724,28 +4755,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.3", + "untrusted 0.9.0", ] [[package]] @@ -4791,15 +4822,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "segment" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb93f3f738322ce8f33c4e80c251fb1560ca81f3a241355271fcb912eeb48e3" +checksum = "12485833e00457a6bbba60397d3f19362751a0caefe27f6755fff1a2be4fd601" dependencies = [ "async-trait", "reqwest", @@ -4823,9 +4854,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] @@ -4841,22 +4872,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -4916,9 +4947,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -4954,9 +4985,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" @@ -4985,9 +5016,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" dependencies = [ "serde", ] @@ -5109,9 +5140,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -5135,7 +5166,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "unicode-xid", ] @@ -5155,9 +5186,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.7" +version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" dependencies = [ "cfg-if", "core-foundation-sys", @@ -5202,63 +5233,63 @@ dependencies = [ [[package]] name = "temp-env" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9547444bfe52cbd79515c6c8087d8ae6ca8d64d2d31a27746320f5cb81d1a15c" +checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050" dependencies = [ "parking_lot", ] [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.4.1", "rustix 0.38.26", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "tiktoken-rs" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4427b6b1c6b38215b92dd47a83a0ecc6735573d0a5a4c14acc0ac5b33b28adb" +checksum = "40894b788eb28bbb7e36bdc8b7b1b1488b9c93fa3730f315ab965330c94c0842" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "bstr", "fancy-regex", "lazy_static", @@ -5268,9 +5299,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -5288,9 +5319,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -5351,7 +5382,7 @@ dependencies = [ "rayon", "rayon-cond", "regex", - "regex-syntax", + "regex-syntax 0.7.4", "serde", "serde_json", "spm_precompiled", @@ -5363,9 +5394,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -5388,7 +5419,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -5397,7 +5428,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "webpki", ] @@ -5439,9 +5470,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -5460,11 +5491,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -5498,7 +5529,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -5530,9 +5561,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unescaper" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96a44ae11e25afb520af4534fd7b0bd8cd613e35a78def813b8cf41631fa3c8" +checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" dependencies = [ "thiserror", ] @@ -5606,13 +5637,19 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "ureq" version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "flate2", "log", "once_cell", @@ -5669,18 +5706,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "0.8.2" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "getrandom", "serde", @@ -5716,9 +5744,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5771,7 +5799,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -5805,7 +5833,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5841,8 +5869,8 @@ version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -6184,7 +6212,7 @@ checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "synstructure", ] @@ -6205,7 +6233,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "synstructure", ] @@ -6252,7 +6280,7 @@ checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index f30478a9e..83213988c 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -11,24 +11,24 @@ edition.workspace = true license.workspace = true [dependencies] -anyhow = "1.0.70" -csv = "1.2.1" +anyhow = "1.0.79" +csv = "1.3.0" milli = { path = "../milli" } -mimalloc = { version = "0.1.37", default-features = false } -serde_json = { version = "1.0.95", features = ["preserve_order"] } +mimalloc = { version = "0.1.39", default-features = false } +serde_json = { version = "1.0.111", features = ["preserve_order"] } [dev-dependencies] criterion = { version = "0.5.1", features = ["html_reports"] } rand = "0.8.5" rand_chacha = "0.3.1" -roaring = "0.10.1" +roaring = "0.10.2" [build-dependencies] -anyhow = "1.0.70" -bytes = "1.4.0" +anyhow = "1.0.79" +bytes = "1.5.0" convert_case = "0.6.0" -flate2 = "1.0.25" -reqwest = { version = "0.11.16", features = ["blocking", "rustls-tls"], default-features = false } +flate2 = "1.0.28" +reqwest = { version = "0.11.23", features = ["blocking", "rustls-tls"], default-features = false } [features] default = ["milli/all-tokenizations"] diff --git a/dump/Cargo.toml b/dump/Cargo.toml index 6834d5c26..941cec72d 100644 --- a/dump/Cargo.toml +++ b/dump/Cargo.toml @@ -11,22 +11,22 @@ readme.workspace = true license.workspace = true [dependencies] -anyhow = "1.0.70" -flate2 = "1.0.25" -http = "0.2.9" -log = "0.4.17" +anyhow = "1.0.79" +flate2 = "1.0.28" +http = "0.2.11" +log = "0.4.20" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -once_cell = "1.17.1" -regex = "1.7.3" -roaring = { version = "0.10.1", features = ["serde"] } -serde = { version = "1.0.160", features = ["derive"] } -serde_json = { version = "1.0.95", features = ["preserve_order"] } -tar = "0.4.38" -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 = ["serde", "v4"] } +once_cell = "1.19.0" +regex = "1.10.2" +roaring = { version = "0.10.2", features = ["serde"] } +serde = { version = "1.0.195", features = ["derive"] } +serde_json = { version = "1.0.111", features = ["preserve_order"] } +tar = "0.4.40" +tempfile = "3.9.0" +thiserror = "1.0.56" +time = { version = "0.3.31", features = ["serde-well-known", "formatting", "parsing", "macros"] } +uuid = { version = "1.6.1", features = ["serde", "v4"] } [dev-dependencies] big_s = "1.0.2" diff --git a/file-store/Cargo.toml b/file-store/Cargo.toml index d213c8963..1b1b0cff5 100644 --- a/file-store/Cargo.toml +++ b/file-store/Cargo.toml @@ -11,9 +11,9 @@ edition.workspace = true license.workspace = true [dependencies] -tempfile = "3.5.0" -thiserror = "1.0.40" -uuid = { version = "1.3.1", features = ["serde", "v4"] } +tempfile = "3.9.0" +thiserror = "1.0.56" +uuid = { version = "1.6.1", features = ["serde", "v4"] } [dev-dependencies] -faux = "0.1.9" +faux = "0.1.10" diff --git a/filter-parser/Cargo.toml b/filter-parser/Cargo.toml index d9b47f638..86792f413 100644 --- a/filter-parser/Cargo.toml +++ b/filter-parser/Cargo.toml @@ -13,8 +13,8 @@ license.workspace = true [dependencies] nom = "7.1.3" -nom_locate = "4.1.0" -unescaper = "0.1.2" +nom_locate = "4.2.0" +unescaper = "0.1.3" [dev-dependencies] -insta = "1.29.0" +insta = "1.34.0" diff --git a/fuzzers/Cargo.toml b/fuzzers/Cargo.toml index 4f3f3b4c1..a7eb68125 100644 --- a/fuzzers/Cargo.toml +++ b/fuzzers/Cargo.toml @@ -11,10 +11,10 @@ edition.workspace = true license.workspace = true [dependencies] -arbitrary = { version = "1.3.0", features = ["derive"] } -clap = { version = "4.3.0", features = ["derive"] } -fastrand = "2.0.0" +arbitrary = { version = "1.3.2", features = ["derive"] } +clap = { version = "4.4.17", features = ["derive"] } +fastrand = "2.0.1" milli = { path = "../milli" } -serde = { version = "1.0.160", features = ["derive"] } -serde_json = { version = "1.0.95", features = ["preserve_order"] } -tempfile = "3.5.0" +serde = { version = "1.0.195", features = ["derive"] } +serde_json = { version = "1.0.111", features = ["preserve_order"] } +tempfile = "3.9.0" diff --git a/index-scheduler/Cargo.toml b/index-scheduler/Cargo.toml index a8c19f435..4300bc12c 100644 --- a/index-scheduler/Cargo.toml +++ b/index-scheduler/Cargo.toml @@ -11,32 +11,32 @@ edition.workspace = true license.workspace = true [dependencies] -anyhow = "1.0.70" +anyhow = "1.0.79" bincode = "1.3.3" -csv = "1.2.1" +csv = "1.3.0" derive_builder = "0.12.0" dump = { path = "../dump" } -enum-iterator = "1.4.0" +enum-iterator = "1.5.0" file-store = { path = "../file-store" } flate2 = "1.0.28" -log = "0.4.17" +log = "0.4.20" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } page_size = "0.5.0" puffin = { version = "0.16.0", features = ["serialization"] } -roaring = { version = "0.10.1", features = ["serde"] } -serde = { version = "1.0.160", features = ["derive"] } -serde_json = { version = "1.0.95", features = ["preserve_order"] } +roaring = { version = "0.10.2", features = ["serde"] } +serde = { version = "1.0.195", features = ["derive"] } +serde_json = { version = "1.0.111", features = ["preserve_order"] } synchronoise = "1.0.1" -tempfile = "3.5.0" -thiserror = "1.0.40" -time = { version = "0.3.20", features = ["serde-well-known", "formatting", "parsing", "macros"] } +tempfile = "3.9.0" +thiserror = "1.0.56" +time = { version = "0.3.31", features = ["serde-well-known", "formatting", "parsing", "macros"] } ureq = "2.9.1" -uuid = { version = "1.3.1", features = ["serde", "v4"] } +uuid = { version = "1.6.1", features = ["serde", "v4"] } [dev-dependencies] big_s = "1.0.2" -crossbeam = "0.8.2" -insta = { version = "1.29.0", features = ["json", "redactions"] } +crossbeam = "0.8.4" +insta = { version = "1.34.0", features = ["json", "redactions"] } meili-snap = { path = "../meili-snap" } nelson = { git = "https://github.com/meilisearch/nelson.git", rev = "675f13885548fb415ead8fbb447e9e6d9314000a"} diff --git a/meili-snap/Cargo.toml b/meili-snap/Cargo.toml index ab7aa78c7..1fa67b52d 100644 --- a/meili-snap/Cargo.toml +++ b/meili-snap/Cargo.toml @@ -11,6 +11,6 @@ edition.workspace = true license.workspace = true [dependencies] -insta = { version = "^1.29.0", features = ["json", "redactions"] } +insta = { version = "^1.34.0", features = ["json", "redactions"] } md5 = "0.7.0" -once_cell = "1.17" +once_cell = "1.19" diff --git a/meilisearch-auth/Cargo.toml b/meilisearch-auth/Cargo.toml index 51be88f9e..9623e941c 100644 --- a/meilisearch-auth/Cargo.toml +++ b/meilisearch-auth/Cargo.toml @@ -11,16 +11,16 @@ edition.workspace = true license.workspace = true [dependencies] -base64 = "0.21.0" -enum-iterator = "1.4.0" +base64 = "0.21.7" +enum-iterator = "1.5.0" hmac = "0.12.1" maplit = "1.0.2" meilisearch-types = { path = "../meilisearch-types" } rand = "0.8.5" -roaring = { version = "0.10.1", features = ["serde"] } -serde = { version = "1.0.160", features = ["derive"] } -serde_json = { version = "1.0.95", features = ["preserve_order"] } -sha2 = "0.10.6" -thiserror = "1.0.40" -time = { version = "0.3.20", features = ["serde-well-known", "formatting", "parsing", "macros"] } -uuid = { version = "1.3.1", features = ["serde", "v4"] } +roaring = { version = "0.10.2", features = ["serde"] } +serde = { version = "1.0.195", features = ["derive"] } +serde_json = { version = "1.0.111", features = ["preserve_order"] } +sha2 = "0.10.8" +thiserror = "1.0.56" +time = { version = "0.3.31", features = ["serde-well-known", "formatting", "parsing", "macros"] } +uuid = { version = "1.6.1", features = ["serde", "v4"] } diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml index 136e167de..f5bfaa036 100644 --- a/meilisearch-types/Cargo.toml +++ b/meilisearch-types/Cargo.toml @@ -11,31 +11,31 @@ edition.workspace = true license.workspace = true [dependencies] -actix-web = { version = "4.3.1", default-features = false } -anyhow = "1.0.70" +actix-web = { version = "4.4.1", default-features = false } +anyhow = "1.0.79" convert_case = "0.6.0" -csv = "1.2.1" -deserr = { version = "0.6.0", features = ["actix-web"] } -either = { version = "1.8.1", features = ["serde"] } -enum-iterator = "1.4.0" +csv = "1.3.0" +deserr = { version = "0.6.1", features = ["actix-web"] } +either = { version = "1.9.0", features = ["serde"] } +enum-iterator = "1.5.0" file-store = { path = "../file-store" } -flate2 = "1.0.25" +flate2 = "1.0.28" fst = "0.4.7" memmap2 = "0.7.1" milli = { path = "../milli" } -roaring = { version = "0.10.1", features = ["serde"] } -serde = { version = "1.0.160", features = ["derive"] } +roaring = { version = "0.10.2", features = ["serde"] } +serde = { version = "1.0.195", features = ["derive"] } serde-cs = "0.2.4" -serde_json = "1.0.95" -tar = "0.4.38" -tempfile = "3.5.0" -thiserror = "1.0.40" -time = { version = "0.3.20", features = ["serde-well-known", "formatting", "parsing", "macros"] } -tokio = "1.27" -uuid = { version = "1.3.1", features = ["serde", "v4"] } +serde_json = "1.0.111" +tar = "0.4.40" +tempfile = "3.9.0" +thiserror = "1.0.56" +time = { version = "0.3.31", features = ["serde-well-known", "formatting", "parsing", "macros"] } +tokio = "1.35" +uuid = { version = "1.6.1", features = ["serde", "v4"] } [dev-dependencies] -insta = "1.29.0" +insta = "1.34.0" meili-snap = { path = "../meili-snap" } [features] diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml index 5d2423b95..1ea796fb5 100644 --- a/meilisearch/Cargo.toml +++ b/meilisearch/Cargo.toml @@ -13,14 +13,14 @@ license.workspace = true default-run = "meilisearch" [dependencies] -actix-cors = "0.6.4" -actix-http = { version = "3.3.1", default-features = false, features = [ +actix-cors = "0.6.5" +actix-http = { version = "3.5.1", default-features = false, features = [ "compress-brotli", "compress-gzip", "rustls", ] } actix-utils = "3.0.1" -actix-web = { version = "4.3.1", default-features = false, features = [ +actix-web = { version = "4.4.1", default-features = false, features = [ "macros", "compress-brotli", "compress-gzip", @@ -28,109 +28,109 @@ actix-web = { version = "4.3.1", default-features = false, features = [ "rustls", ] } actix-web-static-files = { git = "https://github.com/kilork/actix-web-static-files.git", rev = "2d3b6160", optional = true } -anyhow = { version = "1.0.70", features = ["backtrace"] } +anyhow = { version = "1.0.79", features = ["backtrace"] } async-stream = "0.3.5" -async-trait = "0.1.68" -bstr = "1.4.0" +async-trait = "0.1.77" +bstr = "1.9.0" byte-unit = { version = "4.0.19", default-features = false, features = [ "std", "serde", ] } -bytes = "1.4.0" -clap = { version = "4.2.1", features = ["derive", "env"] } -crossbeam-channel = "0.5.8" -deserr = { version = "0.6.0", features = ["actix-web"] } +bytes = "1.5.0" +clap = { version = "4.4.17", features = ["derive", "env"] } +crossbeam-channel = "0.5.11" +deserr = { version = "0.6.1", features = ["actix-web"] } dump = { path = "../dump" } -either = "1.8.1" -env_logger = "0.10.0" +either = "1.9.0" +env_logger = "0.10.1" file-store = { path = "../file-store" } -flate2 = "1.0.25" +flate2 = "1.0.28" fst = "0.4.7" -futures = "0.3.28" -futures-util = "0.3.28" -http = "0.2.9" +futures = "0.3.30" +futures-util = "0.3.30" +http = "0.2.11" index-scheduler = { path = "../index-scheduler" } -indexmap = { version = "2.0.0", features = ["serde"] } -is-terminal = "0.4.8" +indexmap = { version = "2.1.0", features = ["serde"] } +is-terminal = "0.4.10" itertools = "0.11.0" jsonwebtoken = "8.3.0" lazy_static = "1.4.0" -log = "0.4.17" +log = "0.4.20" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -mimalloc = { version = "0.1.37", default-features = false } +mimalloc = { version = "0.1.39", default-features = false } mime = "0.3.17" -num_cpus = "1.15.0" -obkv = "0.2.0" -once_cell = "1.17.1" -ordered-float = "3.7.0" +num_cpus = "1.16.0" +obkv = "0.2.1" +once_cell = "1.19.0" +ordered-float = "3.9.2" parking_lot = "0.12.1" permissive-json-pointer = { path = "../permissive-json-pointer" } -pin-project-lite = "0.2.9" +pin-project-lite = "0.2.13" platform-dirs = "0.3.0" prometheus = { version = "0.13.3", features = ["process"] } puffin = { version = "0.16.0", features = ["serialization"] } rand = "0.8.5" -rayon = "1.7.0" -regex = "1.7.3" -reqwest = { version = "0.11.16", features = [ +rayon = "1.8.0" +regex = "1.10.2" +reqwest = { version = "0.11.23", features = [ "rustls-tls", "json", ], default-features = false } -rustls = "0.20.8" -rustls-pemfile = "1.0.2" -segment = { version = "0.2.2", optional = true } -serde = { version = "1.0.160", features = ["derive"] } -serde_json = { version = "1.0.95", features = ["preserve_order"] } -sha2 = "0.10.6" -siphasher = "0.3.10" -slice-group-by = "0.3.0" +rustls = "0.20.9" +rustls-pemfile = "1.0.4" +segment = { version = "0.2.3", optional = true } +serde = { version = "1.0.195", features = ["derive"] } +serde_json = { version = "1.0.111", features = ["preserve_order"] } +sha2 = "0.10.8" +siphasher = "0.3.11" +slice-group-by = "0.3.1" static-files = { version = "0.2.3", optional = true } -sysinfo = "0.29.7" -tar = "0.4.38" -tempfile = "3.5.0" -thiserror = "1.0.40" -time = { version = "0.3.20", features = [ +sysinfo = "0.29.11" +tar = "0.4.40" +tempfile = "3.9.0" +thiserror = "1.0.56" +time = { version = "0.3.31", features = [ "serde-well-known", "formatting", "parsing", "macros", ] } -tokio = { version = "1.27.0", features = ["full"] } -tokio-stream = "0.1.12" -toml = "0.7.3" -uuid = { version = "1.3.1", features = ["serde", "v4"] } -walkdir = "2.3.3" +tokio = { version = "1.35.1", features = ["full"] } +tokio-stream = "0.1.14" +toml = "0.7.8" +uuid = { version = "1.6.1", features = ["serde", "v4"] } +walkdir = "2.4.0" yaup = "0.2.1" serde_urlencoded = "0.7.1" -termcolor = "1.2.0" +termcolor = "1.4.1" url = { version = "2.5.0", features = ["serde"] } [dev-dependencies] -actix-rt = "2.8.0" +actix-rt = "2.9.0" assert-json-diff = "2.0.2" -brotli = "3.3.4" -insta = "1.29.0" -manifest-dir-macros = "0.1.16" +brotli = "3.4.0" +insta = "1.34.0" +manifest-dir-macros = "0.1.18" maplit = "1.0.2" meili-snap = { path = "../meili-snap" } -temp-env = "0.3.3" -urlencoding = "2.1.2" +temp-env = "0.3.6" +urlencoding = "2.1.3" yaup = "0.2.1" [build-dependencies] -anyhow = { version = "1.0.70", optional = true } -cargo_toml = { version = "0.15.2", optional = true } +anyhow = { version = "1.0.79", optional = true } +cargo_toml = { version = "0.15.3", optional = true } hex = { version = "0.4.3", optional = true } -reqwest = { version = "0.11.16", features = [ +reqwest = { version = "0.11.23", features = [ "blocking", "rustls-tls", ], default-features = false, optional = true } sha-1 = { version = "0.10.1", optional = true } static-files = { version = "0.2.3", optional = true } -tempfile = { version = "3.5.0", optional = true } +tempfile = { version = "3.9.0", optional = true } vergen = { version = "7.5.1", default-features = false, features = ["git"] } -zip = { version = "0.6.4", optional = true } +zip = { version = "0.6.6", optional = true } [features] default = ["analytics", "meilisearch-types/all-tokenizations", "mini-dashboard"] diff --git a/meilitool/Cargo.toml b/meilitool/Cargo.toml index 58acd87db..9694c62b9 100644 --- a/meilitool/Cargo.toml +++ b/meilitool/Cargo.toml @@ -9,11 +9,11 @@ edition.workspace = true license.workspace = true [dependencies] -anyhow = "1.0.75" -clap = { version = "4.2.1", features = ["derive"] } +anyhow = "1.0.79" +clap = { version = "4.4.17", features = ["derive"] } dump = { path = "../dump" } file-store = { path = "../file-store" } meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -time = { version = "0.3.30", features = ["formatting"] } -uuid = { version = "1.5.0", features = ["v4"], default-features = false } +time = { version = "0.3.31", features = ["formatting"] } +uuid = { version = "1.6.1", features = ["v4"], default-features = false } diff --git a/milli/Cargo.toml b/milli/Cargo.toml index 3e10c175a..4f3885acc 100644 --- a/milli/Cargo.toml +++ b/milli/Cargo.toml @@ -14,14 +14,14 @@ license.workspace = true [dependencies] bimap = { version = "0.6.3", features = ["serde"] } bincode = "1.3.3" -bstr = "1.4.0" -bytemuck = { version = "1.13.1", features = ["extern_crate_alloc"] } -byteorder = "1.4.3" +bstr = "1.9.0" +bytemuck = { version = "1.14.0", features = ["extern_crate_alloc"] } +byteorder = "1.5.0" charabia = { version = "0.8.5", default-features = false } concat-arrays = "0.1.2" -crossbeam-channel = "0.5.8" -deserr = "0.6.0" -either = { version = "1.8.1", features = ["serde"] } +crossbeam-channel = "0.5.11" +deserr = "0.6.1" +either = { version = "1.9.0", features = ["serde"] } flatten-serde-json = { path = "../flatten-serde-json" } fst = "0.4.7" fxhash = "0.2.1" @@ -35,32 +35,32 @@ heed = { version = "0.20.0-alpha.9", default-features = false, features = [ "serde-bincode", "read-txn-no-tls", ] } -indexmap = { version = "2.0.0", features = ["serde"] } +indexmap = { version = "2.1.0", features = ["serde"] } json-depth-checker = { path = "../json-depth-checker" } levenshtein_automata = { version = "0.2.1", features = ["fst_automaton"] } memmap2 = "0.7.1" -obkv = "0.2.0" -once_cell = "1.17.1" -ordered-float = "3.6.0" +obkv = "0.2.1" +once_cell = "1.19.0" +ordered-float = "3.9.2" rand_pcg = { version = "0.3.1", features = ["serde1"] } -rayon = "1.7.0" -roaring = "0.10.1" +rayon = "1.8.0" +roaring = "0.10.2" rstar = { version = "0.11.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" +serde = { version = "1.0.195", features = ["derive"] } +serde_json = { version = "1.0.111", features = ["preserve_order"] } +slice-group-by = "0.3.1" smallstr = { version = "0.3.0", features = ["serde"] } -smallvec = "1.10.0" +smallvec = "1.12.0" smartstring = "1.0.1" -tempfile = "3.5.0" -thiserror = "1.0.40" -time = { version = "0.3.20", features = [ +tempfile = "3.9.0" +thiserror = "1.0.56" +time = { version = "0.3.31", features = [ "serde-well-known", "formatting", "parsing", "macros", ] } -uuid = { version = "1.3.1", features = ["v4"] } +uuid = { version = "1.6.1", features = ["v4"] } filter-parser = { path = "../filter-parser" } @@ -71,9 +71,9 @@ itertools = "0.11.0" puffin = "0.16.0" # logging -log = "0.4.17" +log = "0.4.20" logging_timer = "1.1.0" -csv = "1.2.1" +csv = "1.3.0" candle-core = { git = "https://github.com/huggingface/candle.git", version = "0.3.1" } candle-transformers = { git = "https://github.com/huggingface/candle.git", version = "0.3.1" } candle-nn = { git = "https://github.com/huggingface/candle.git", version = "0.3.1" } @@ -81,21 +81,21 @@ tokenizers = { git = "https://github.com/huggingface/tokenizers.git", tag = "v0. hf-hub = { git = "https://github.com/dureuill/hf-hub.git", branch = "rust_tls", default_features = false, features = [ "online", ] } -tokio = { version = "1.34.0", features = ["rt"] } -futures = "0.3.29" -reqwest = { version = "0.11.16", features = [ +tokio = { version = "1.35.1", features = ["rt"] } +futures = "0.3.30" +reqwest = { version = "0.11.23", features = [ "rustls-tls", "json", ], default-features = false } -tiktoken-rs = "0.5.7" +tiktoken-rs = "0.5.8" liquid = "0.26.4" arroy = { git = "https://github.com/meilisearch/arroy.git", version = "0.1.0" } rand = "0.8.5" [dev-dependencies] -mimalloc = { version = "0.1.37", default-features = false } +mimalloc = { version = "0.1.39", default-features = false } big_s = "1.0.2" -insta = "1.29.0" +insta = "1.34.0" maplit = "1.0.2" md5 = "0.7.0" meili-snap = { path = "../meili-snap" } From 7f125bfb12c11a55ff17e7da6d696caf2c0b29b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 15:15:54 +0100 Subject: [PATCH 03/13] Update incompatible dependencies --- Cargo.lock | 137 ++++++++++++++++++++++++++++++----------- dump/Cargo.toml | 2 +- meilisearch/Cargo.toml | 18 +++--- milli/Cargo.toml | 2 +- 4 files changed, 111 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a1bc8f183..2f7db0a32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ "actix-utils", "actix-web", @@ -149,7 +149,7 @@ dependencies = [ "impl-more", "pin-project-lite", "rustls 0.21.6", - "rustls-webpki", + "rustls-webpki 0.101.7", "tokio", "tokio-rustls 0.23.4", "tokio-util", @@ -392,7 +392,7 @@ dependencies = [ "heed", "log", "memmap2 0.9.3", - "ordered-float 4.2.0", + "ordered-float", "rand", "rayon", "roaring", @@ -753,9 +753,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.15.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" dependencies = [ "serde", "toml", @@ -1427,7 +1427,7 @@ dependencies = [ "anyhow", "big_s", "flate2", - "http 0.2.11", + "http 1.0.0", "log", "maplit", "meili-snap", @@ -3549,7 +3549,7 @@ dependencies = [ "futures", "futures-util", "hex", - "http 0.2.11", + "http 1.0.0", "index-scheduler", "indexmap 2.1.0", "insta", @@ -3568,7 +3568,7 @@ dependencies = [ "num_cpus", "obkv", "once_cell", - "ordered-float 3.9.2", + "ordered-float", "parking_lot", "permissive-json-pointer", "pin-project-lite", @@ -3579,15 +3579,15 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.20.9", - "rustls-pemfile", + "rustls 0.22.2", + "rustls-pemfile 2.0.0", "segment", "serde", "serde_json", "serde_urlencoded", "sha-1", "sha2", - "siphasher", + "siphasher 1.0.0", "slice-group-by", "static-files", "sysinfo", @@ -3741,7 +3741,7 @@ dependencies = [ "mimalloc", "obkv", "once_cell", - "ordered-float 3.9.2", + "ordered-float", "puffin", "rand", "rand_pcg", @@ -3984,15 +3984,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "ordered-float" -version = "3.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-float" version = "4.2.0" @@ -4205,7 +4196,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -4607,7 +4598,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.6", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -4756,10 +4747,24 @@ checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring 0.16.20", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring 0.17.3", + "rustls-pki-types", + "rustls-webpki 0.102.1", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -4769,6 +4774,22 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +dependencies = [ + "base64 0.21.7", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4779,6 +4800,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +dependencies = [ + "ring 0.17.3", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -4904,9 +4936,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -4989,6 +5021,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" + [[package]] name = "slab" version = "0.4.8" @@ -5186,9 +5224,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.11" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ "cfg-if", "core-foundation-sys", @@ -5196,7 +5234,7 @@ dependencies = [ "ntapi", "once_cell", "rayon", - "winapi", + "windows", ] [[package]] @@ -5470,9 +5508,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -5482,18 +5520,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap 2.1.0", "serde", @@ -5654,7 +5692,7 @@ dependencies = [ "log", "once_cell", "rustls 0.21.6", - "rustls-webpki", + "rustls-webpki 0.101.7", "serde", "serde_json", "socks", @@ -5929,6 +5967,25 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -6237,6 +6294,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + [[package]] name = "zerotrie" version = "0.1.1" diff --git a/dump/Cargo.toml b/dump/Cargo.toml index 941cec72d..8ab648b05 100644 --- a/dump/Cargo.toml +++ b/dump/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true [dependencies] anyhow = "1.0.79" flate2 = "1.0.28" -http = "0.2.11" +http = "1.0.0" log = "0.4.20" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml index 1ea796fb5..f7098dd8d 100644 --- a/meilisearch/Cargo.toml +++ b/meilisearch/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true default-run = "meilisearch" [dependencies] -actix-cors = "0.6.5" +actix-cors = "0.7.0" actix-http = { version = "3.5.1", default-features = false, features = [ "compress-brotli", "compress-gzip", @@ -48,7 +48,7 @@ flate2 = "1.0.28" fst = "0.4.7" futures = "0.3.30" futures-util = "0.3.30" -http = "0.2.11" +http = "1.0.0" index-scheduler = { path = "../index-scheduler" } indexmap = { version = "2.1.0", features = ["serde"] } is-terminal = "0.4.10" @@ -63,7 +63,7 @@ mime = "0.3.17" num_cpus = "1.16.0" obkv = "0.2.1" once_cell = "1.19.0" -ordered-float = "3.9.2" +ordered-float = "4.2.0" parking_lot = "0.12.1" permissive-json-pointer = { path = "../permissive-json-pointer" } pin-project-lite = "0.2.13" @@ -77,16 +77,16 @@ reqwest = { version = "0.11.23", features = [ "rustls-tls", "json", ], default-features = false } -rustls = "0.20.9" -rustls-pemfile = "1.0.4" +rustls = "0.22.2" +rustls-pemfile = "2.0.0" segment = { version = "0.2.3", optional = true } serde = { version = "1.0.195", features = ["derive"] } serde_json = { version = "1.0.111", features = ["preserve_order"] } sha2 = "0.10.8" -siphasher = "0.3.11" +siphasher = "1.0.0" slice-group-by = "0.3.1" static-files = { version = "0.2.3", optional = true } -sysinfo = "0.29.11" +sysinfo = "0.30.5" tar = "0.4.40" tempfile = "3.9.0" thiserror = "1.0.56" @@ -98,7 +98,7 @@ time = { version = "0.3.31", features = [ ] } tokio = { version = "1.35.1", features = ["full"] } tokio-stream = "0.1.14" -toml = "0.7.8" +toml = "0.8.8" uuid = { version = "1.6.1", features = ["serde", "v4"] } walkdir = "2.4.0" yaup = "0.2.1" @@ -120,7 +120,7 @@ yaup = "0.2.1" [build-dependencies] anyhow = { version = "1.0.79", optional = true } -cargo_toml = { version = "0.15.3", optional = true } +cargo_toml = { version = "0.18.0", optional = true } hex = { version = "0.4.3", optional = true } reqwest = { version = "0.11.23", features = [ "blocking", diff --git a/milli/Cargo.toml b/milli/Cargo.toml index 4f3885acc..f3b92dbd0 100644 --- a/milli/Cargo.toml +++ b/milli/Cargo.toml @@ -41,7 +41,7 @@ levenshtein_automata = { version = "0.2.1", features = ["fst_automaton"] } memmap2 = "0.7.1" obkv = "0.2.1" once_cell = "1.19.0" -ordered-float = "3.9.2" +ordered-float = "4.2.0" rand_pcg = { version = "0.3.1", features = ["serde1"] } rayon = "1.8.0" roaring = "0.10.2" From 3ee7682fa7637a87712927b38e26578eae72b9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 15:22:23 +0100 Subject: [PATCH 04/13] Fix some integer comparisons --- .../update/index_documents/extract/extract_vector_points.rs | 4 ++-- milli/src/update/index_documents/typed_chunk.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/milli/src/update/index_documents/extract/extract_vector_points.rs b/milli/src/update/index_documents/extract/extract_vector_points.rs index 3a0376511..cdf0b37f0 100644 --- a/milli/src/update/index_documents/extract/extract_vector_points.rs +++ b/milli/src/update/index_documents/extract/extract_vector_points.rs @@ -135,7 +135,7 @@ pub fn extract_vector_points( let del_vectors = extract_vectors(old, document_id, embedder_name)?; let add_vectors = extract_vectors(new, document_id, embedder_name)?; - if add_vectors.len() > u8::MAX.into() { + if add_vectors.len() > usize::from(u8::MAX) { return Err(crate::Error::UserError(crate::UserError::TooManyVectors( document_id().to_string(), add_vectors.len(), @@ -164,7 +164,7 @@ pub fn extract_vector_points( (None, Some(new)) => { // was possibly autogenerated, remove all vectors for that document let add_vectors = extract_vectors(new, document_id, embedder_name)?; - if add_vectors.len() > u8::MAX.into() { + if add_vectors.len() > usize::from(u8::MAX) { return Err(crate::Error::UserError(crate::UserError::TooManyVectors( document_id().to_string(), add_vectors.len(), diff --git a/milli/src/update/index_documents/typed_chunk.rs b/milli/src/update/index_documents/typed_chunk.rs index f8fb30c7b..e12479bee 100644 --- a/milli/src/update/index_documents/typed_chunk.rs +++ b/milli/src/update/index_documents/typed_chunk.rs @@ -407,7 +407,7 @@ pub(crate) fn write_typed_chunk_into_index( // code error if we somehow got the wrong dimension .unwrap(); - if embeddings.embedding_count() > u8::MAX.into() { + if embeddings.embedding_count() > usize::from(u8::MAX) { let external_docid = if let Ok(Some(Ok(index))) = index .external_id_of(wtxn, std::iter::once(docid)) .map(|it| it.into_iter().next()) From 9f9ad4cc0572fd619c8282b625dd727fb7c83125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 15:27:24 +0100 Subject: [PATCH 05/13] Fix Clippy warnings --- milli/src/error.rs | 2 +- milli/src/search/facet/facet_sort_ascending.rs | 4 ++-- milli/src/search/facet/facet_sort_descending.rs | 4 ++-- milli/src/search/facet/mod.rs | 6 +++--- milli/src/update/facet/incremental.rs | 4 ++-- .../extract/extract_word_pair_proximity_docids.rs | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/milli/src/error.rs b/milli/src/error.rs index 539861e73..d0a4d35ef 100644 --- a/milli/src/error.rs +++ b/milli/src/error.rs @@ -172,7 +172,7 @@ only composed of alphanumeric characters (a-z A-Z 0-9), hyphens (-) and undersco TooManyDocumentIds { primary_key: String, document: Object }, #[error("The primary key inference failed as the engine did not find any field ending with `id` in its name. Please specify the primary key manually using the `primaryKey` query parameter.")] NoPrimaryKeyCandidateFound, - #[error("The primary key inference failed as the engine found {} fields ending with `id` in their names: '{}' and '{}'. Please specify the primary key manually using the `primaryKey` query parameter.", .candidates.len(), .candidates.get(0).unwrap(), .candidates.get(1).unwrap())] + #[error("The primary key inference failed as the engine found {} fields ending with `id` in their names: '{}' and '{}'. Please specify the primary key manually using the `primaryKey` query parameter.", .candidates.len(), .candidates.first().unwrap(), .candidates.get(1).unwrap())] MultiplePrimaryKeyCandidatesFound { candidates: Vec }, #[error("There is no more space left on the device. Consider increasing the size of the disk/partition.")] NoSpaceLeftOnDevice, diff --git a/milli/src/search/facet/facet_sort_ascending.rs b/milli/src/search/facet/facet_sort_ascending.rs index 20c277c63..07fe64510 100644 --- a/milli/src/search/facet/facet_sort_ascending.rs +++ b/milli/src/search/facet/facet_sort_ascending.rs @@ -181,7 +181,7 @@ mod tests { get_simple_string_index_with_multiple_field_ids(), get_random_looking_string_index_with_multiple_field_ids(), ]; - for (_i, index) in indexes.iter().enumerate() { + for index in indexes { let txn = index.env.read_txn().unwrap(); let candidates = RoaringBitmap::new(); let mut results = String::new(); @@ -212,7 +212,7 @@ mod tests { get_simple_string_index_with_multiple_field_ids(), get_random_looking_string_index_with_multiple_field_ids(), ]; - for (_i, index) in indexes.iter().enumerate() { + for index in indexes { let txn = index.env.read_txn().unwrap(); let candidates = RoaringBitmap::new(); let mut results = String::new(); diff --git a/milli/src/search/facet/facet_sort_descending.rs b/milli/src/search/facet/facet_sort_descending.rs index ae6eb60d0..dd2692012 100644 --- a/milli/src/search/facet/facet_sort_descending.rs +++ b/milli/src/search/facet/facet_sort_descending.rs @@ -195,7 +195,7 @@ mod tests { get_simple_string_index_with_multiple_field_ids(), get_random_looking_string_index_with_multiple_field_ids(), ]; - for (_i, index) in indexes.iter().enumerate() { + for index in indexes { let txn = index.env.read_txn().unwrap(); let candidates = RoaringBitmap::new(); let mut results = String::new(); @@ -226,7 +226,7 @@ mod tests { get_simple_string_index_with_multiple_field_ids(), get_random_looking_string_index_with_multiple_field_ids(), ]; - for (_i, index) in indexes.iter().enumerate() { + for index in indexes { let txn = index.env.read_txn().unwrap(); let candidates = RoaringBitmap::new(); let mut results = String::new(); diff --git a/milli/src/search/facet/mod.rs b/milli/src/search/facet/mod.rs index f44d6a153..f676ee109 100644 --- a/milli/src/search/facet/mod.rs +++ b/milli/src/search/facet/mod.rs @@ -142,7 +142,7 @@ pub(crate) mod tests { let mut txn = index.env.write_txn().unwrap(); let mut rng = rand::rngs::SmallRng::from_seed([0; 32]); - for (_i, key) in std::iter::from_fn(|| Some(rng.gen_range(0..256))).take(128).enumerate() { + for key in std::iter::from_fn(|| Some(rng.gen_range(0..256))).take(128) { let mut bitmap = RoaringBitmap::new(); bitmap.insert(key); bitmap.insert(key + 100); @@ -172,7 +172,7 @@ pub(crate) mod tests { let keys = std::iter::from_fn(|| Some(rng.gen_range(0..256))).take(128).collect::>(); for fid in 0..2 { - for (_i, &key) in keys.iter().enumerate() { + for &key in &keys { let mut bitmap = RoaringBitmap::new(); bitmap.insert(key); bitmap.insert(key + 100); @@ -207,7 +207,7 @@ pub(crate) mod tests { let keys = std::iter::from_fn(|| Some(rng.gen_range(0..256))).take(128).collect::>(); for fid in 0..2 { - for (_i, &key) in keys.iter().enumerate() { + for &key in &keys { let mut bitmap = RoaringBitmap::new(); bitmap.insert(key); bitmap.insert(key + 100); diff --git a/milli/src/update/facet/incremental.rs b/milli/src/update/facet/incremental.rs index 9d8ee08f4..78db218e3 100644 --- a/milli/src/update/facet/incremental.rs +++ b/milli/src/update/facet/incremental.rs @@ -751,7 +751,7 @@ mod tests { let mut rng = rand::rngs::SmallRng::from_seed([0; 32]); keys.shuffle(&mut rng); - for (_i, key) in keys.into_iter().enumerate() { + for key in keys { let mut bitmap = RoaringBitmap::new(); bitmap.insert(key); index.insert(&mut txn, 0, &(key as f64), &bitmap); @@ -770,7 +770,7 @@ mod tests { let mut rng = rand::rngs::SmallRng::from_seed([0; 32]); keys.shuffle(&mut rng); - for (_i, key) in keys.into_iter().enumerate() { + for key in keys { let mut bitmap = RoaringBitmap::new(); bitmap.insert(key); bitmap.insert(rng.gen_range(256..512)); diff --git a/milli/src/update/index_documents/extract/extract_word_pair_proximity_docids.rs b/milli/src/update/index_documents/extract/extract_word_pair_proximity_docids.rs index b8a377247..d364b3e13 100644 --- a/milli/src/update/index_documents/extract/extract_word_pair_proximity_docids.rs +++ b/milli/src/update/index_documents/extract/extract_word_pair_proximity_docids.rs @@ -77,7 +77,7 @@ pub fn extract_word_pair_proximity_docids( if let Some(deletion) = KvReaderDelAdd::new(value).get(DelAdd::Deletion) { for (position, word) in KvReaderU16::new(deletion).iter() { // drain the proximity window until the head word is considered close to the word we are inserting. - while del_word_positions.get(0).map_or(false, |(_w, p)| { + while del_word_positions.front().map_or(false, |(_w, p)| { index_proximity(*p as u32, position as u32) >= MAX_DISTANCE }) { word_positions_into_word_pair_proximity( @@ -106,7 +106,7 @@ pub fn extract_word_pair_proximity_docids( if let Some(addition) = KvReaderDelAdd::new(value).get(DelAdd::Addition) { for (position, word) in KvReaderU16::new(addition).iter() { // drain the proximity window until the head word is considered close to the word we are inserting. - while add_word_positions.get(0).map_or(false, |(_w, p)| { + while add_word_positions.front().map_or(false, |(_w, p)| { index_proximity(*p as u32, position as u32) >= MAX_DISTANCE }) { word_positions_into_word_pair_proximity( From 5e0268d40e72a85e4cee28333df6ccd4fd5bc8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 15:43:03 +0100 Subject: [PATCH 06/13] Fix the sysinfo errors --- meilisearch/src/analytics/segment_analytics.rs | 11 ++++++----- meilisearch/src/option.rs | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meilisearch/src/analytics/segment_analytics.rs b/meilisearch/src/analytics/segment_analytics.rs index 86a5eddb9..6969c9b3d 100644 --- a/meilisearch/src/analytics/segment_analytics.rs +++ b/meilisearch/src/analytics/segment_analytics.rs @@ -18,7 +18,7 @@ use segment::message::{Identify, Track, User}; use segment::{AutoBatcher, Batcher, HttpClient}; use serde::Serialize; use serde_json::{json, Value}; -use sysinfo::{DiskExt, System, SystemExt}; +use sysinfo::{Disks, System}; use time::OffsetDateTime; use tokio::select; use tokio::sync::mpsc::{self, Receiver, Sender}; @@ -386,16 +386,17 @@ impl Segment { fn compute_traits(opt: &Opt, stats: Stats) -> Value { static FIRST_START_TIMESTAMP: Lazy = Lazy::new(Instant::now); static SYSTEM: Lazy = Lazy::new(|| { + let disks = Disks::new_with_refreshed_list(); let mut sys = System::new_all(); sys.refresh_all(); - let kernel_version = - sys.kernel_version().and_then(|k| k.split_once('-').map(|(k, _)| k.to_string())); + let kernel_version = System::kernel_version() + .and_then(|k| k.split_once('-').map(|(k, _)| k.to_string())); json!({ - "distribution": sys.name(), + "distribution": System::name(), "kernel_version": kernel_version, "cores": sys.cpus().len(), "ram_size": sys.total_memory(), - "disk_size": sys.disks().iter().map(|disk| disk.total_space()).max(), + "disk_size": disks.iter().map(|disk| disk.total_space()).max(), "server_provider": std::env::var("MEILI_SERVER_PROVIDER").ok(), }) }); diff --git a/meilisearch/src/option.rs b/meilisearch/src/option.rs index a0672c9cf..befb96294 100644 --- a/meilisearch/src/option.rs +++ b/meilisearch/src/option.rs @@ -20,7 +20,7 @@ use rustls::server::{ use rustls::RootCertStore; use rustls_pemfile::{certs, pkcs8_private_keys, rsa_private_keys}; use serde::{Deserialize, Serialize}; -use sysinfo::{RefreshKind, System, SystemExt}; +use sysinfo::{RefreshKind, System}; use url::Url; const POSSIBLE_ENV: [&str; 2] = ["development", "production"]; From 0c8d1644a65ed1a53db0174fd8c63b10e9ea9250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 15:55:16 +0100 Subject: [PATCH 07/13] Rollback rustls to 0.20.9 --- Cargo.lock | 59 +++++------------------------------------- meilisearch/Cargo.toml | 4 +-- 2 files changed, 8 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f7db0a32..c3f2befef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,7 +149,7 @@ dependencies = [ "impl-more", "pin-project-lite", "rustls 0.21.6", - "rustls-webpki 0.101.7", + "rustls-webpki", "tokio", "tokio-rustls 0.23.4", "tokio-util", @@ -3579,8 +3579,8 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.22.2", - "rustls-pemfile 2.0.0", + "rustls 0.20.9", + "rustls-pemfile", "segment", "serde", "serde_json", @@ -4598,7 +4598,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.6", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", @@ -4747,24 +4747,10 @@ checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring 0.16.20", - "rustls-webpki 0.101.7", + "rustls-webpki", "sct", ] -[[package]] -name = "rustls" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" -dependencies = [ - "log", - "ring 0.17.3", - "rustls-pki-types", - "rustls-webpki 0.102.1", - "subtle", - "zeroize", -] - [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -4774,22 +4760,6 @@ dependencies = [ "base64 0.21.7", ] -[[package]] -name = "rustls-pemfile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" -dependencies = [ - "base64 0.21.7", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4800,17 +4770,6 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "rustls-webpki" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" -dependencies = [ - "ring 0.17.3", - "rustls-pki-types", - "untrusted 0.9.0", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -5692,7 +5651,7 @@ dependencies = [ "log", "once_cell", "rustls 0.21.6", - "rustls-webpki 0.101.7", + "rustls-webpki", "serde", "serde_json", "socks", @@ -6294,12 +6253,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" - [[package]] name = "zerotrie" version = "0.1.1" diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml index f7098dd8d..bcbefd866 100644 --- a/meilisearch/Cargo.toml +++ b/meilisearch/Cargo.toml @@ -77,8 +77,8 @@ reqwest = { version = "0.11.23", features = [ "rustls-tls", "json", ], default-features = false } -rustls = "0.22.2" -rustls-pemfile = "2.0.0" +rustls = "0.20.8" +rustls-pemfile = "1.0.2" segment = { version = "0.2.3", optional = true } serde = { version = "1.0.195", features = ["derive"] } serde_json = { version = "1.0.111", features = ["preserve_order"] } From cfaa522d683f8cb663ecdd55c5a093d440495bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 16:36:54 +0100 Subject: [PATCH 08/13] Bump the Rust version to 1.75.0 --- .github/workflows/test-suite.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index ed9cafa79..6da13da80 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -164,7 +164,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.71.1 + toolchain: 1.75.0 override: true components: clippy - name: Cache dependencies diff --git a/Dockerfile b/Dockerfile index 2cc1dcaec..dd2cfc134 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Compile -FROM rust:1.71.1-alpine3.18 AS compiler +FROM rust:1.75.0-alpine3.18 AS compiler RUN apk add -q --update-cache --no-cache build-base openssl-dev From 01e2c3d6bba8b74089a4b8b3bf4415d8b305f3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 16:45:55 +0100 Subject: [PATCH 09/13] Bump arroy to v0.2.0 --- Cargo.lock | 5 +++-- milli/Cargo.toml | 2 +- milli/src/error.rs | 1 + milli/src/update/index_documents/mod.rs | 8 ++------ milli/src/update/index_documents/typed_chunk.rs | 3 +-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3f2befef..198c9262d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -384,8 +384,9 @@ dependencies = [ [[package]] name = "arroy" -version = "0.1.0" -source = "git+https://github.com/meilisearch/arroy.git#d372648212e561a4845077cdb9239423d78655a2" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efddeb1e7c32a551cc07ef4c3e181e3cd5478fdaf4f0bd799983171c1f6efe57" dependencies = [ "bytemuck", "byteorder", diff --git a/milli/Cargo.toml b/milli/Cargo.toml index f3b92dbd0..ec27b5f39 100644 --- a/milli/Cargo.toml +++ b/milli/Cargo.toml @@ -89,7 +89,7 @@ reqwest = { version = "0.11.23", features = [ ], default-features = false } tiktoken-rs = "0.5.8" liquid = "0.26.4" -arroy = { git = "https://github.com/meilisearch/arroy.git", version = "0.1.0" } +arroy = "0.2.0" rand = "0.8.5" [dev-dependencies] diff --git a/milli/src/error.rs b/milli/src/error.rs index d0a4d35ef..5a4fbc7f5 100644 --- a/milli/src/error.rs +++ b/milli/src/error.rs @@ -251,6 +251,7 @@ impl From for Error { arroy::Error::DatabaseFull | arroy::Error::InvalidItemAppend | arroy::Error::UnmatchingDistance { .. } + | arroy::Error::MissingNode | arroy::Error::MissingMetadata => { Error::InternalError(InternalError::ArroyError(value)) } diff --git a/milli/src/update/index_documents/mod.rs b/milli/src/update/index_documents/mod.rs index e797c0380..83d2c08e1 100644 --- a/milli/src/update/index_documents/mod.rs +++ b/milli/src/update/index_documents/mod.rs @@ -522,12 +522,8 @@ where pool.install(|| { let writer_index = (embedder_index as u16) << 8; for k in 0..=u8::MAX { - let writer = arroy::Writer::prepare( - wtxn, - vector_arroy, - writer_index | (k as u16), - dimension, - )?; + let writer = + arroy::Writer::new(vector_arroy, writer_index | (k as u16), dimension)?; if writer.is_empty(wtxn)? { break; } diff --git a/milli/src/update/index_documents/typed_chunk.rs b/milli/src/update/index_documents/typed_chunk.rs index e12479bee..58cb9bb02 100644 --- a/milli/src/update/index_documents/typed_chunk.rs +++ b/milli/src/update/index_documents/typed_chunk.rs @@ -372,8 +372,7 @@ pub(crate) fn write_typed_chunk_into_index( // FIXME: allow customizing distance let writers: std::result::Result, _> = (0..=u8::MAX) .map(|k| { - arroy::Writer::prepare( - wtxn, + arroy::Writer::new( index.vector_arroy, writer_index | (k as u16), expected_dimension, From 406531c99147394c4bdacf9b1113bcac4e913a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 16:49:51 +0100 Subject: [PATCH 10/13] Fix sysinfo --- meilisearch/src/option.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meilisearch/src/option.rs b/meilisearch/src/option.rs index befb96294..3cff14aa0 100644 --- a/meilisearch/src/option.rs +++ b/meilisearch/src/option.rs @@ -20,7 +20,7 @@ use rustls::server::{ use rustls::RootCertStore; use rustls_pemfile::{certs, pkcs8_private_keys, rsa_private_keys}; use serde::{Deserialize, Serialize}; -use sysinfo::{RefreshKind, System}; +use sysinfo::{MemoryRefreshKind, RefreshKind, System}; use url::Url; const POSSIBLE_ENV: [&str; 2] = ["development", "production"]; @@ -633,8 +633,8 @@ impl MaxMemory { /// Returns the total amount of bytes available or `None` if this system isn't supported. fn total_memory_bytes() -> Option { - if System::IS_SUPPORTED { - let memory_kind = RefreshKind::new().with_memory(); + if sysinfo::IS_SUPPORTED_SYSTEM { + let memory_kind = RefreshKind::new().with_memory(MemoryRefreshKind::new().with_ram()); let mut system = System::new_with_specifics(memory_kind); system.refresh_memory(); Some(system.total_memory()) From 50e1d34c6627aa4c2ac7635e1090e8462c13112d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 16:57:33 +0100 Subject: [PATCH 11/13] Rollback http to 0.2.11 --- Cargo.lock | 4 ++-- dump/Cargo.toml | 2 +- meilisearch/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 198c9262d..bf3851db5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1428,7 +1428,7 @@ dependencies = [ "anyhow", "big_s", "flate2", - "http 1.0.0", + "http 0.2.11", "log", "maplit", "meili-snap", @@ -3550,7 +3550,7 @@ dependencies = [ "futures", "futures-util", "hex", - "http 1.0.0", + "http 0.2.11", "index-scheduler", "indexmap 2.1.0", "insta", diff --git a/dump/Cargo.toml b/dump/Cargo.toml index 8ab648b05..941cec72d 100644 --- a/dump/Cargo.toml +++ b/dump/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true [dependencies] anyhow = "1.0.79" flate2 = "1.0.28" -http = "1.0.0" +http = "0.2.11" log = "0.4.20" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml index bcbefd866..1f85783f6 100644 --- a/meilisearch/Cargo.toml +++ b/meilisearch/Cargo.toml @@ -48,7 +48,7 @@ flate2 = "1.0.28" fst = "0.4.7" futures = "0.3.30" futures-util = "0.3.30" -http = "1.0.0" +http = "0.2.11" index-scheduler = { path = "../index-scheduler" } indexmap = { version = "2.1.0", features = ["serde"] } is-terminal = "0.4.10" From d997ea1f01a236178bc92b98d9c72b9ce747f3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 17:04:01 +0100 Subject: [PATCH 12/13] Make Clippy happy --- dump/src/reader/v3/errors.rs | 1 + dump/src/reader/v4/errors.rs | 1 + dump/src/reader/v5/errors.rs | 1 + 3 files changed, 3 insertions(+) diff --git a/dump/src/reader/v3/errors.rs b/dump/src/reader/v3/errors.rs index 40c4d2c8d..6e9da4f41 100644 --- a/dump/src/reader/v3/errors.rs +++ b/dump/src/reader/v3/errors.rs @@ -1,5 +1,6 @@ use serde::{Deserialize, Serialize}; +#[allow(clippy::enum_variant_names)] #[derive(Serialize, Deserialize, Debug, Clone, Copy)] pub enum Code { // index related error diff --git a/dump/src/reader/v4/errors.rs b/dump/src/reader/v4/errors.rs index afa640de4..a2638e86f 100644 --- a/dump/src/reader/v4/errors.rs +++ b/dump/src/reader/v4/errors.rs @@ -95,6 +95,7 @@ impl fmt::Display for ErrorType { } } +#[allow(clippy::enum_variant_names)] #[derive(Serialize, Deserialize, Debug, Clone, Copy)] pub enum Code { // index related error diff --git a/dump/src/reader/v5/errors.rs b/dump/src/reader/v5/errors.rs index f4067d4c6..55e036725 100644 --- a/dump/src/reader/v5/errors.rs +++ b/dump/src/reader/v5/errors.rs @@ -31,6 +31,7 @@ impl ResponseError { } } +#[allow(clippy::enum_variant_names)] #[derive(Deserialize, Debug, Clone, Copy)] #[cfg_attr(test, derive(serde::Serialize))] pub enum Code { From f2755549824a2a67fd2c5c77209b66d02bcfc388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 18:10:30 +0100 Subject: [PATCH 13/13] Make sure we override the default Rust version --- .github/workflows/test-suite.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 6da13da80..68e5a4678 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -66,6 +66,10 @@ jobs: - uses: actions/checkout@v3 - name: Cache dependencies uses: Swatinem/rust-cache@v2.7.1 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true - name: Run cargo check without any default features uses: actions-rs/cargo@v1 with: