From b997039a91f312f8118cbd6ce8b0b76381ca337b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 13:52:14 +0100 Subject: [PATCH 01/13] Upgrade compatible dependencies --- Cargo.lock | 194 +++++++++++++++++----------- crates/benchmarks/Cargo.toml | 18 +-- crates/build-info/Cargo.toml | 6 +- crates/dump/Cargo.toml | 28 ++-- crates/file-store/Cargo.toml | 8 +- crates/filter-parser/Cargo.toml | 2 +- crates/fuzzers/Cargo.toml | 12 +- crates/index-scheduler/Cargo.toml | 34 ++--- crates/meili-snap/Cargo.toml | 2 +- crates/meilisearch-auth/Cargo.toml | 12 +- crates/meilisearch-types/Cargo.toml | 36 +++--- crates/meilisearch/Cargo.toml | 92 ++++++------- crates/meilitool/Cargo.toml | 14 +- crates/milli/Cargo.toml | 58 ++++----- crates/tracing-trace/Cargo.toml | 16 +-- crates/xtask/Cargo.toml | 24 ++-- 16 files changed, 301 insertions(+), 255 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6592f4711..07a90bb1f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,6 +234,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" version = "0.8.4" @@ -356,9 +362,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" dependencies = [ "backtrace", ] @@ -466,7 +472,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.2", "object", "rustc-demangle", ] @@ -761,9 +767,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" dependencies = [ "bytemuck_derive", ] @@ -787,9 +793,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bytestring" @@ -1326,9 +1332,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" dependencies = [ "csv-core", "itoa", @@ -1908,12 +1914,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.2", ] [[package]] @@ -2229,9 +2235,9 @@ checksum = "36d244a08113319b5ebcabad2b8b7925732d15eec46d7e7ac3c11734f3b7a6ad" [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -2582,9 +2588,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -2595,7 +2601,6 @@ dependencies = [ "pin-project-lite", "socket2 0.5.5", "tokio", - "tower", "tower-service", "tracing", ] @@ -2914,7 +2919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.48.1", ] [[package]] @@ -3745,6 +3750,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -4640,9 +4654,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", @@ -4673,6 +4687,7 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-util", + "tower", "tower-service", "url", "wasm-bindgen", @@ -4680,7 +4695,7 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg", + "windows-registry", ] [[package]] @@ -4756,9 +4771,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.7" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81dc953b2244ddd5e7860cb0bb2a790494b898ef321d4aff8e260efab60cc88" +checksum = "a652edd001c53df0b3f96a36a8dc93fce6866988efc16808235653c6bcac8bf2" dependencies = [ "bytemuck", "byteorder", @@ -4949,9 +4964,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -4967,9 +4982,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -4978,9 +4993,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "indexmap", "itoa", @@ -5318,6 +5333,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synchronoise" @@ -5396,12 +5414,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", "once_cell", "rustix", "windows-sys 0.52.0", @@ -5668,14 +5687,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.13" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "pin-project", "pin-project-lite", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -5683,15 +5702,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -6243,7 +6262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6252,7 +6271,37 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -6279,7 +6328,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6314,17 +6363,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6341,9 +6391,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6359,9 +6409,9 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6377,9 +6427,15 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6395,9 +6451,9 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6413,9 +6469,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6431,9 +6487,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6449,9 +6505,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -6471,16 +6527,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wiremock" version = "0.6.0" diff --git a/crates/benchmarks/Cargo.toml b/crates/benchmarks/Cargo.toml index ccd256546..a2cddd554 100644 --- a/crates/benchmarks/Cargo.toml +++ b/crates/benchmarks/Cargo.toml @@ -11,27 +11,27 @@ edition.workspace = true license.workspace = true [dependencies] -anyhow = "1.0.86" +anyhow = "1.0.95" bumpalo = "3.16.0" -csv = "1.3.0" +csv = "1.3.1" memmap2 = "0.9.5" milli = { path = "../milli" } mimalloc = { version = "0.1.43", default-features = false } -serde_json = { version = "1.0.120", features = ["preserve_order"] } -tempfile = "3.14.0" +serde_json = { version = "1.0.135", features = ["preserve_order"] } +tempfile = "3.15.0" [dev-dependencies] criterion = { version = "0.5.1", features = ["html_reports"] } rand = "0.8.5" rand_chacha = "0.3.1" -roaring = "0.10.7" +roaring = "0.10.10" [build-dependencies] -anyhow = "1.0.86" -bytes = "1.6.0" +anyhow = "1.0.95" +bytes = "1.9.0" convert_case = "0.6.0" -flate2 = "1.0.30" -reqwest = { version = "0.12.5", features = ["blocking", "rustls-tls"], default-features = false } +flate2 = "1.0.35" +reqwest = { version = "0.12.12", features = ["blocking", "rustls-tls"], default-features = false } [features] default = ["milli/all-tokenizations"] diff --git a/crates/build-info/Cargo.toml b/crates/build-info/Cargo.toml index c24dffe5c..f8ede756e 100644 --- a/crates/build-info/Cargo.toml +++ b/crates/build-info/Cargo.toml @@ -11,8 +11,8 @@ license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -time = { version = "0.3.36", features = ["parsing"] } +time = { version = "0.3.37", features = ["parsing"] } [build-dependencies] -anyhow = "1.0.86" -vergen-git2 = "1.0.0" +anyhow = "1.0.95" +vergen-git2 = "1.0.2" diff --git a/crates/dump/Cargo.toml b/crates/dump/Cargo.toml index 679a97b4e..b23b8fa4c 100644 --- a/crates/dump/Cargo.toml +++ b/crates/dump/Cargo.toml @@ -11,21 +11,21 @@ readme.workspace = true license.workspace = true [dependencies] -anyhow = "1.0.86" -flate2 = "1.0.30" -http = "1.1.0" +anyhow = "1.0.95" +flate2 = "1.0.35" +http = "1.2.0" meilisearch-types = { path = "../meilisearch-types" } -once_cell = "1.19.0" -regex = "1.10.5" -roaring = { version = "0.10.7", features = ["serde"] } -serde = { version = "1.0.204", features = ["derive"] } -serde_json = { version = "1.0.120", features = ["preserve_order"] } -tar = "0.4.41" -tempfile = "3.10.1" -thiserror = "1.0.61" -time = { version = "0.3.36", features = ["serde-well-known", "formatting", "parsing", "macros"] } -tracing = "0.1.40" -uuid = { version = "1.10.0", features = ["serde", "v4"] } +once_cell = "1.20.2" +regex = "1.11.1" +roaring = { version = "0.10.10", features = ["serde"] } +serde = { version = "1.0.217", features = ["derive"] } +serde_json = { version = "1.0.135", features = ["preserve_order"] } +tar = "0.4.43" +tempfile = "3.15.0" +thiserror = "1.0.69" +time = { version = "0.3.37", features = ["serde-well-known", "formatting", "parsing", "macros"] } +tracing = "0.1.41" +uuid = { version = "1.11.0", features = ["serde", "v4"] } [dev-dependencies] big_s = "1.0.2" diff --git a/crates/file-store/Cargo.toml b/crates/file-store/Cargo.toml index 08b7bb717..339c8a708 100644 --- a/crates/file-store/Cargo.toml +++ b/crates/file-store/Cargo.toml @@ -11,7 +11,7 @@ edition.workspace = true license.workspace = true [dependencies] -tempfile = "3.10.1" -thiserror = "1.0.61" -tracing = "0.1.40" -uuid = { version = "1.10.0", features = ["serde", "v4"] } +tempfile = "3.15.0" +thiserror = "1.0.69" +tracing = "0.1.41" +uuid = { version = "1.11.0", features = ["serde", "v4"] } diff --git a/crates/filter-parser/Cargo.toml b/crates/filter-parser/Cargo.toml index 6725a35d1..88cc68737 100644 --- a/crates/filter-parser/Cargo.toml +++ b/crates/filter-parser/Cargo.toml @@ -17,4 +17,4 @@ nom_locate = "4.2.0" unescaper = "0.1.5" [dev-dependencies] -insta = "1.39.0" +insta = "1.42.0" diff --git a/crates/fuzzers/Cargo.toml b/crates/fuzzers/Cargo.toml index 86a0f779d..a838350ba 100644 --- a/crates/fuzzers/Cargo.toml +++ b/crates/fuzzers/Cargo.toml @@ -11,12 +11,12 @@ edition.workspace = true license.workspace = true [dependencies] -arbitrary = { version = "1.3.2", features = ["derive"] } +arbitrary = { version = "1.4.1", features = ["derive"] } bumpalo = "3.16.0" -clap = { version = "4.5.9", features = ["derive"] } +clap = { version = "4.5.24", features = ["derive"] } either = "1.13.0" -fastrand = "2.1.0" +fastrand = "2.3.0" milli = { path = "../milli" } -serde = { version = "1.0.204", features = ["derive"] } -serde_json = { version = "1.0.120", features = ["preserve_order"] } -tempfile = "3.10.1" +serde = { version = "1.0.217", features = ["derive"] } +serde_json = { version = "1.0.135", features = ["preserve_order"] } +tempfile = "3.15.0" diff --git a/crates/index-scheduler/Cargo.toml b/crates/index-scheduler/Cargo.toml index ec2f17f84..4ddb0b757 100644 --- a/crates/index-scheduler/Cargo.toml +++ b/crates/index-scheduler/Cargo.toml @@ -11,42 +11,42 @@ edition.workspace = true license.workspace = true [dependencies] -anyhow = "1.0.86" +anyhow = "1.0.95" bincode = "1.3.3" bumpalo = "3.16.0" -bumparaw-collections = "0.1.2" +bumparaw-collections = "0.1.4" convert_case = "0.6.0" -csv = "1.3.0" -derive_builder = "0.20.0" +csv = "1.3.1" +derive_builder = "0.20.2" dump = { path = "../dump" } enum-iterator = "2.1.0" file-store = { path = "../file-store" } -flate2 = "1.0.30" +flate2 = "1.0.35" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -memmap2 = "0.9.4" +memmap2 = "0.9.5" page_size = "0.6.0" rayon = "1.10.0" -roaring = { version = "0.10.7", features = ["serde"] } -serde = { version = "1.0.204", features = ["derive"] } -serde_json = { version = "1.0.120", features = ["preserve_order"] } +roaring = { version = "0.10.10", features = ["serde"] } +serde = { version = "1.0.217", features = ["derive"] } +serde_json = { version = "1.0.135", features = ["preserve_order"] } synchronoise = "1.0.1" -tempfile = "3.10.1" -thiserror = "1.0.61" -time = { version = "0.3.36", features = [ +tempfile = "3.15.0" +thiserror = "1.0.69" +time = { version = "0.3.37", features = [ "serde-well-known", "formatting", "parsing", "macros", ] } -tracing = "0.1.40" -ureq = "2.10.0" -uuid = { version = "1.10.0", features = ["serde", "v4"] } +tracing = "0.1.41" +ureq = "2.12.1" +uuid = { version = "1.11.0", features = ["serde", "v4"] } [dev-dependencies] arroy = "0.5.0" big_s = "1.0.2" -crossbeam-channel = "0.5.13" -insta = { version = "1.39.0", features = ["json", "redactions"] } +crossbeam-channel = "0.5.14" +insta = { version = "1.42.0", features = ["json", "redactions"] } maplit = "1.0.2" meili-snap = { path = "../meili-snap" } diff --git a/crates/meili-snap/Cargo.toml b/crates/meili-snap/Cargo.toml index aee6b497f..0c48ff824 100644 --- a/crates/meili-snap/Cargo.toml +++ b/crates/meili-snap/Cargo.toml @@ -14,4 +14,4 @@ license.workspace = true # fixed version due to format breakages in v1.40 insta = { version = "=1.39.0", features = ["json", "redactions"] } md5 = "0.7.0" -once_cell = "1.19" +once_cell = "1.20" diff --git a/crates/meilisearch-auth/Cargo.toml b/crates/meilisearch-auth/Cargo.toml index 591a40158..67a2c9ca0 100644 --- a/crates/meilisearch-auth/Cargo.toml +++ b/crates/meilisearch-auth/Cargo.toml @@ -17,10 +17,10 @@ hmac = "0.12.1" maplit = "1.0.2" meilisearch-types = { path = "../meilisearch-types" } rand = "0.8.5" -roaring = { version = "0.10.7", features = ["serde"] } -serde = { version = "1.0.204", features = ["derive"] } -serde_json = { version = "1.0.120", features = ["preserve_order"] } +roaring = { version = "0.10.10", features = ["serde"] } +serde = { version = "1.0.217", features = ["derive"] } +serde_json = { version = "1.0.135", features = ["preserve_order"] } sha2 = "0.10.8" -thiserror = "1.0.61" -time = { version = "0.3.36", features = ["serde-well-known", "formatting", "parsing", "macros"] } -uuid = { version = "1.10.0", features = ["serde", "v4"] } +thiserror = "1.0.69" +time = { version = "0.3.37", features = ["serde-well-known", "formatting", "parsing", "macros"] } +uuid = { version = "1.11.0", features = ["serde", "v4"] } diff --git a/crates/meilisearch-types/Cargo.toml b/crates/meilisearch-types/Cargo.toml index 55db187b5..1039f7165 100644 --- a/crates/meilisearch-types/Cargo.toml +++ b/crates/meilisearch-types/Cargo.toml @@ -11,40 +11,40 @@ edition.workspace = true license.workspace = true [dependencies] -actix-web = { version = "4.8.0", default-features = false } -anyhow = "1.0.86" +actix-web = { version = "4.9.0", default-features = false } +anyhow = "1.0.95" bumpalo = "3.16.0" convert_case = "0.6.0" -csv = "1.3.0" -deserr = { version = "0.6.2", features = ["actix-web"] } +csv = "1.3.1" +deserr = { version = "0.6.3", features = ["actix-web"] } either = { version = "1.13.0", features = ["serde"] } enum-iterator = "2.1.0" file-store = { path = "../file-store" } -flate2 = "1.0.30" +flate2 = "1.0.35" fst = "0.4.7" -memmap2 = "0.9.4" +memmap2 = "0.9.5" milli = { path = "../milli" } -bumparaw-collections = "0.1.2" -roaring = { version = "0.10.7", features = ["serde"] } +bumparaw-collections = "0.1.4" +roaring = { version = "0.10.10", features = ["serde"] } rustc-hash = "2.1.0" -serde = { version = "1.0.204", features = ["derive"] } +serde = { version = "1.0.217", features = ["derive"] } serde-cs = "0.2.4" -serde_json = "1.0.120" -tar = "0.4.41" -tempfile = "3.10.1" -thiserror = "1.0.61" -time = { version = "0.3.36", features = [ +serde_json = "1.0.135" +tar = "0.4.43" +tempfile = "3.15.0" +thiserror = "1.0.69" +time = { version = "0.3.37", features = [ "serde-well-known", "formatting", "parsing", "macros", ] } -tokio = "1.38" -utoipa = { version = "5.2.0", features = ["macros"] } -uuid = { version = "1.10.0", features = ["serde", "v4"] } +tokio = "1.42" +utoipa = { version = "5.3.1", features = ["macros"] } +uuid = { version = "1.11.0", features = ["serde", "v4"] } [dev-dependencies] -insta = "1.39.0" +insta = "1.42.0" meili-snap = { path = "../meili-snap" } [features] diff --git a/crates/meilisearch/Cargo.toml b/crates/meilisearch/Cargo.toml index fb058c4cb..9e3315e0d 100644 --- a/crates/meilisearch/Cargo.toml +++ b/crates/meilisearch/Cargo.toml @@ -14,41 +14,41 @@ default-run = "meilisearch" [dependencies] actix-cors = "0.7.0" -actix-http = { version = "3.8.0", default-features = false, features = [ +actix-http = { version = "3.9.0", default-features = false, features = [ "compress-brotli", "compress-gzip", "rustls-0_23", ] } actix-utils = "3.0.1" -actix-web = { version = "4.8.0", default-features = false, features = [ +actix-web = { version = "4.9.0", default-features = false, features = [ "macros", "compress-brotli", "compress-gzip", "cookies", "rustls-0_23", ] } -anyhow = { version = "1.0.86", features = ["backtrace"] } -async-trait = "0.1.81" -bstr = "1.9.1" -byte-unit = { version = "5.1.4", default-features = false, features = [ +anyhow = { version = "1.0.95", features = ["backtrace"] } +async-trait = "0.1.85" +bstr = "1.11.3" +byte-unit = { version = "5.1.6", default-features = false, features = [ "std", "byte", "serde", ] } -bytes = "1.6.0" -clap = { version = "4.5.9", features = ["derive", "env"] } -crossbeam-channel = "0.5.13" -deserr = { version = "0.6.2", features = ["actix-web"] } +bytes = "1.9.0" +clap = { version = "4.5.24", features = ["derive", "env"] } +crossbeam-channel = "0.5.14" +deserr = { version = "0.6.3", features = ["actix-web"] } dump = { path = "../dump" } either = "1.13.0" file-store = { path = "../file-store" } -flate2 = "1.0.30" +flate2 = "1.0.35" fst = "0.4.7" -futures = "0.3.30" -futures-util = "0.3.30" +futures = "0.3.31" +futures-util = "0.3.31" index-scheduler = { path = "../index-scheduler" } -indexmap = { version = "2.2.6", features = ["serde"] } -is-terminal = "0.4.12" +indexmap = { version = "2.7.0", features = ["serde"] } +is-terminal = "0.4.13" itertools = "0.13.0" jsonwebtoken = "9.3.0" lazy_static = "1.5.0" @@ -58,80 +58,80 @@ mimalloc = { version = "0.1.43", default-features = false } mime = "0.3.17" num_cpus = "1.16.0" obkv = "0.3.0" -once_cell = "1.19.0" -ordered-float = "4.2.1" +once_cell = "1.20.2" +ordered-float = "4.6.0" parking_lot = "0.12.3" permissive-json-pointer = { path = "../permissive-json-pointer" } -pin-project-lite = "0.2.14" +pin-project-lite = "0.2.16" platform-dirs = "0.3.0" prometheus = { version = "0.13.4", features = ["process"] } rand = "0.8.5" rayon = "1.10.0" -regex = "1.10.5" -reqwest = { version = "0.12.5", features = [ +regex = "1.11.1" +reqwest = { version = "0.12.12", features = [ "rustls-tls", "json", ], default-features = false } -rustls = { version = "0.23.11", features = ["ring"], default-features = false } -rustls-pki-types = { version = "1.7.0", features = ["alloc"] } -rustls-pemfile = "2.1.2" +rustls = { version = "0.23.20", features = ["ring"], default-features = false } +rustls-pki-types = { version = "1.10.1", features = ["alloc"] } +rustls-pemfile = "2.2.0" segment = { version = "0.2.4" } -serde = { version = "1.0.204", features = ["derive"] } -serde_json = { version = "1.0.120", features = ["preserve_order"] } +serde = { version = "1.0.217", features = ["derive"] } +serde_json = { version = "1.0.135", features = ["preserve_order"] } sha2 = "0.10.8" siphasher = "1.0.1" slice-group-by = "0.3.1" static-files = { version = "0.2.4", optional = true } sysinfo = "0.30.13" -tar = "0.4.41" -tempfile = "3.10.1" -thiserror = "1.0.61" -time = { version = "0.3.36", features = [ +tar = "0.4.43" +tempfile = "3.15.0" +thiserror = "1.0.69" +time = { version = "0.3.37", features = [ "serde-well-known", "formatting", "parsing", "macros", ] } -tokio = { version = "1.38.0", features = ["full"] } -toml = "0.8.14" -uuid = { version = "1.10.0", features = ["serde", "v4"] } +tokio = { version = "1.42.0", features = ["full"] } +toml = "0.8.19" +uuid = { version = "1.11.0", features = ["serde", "v4"] } serde_urlencoded = "0.7.1" termcolor = "1.4.1" -url = { version = "2.5.2", features = ["serde"] } -tracing = "0.1.40" -tracing-subscriber = { version = "0.3.18", features = ["json"] } +url = { version = "2.5.4", features = ["serde"] } +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.19", features = ["json"] } tracing-trace = { version = "0.1.0", path = "../tracing-trace" } -tracing-actix-web = "0.7.11" +tracing-actix-web = "0.7.15" build-info = { version = "1.7.0", path = "../build-info" } -roaring = "0.10.7" +roaring = "0.10.10" mopa-maintained = "0.2.3" -utoipa = { version = "5.2.0", features = ["actix_extras", "macros", "non_strict_integers", "preserve_order", "uuid", "time", "openapi_extensions"] } -utoipa-scalar = { version = "0.2.0", optional = true, features = ["actix-web"] } +utoipa = { version = "5.3.1", features = ["actix_extras", "macros", "non_strict_integers", "preserve_order", "uuid", "time", "openapi_extensions"] } +utoipa-scalar = { version = "0.2.1", optional = true, features = ["actix-web"] } [dev-dependencies] actix-rt = "2.10.0" brotli = "6.0.0" -insta = "1.39.0" +insta = "1.42.0" manifest-dir-macros = "0.1.18" maplit = "1.0.2" meili-snap = { path = "../meili-snap" } temp-env = "0.3.6" urlencoding = "2.1.3" -wiremock = "0.6.0" +wiremock = "0.6.2" yaup = "0.3.1" [build-dependencies] -anyhow = { version = "1.0.86", optional = true } -cargo_toml = { version = "0.20.3", optional = true } +anyhow = { version = "1.0.95", optional = true } +cargo_toml = { version = "0.20.5", optional = true } hex = { version = "0.4.3", optional = true } -reqwest = { version = "0.12.5", features = [ +reqwest = { version = "0.12.12", features = [ "blocking", "rustls-tls", ], default-features = false, optional = true } sha-1 = { version = "0.10.1", optional = true } static-files = { version = "0.2.4", optional = true } -tempfile = { version = "3.10.1", optional = true } -zip = { version = "2.1.3", optional = true } +tempfile = { version = "3.15.0", optional = true } +zip = { version = "2.2.2", optional = true } [features] default = ["meilisearch-types/all-tokenizations", "mini-dashboard"] diff --git a/crates/meilitool/Cargo.toml b/crates/meilitool/Cargo.toml index 7d0b9f32c..6841ad57a 100644 --- a/crates/meilitool/Cargo.toml +++ b/crates/meilitool/Cargo.toml @@ -9,16 +9,16 @@ edition.workspace = true license.workspace = true [dependencies] -anyhow = "1.0.86" +anyhow = "1.0.95" arroy_v04_to_v05 = { package = "arroy", git = "https://github.com/meilisearch/arroy/", tag = "DO-NOT-DELETE-upgrade-v04-to-v05" } -clap = { version = "4.5.9", features = ["derive"] } +clap = { version = "4.5.24", features = ["derive"] } dump = { path = "../dump" } file-store = { path = "../file-store" } indexmap = {version = "2.7.0", features = ["serde"]} meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -serde = { version = "1.0.209", features = ["derive"] } -serde_json = {version = "1.0.133", features = ["preserve_order"]} -tempfile = "3.14.0" -time = { version = "0.3.36", features = ["formatting", "parsing", "alloc"] } -uuid = { version = "1.10.0", features = ["v4"], default-features = false } +serde = { version = "1.0.217", features = ["derive"] } +serde_json = {version = "1.0.135", features = ["preserve_order"]} +tempfile = "3.15.0" +time = { version = "0.3.37", features = ["formatting", "parsing", "alloc"] } +uuid = { version = "1.11.0", features = ["v4"], default-features = false } diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index 27b6ae876..f725f1b16 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -15,57 +15,57 @@ license.workspace = true big_s = "1.0.2" bimap = { version = "0.6.3", features = ["serde"] } bincode = "1.3.3" -bstr = "1.9.1" -bytemuck = { version = "1.18.0", features = ["extern_crate_alloc"] } +bstr = "1.11.3" +bytemuck = { version = "1.21.0", features = ["extern_crate_alloc"] } byteorder = "1.5.0" charabia = { version = "0.9.2", default-features = false } concat-arrays = "0.1.2" -crossbeam-channel = "0.5.13" -deserr = "0.6.2" +crossbeam-channel = "0.5.14" +deserr = "0.6.3" either = { version = "1.13.0", features = ["serde"] } flatten-serde-json = { path = "../flatten-serde-json" } fst = "0.4.7" fxhash = "0.2.1" geoutils = "0.5.1" grenad = { version = "0.5.0", default-features = false, features = ["rayon", "tempfile"] } -heed = { version = "0.20.3", default-features = false, features = [ +heed = { version = "0.20.5", default-features = false, features = [ "serde-json", "serde-bincode", "read-txn-no-tls", ] } -indexmap = { version = "2.2.6", features = ["serde"] } +indexmap = { version = "2.7.0", features = ["serde"] } json-depth-checker = { path = "../json-depth-checker" } levenshtein_automata = { version = "0.2.1", features = ["fst_automaton"] } -memchr = "2.5.0" -memmap2 = "0.9.4" +memchr = "2.7.4" +memmap2 = "0.9.5" obkv = "0.3.0" -once_cell = "1.19.0" -ordered-float = "4.2.1" +once_cell = "1.20.2" +ordered-float = "4.6.0" rayon = "1.10.0" -roaring = { version = "0.10.7", features = ["serde"] } -rstar = { version = "0.12.0", features = ["serde"] } -serde = { version = "1.0.204", features = ["derive"] } -serde_json = { version = "1.0.120", features = ["preserve_order", "raw_value"] } +roaring = { version = "0.10.10", features = ["serde"] } +rstar = { version = "0.12.2", features = ["serde"] } +serde = { version = "1.0.217", features = ["derive"] } +serde_json = { version = "1.0.135", features = ["preserve_order", "raw_value"] } slice-group-by = "0.3.1" smallstr = { version = "0.3.0", features = ["serde"] } smallvec = "1.13.2" smartstring = "1.0.1" -tempfile = "3.10.1" -thiserror = "1.0.61" -time = { version = "0.3.36", features = [ +tempfile = "3.15.0" +thiserror = "1.0.69" +time = { version = "0.3.37", features = [ "serde-well-known", "formatting", "parsing", "macros", ] } -uuid = { version = "1.10.0", features = ["v4"] } +uuid = { version = "1.11.0", features = ["v4"] } filter-parser = { path = "../filter-parser" } # documents words self-join itertools = "0.13.0" -csv = "1.3.0" +csv = "1.3.1" candle-core = { version = "0.6.0" } candle-transformers = { version = "0.6.0" } candle-nn = { version = "0.6.0" } @@ -76,7 +76,7 @@ hf-hub = { git = "https://github.com/dureuill/hf-hub.git", branch = "rust_tls", "online", ] } tiktoken-rs = "0.5.9" -liquid = "0.26.6" +liquid = "0.26.9" rhai = { git = "https://github.com/rhaiscript/rhai", rev = "ef3df63121d27aacd838f366f2b83fd65f20a1e4", features = [ "serde", "no_module", @@ -86,25 +86,25 @@ rhai = { git = "https://github.com/rhaiscript/rhai", rev = "ef3df63121d27aacd838 ] } arroy = "0.5.0" rand = "0.8.5" -tracing = "0.1.40" -ureq = { version = "2.10.0", features = ["json"] } -url = "2.5.2" +tracing = "0.1.41" +ureq = { version = "2.12.1", features = ["json"] } +url = "2.5.4" rayon-par-bridge = "0.1.0" -hashbrown = "0.15.0" +hashbrown = "0.15.2" bumpalo = "3.16.0" -bumparaw-collections = "0.1.2" +bumparaw-collections = "0.1.4" thread_local = "1.1.8" -allocator-api2 = "0.2.18" -rustc-hash = "2.0.0" +allocator-api2 = "0.2.21" +rustc-hash = "2.1.0" uell = "0.1.0" enum-iterator = "2.1.0" bbqueue = { git = "https://github.com/meilisearch/bbqueue" } flume = { version = "0.11.1", default-features = false } -utoipa = { version = "5.0.2", features = ["non_strict_integers", "preserve_order", "uuid", "time", "openapi_extensions"] } +utoipa = { version = "5.3.1", features = ["non_strict_integers", "preserve_order", "uuid", "time", "openapi_extensions"] } [dev-dependencies] mimalloc = { version = "0.1.43", default-features = false } -insta = "1.39.0" +insta = "1.42.0" maplit = "1.0.2" md5 = "0.7.0" meili-snap = { path = "../meili-snap" } diff --git a/crates/tracing-trace/Cargo.toml b/crates/tracing-trace/Cargo.toml index 9afada3c2..a8a2d5d8b 100644 --- a/crates/tracing-trace/Cargo.toml +++ b/crates/tracing-trace/Cargo.toml @@ -8,17 +8,17 @@ edition = "2021" [dependencies] color-spantrace = "0.2.1" fxprof-processed-profile = "0.7.0" -serde = { version = "1.0.204", features = ["derive"] } -serde_json = "1.0.120" -tracing = "0.1.40" -tracing-error = "0.2.0" -tracing-subscriber = "0.3.18" -byte-unit = { version = "5.1.4", default-features = false, features = [ +serde = { version = "1.0.217", features = ["derive"] } +serde_json = "1.0.135" +tracing = "0.1.41" +tracing-error = "0.2.1" +tracing-subscriber = "0.3.19" +byte-unit = { version = "5.1.6", default-features = false, features = [ "std", "byte", "serde", ] } -tokio = { version = "1.38.0", features = ["sync"] } +tokio = { version = "1.42.0", features = ["sync"] } [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies] -libproc = "0.14.8" +libproc = "0.14.10" diff --git a/crates/xtask/Cargo.toml b/crates/xtask/Cargo.toml index 79bed3d2e..da9a40c8e 100644 --- a/crates/xtask/Cargo.toml +++ b/crates/xtask/Cargo.toml @@ -11,34 +11,34 @@ license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.86" +anyhow = "1.0.95" build-info = { version = "1.7.0", path = "../build-info" } cargo_metadata = "0.18.1" -clap = { version = "4.5.9", features = ["derive"] } -futures-core = "0.3.30" -futures-util = "0.3.30" -reqwest = { version = "0.12.5", features = [ +clap = { version = "4.5.24", features = ["derive"] } +futures-core = "0.3.31" +futures-util = "0.3.31" +reqwest = { version = "0.12.12", features = [ "stream", "json", "rustls-tls", ], default-features = false } -serde = { version = "1.0.204", features = ["derive"] } -serde_json = "1.0.120" +serde = { version = "1.0.217", features = ["derive"] } +serde_json = "1.0.135" sha2 = "0.10.8" sysinfo = "0.30.13" -time = { version = "0.3.36", features = [ +time = { version = "0.3.37", features = [ "serde", "serde-human-readable", "macros", ] } -tokio = { version = "1.38.0", features = [ +tokio = { version = "1.42.0", features = [ "rt", "net", "time", "process", "signal", ] } -tracing = "0.1.40" -tracing-subscriber = "0.3.18" +tracing = "0.1.41" +tracing-subscriber = "0.3.19" tracing-trace = { version = "0.1.0", path = "../tracing-trace" } -uuid = { version = "1.10.0", features = ["v7", "serde"] } +uuid = { version = "1.11.0", features = ["v7", "serde"] } From 48a9ad4c17c19eb99b0dd1eb7747bc20967be99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 15:18:08 +0100 Subject: [PATCH 02/13] Fix insta to 1.39 --- Cargo.lock | 763 ++++++++++++++++++---------- crates/filter-parser/Cargo.toml | 3 +- crates/index-scheduler/Cargo.toml | 3 +- crates/meilisearch-types/Cargo.toml | 3 +- crates/meilisearch/Cargo.toml | 3 +- crates/milli/Cargo.toml | 3 +- 6 files changed, 491 insertions(+), 287 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07a90bb1f..023fabd90 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" +checksum = "d48f96fc3003717aeb9856ca3d02a8c7de502667ad76eeacd830b48d2e91fac4" dependencies = [ "actix-codec", "actix-rt", @@ -119,7 +119,7 @@ dependencies = [ "actix-utils", "futures-core", "futures-util", - "mio", + "mio 0.8.11", "num_cpus", "socket2 0.4.9", "tokio", @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.8.0" +version = "4.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" +checksum = "9180d76e5cc7ccbc4d60a506f2c727730b154010262df5b910eb17dbe4b8cb38" dependencies = [ "actix-codec", "actix-http", @@ -191,6 +191,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", + "impl-more", "itoa", "language-tags", "log", @@ -302,9 +303,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anes" @@ -328,9 +329,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" @@ -377,9 +378,9 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -407,7 +408,7 @@ dependencies = [ "rayon", "roaring", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -426,7 +427,7 @@ dependencies = [ "rayon", "roaring", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -441,9 +442,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", @@ -548,16 +549,14 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.13.0", "proc-macro2", "quote", "regex", @@ -684,9 +683,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" dependencies = [ "memchr", "regex-automata", @@ -721,16 +720,16 @@ dependencies = [ "allocator-api2", "bitpacking", "bumpalo", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", "serde_json", ] [[package]] name = "byte-unit" -version = "5.1.4" +version = "5.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" +checksum = "e1cd29c3c585209b0cbc7309bfe3ed7efd8c84c21b7af29c8bfae908f8777174" dependencies = [ "rust_decimal", "serde", @@ -854,7 +853,7 @@ dependencies = [ "rand_distr", "rayon", "safetensors", - "thiserror", + "thiserror 1.0.69", "yoke", "zip 1.1.4", ] @@ -880,7 +879,7 @@ dependencies = [ "rayon", "safetensors", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -922,14 +921,14 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "cargo_toml" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4895c018bb228aa6b3ba1a0285543fcb4b704734c3fb1f72afaa75aa769500c1" +checksum = "88da5a13c620b4ca0078845707ea9c3faf11edbc3ffd8497d11d686211cd1ac0" dependencies = [ "serde", "toml", @@ -1064,9 +1063,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd" dependencies = [ "clap_builder", "clap_derive", @@ -1074,9 +1073,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd" dependencies = [ "anstream", "anstyle", @@ -1086,9 +1085,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1098,9 +1097,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "color-spantrace" @@ -1273,9 +1272,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] @@ -1373,12 +1372,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1397,9 +1396,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", @@ -1422,11 +1421,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", "syn 2.0.87", ] @@ -1460,9 +1459,9 @@ dependencies = [ [[package]] name = "deflate64" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" [[package]] name = "deranged" @@ -1476,9 +1475,9 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", @@ -1496,11 +1495,11 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ - "derive_builder_macro 0.20.0", + "derive_builder_macro 0.20.2", ] [[package]] @@ -1517,11 +1516,11 @@ dependencies = [ [[package]] name = "derive_builder_core" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", "syn 2.0.87", @@ -1539,11 +1538,11 @@ dependencies = [ [[package]] name = "derive_builder_macro" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ - "derive_builder_core 0.20.0", + "derive_builder_core 0.20.2", "syn 2.0.87", ] @@ -1562,9 +1561,9 @@ dependencies = [ [[package]] name = "deserr" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe971a2a48625fda3198032f35de60939828c4aed47d76715c21698801b985c" +checksum = "7a4da990b9de75d39b5fb69bb0105ec3f1726d43b71b3ddb359cf38470017a56" dependencies = [ "actix-http", "actix-utils", @@ -1579,9 +1578,9 @@ dependencies = [ [[package]] name = "deserr-internal" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae89f00c97a75940185084a826c0aace055774ad57a58211625606449ea0bd8" +checksum = "aadef696fce456c704f10186def1bdc0a40e646c9f4f18cf091477acadb731d8" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -1675,7 +1674,7 @@ dependencies = [ "anyhow", "big_s", "flate2", - "http 1.1.0", + "http 1.2.0", "maplit", "meili-snap", "meilisearch-types", @@ -1686,7 +1685,7 @@ dependencies = [ "serde_json", "tar", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "tracing", "uuid", @@ -1876,16 +1875,16 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "file-store" version = "1.12.0" dependencies = [ "tempfile", - "thiserror", + "thiserror 1.0.69", "tracing", "uuid", ] @@ -1974,9 +1973,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1989,9 +1988,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1999,15 +1998,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2016,15 +2015,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -2033,21 +2032,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2246,18 +2245,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "getset" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "gimli" version = "0.27.3" @@ -2326,7 +2313,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.1.0", + "http 1.2.0", "indexmap", "slab", "tokio", @@ -2384,9 +2371,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", @@ -2418,9 +2405,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "heed" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc30da4a93ff8cb98e535d595d6de42731d4719d707bc1c86f579158751a24e" +checksum = "7d4f449bab7320c56003d37732a917e18798e2f1709d80263face2b4f9436ddb" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -2459,6 +2446,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -2471,13 +2464,13 @@ version = "0.3.2" source = "git+https://github.com/dureuill/hf-hub.git?branch=rust_tls#88d4f11cb9fa079f2912bacb96f5080b16825ce8" dependencies = [ "dirs", - "http 1.1.0", + "http 1.2.0", "indicatif", "log", "rand", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "ureq", ] @@ -2503,9 +2496,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2519,7 +2512,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -2530,7 +2523,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body", "pin-project-lite", ] @@ -2557,7 +2550,7 @@ dependencies = [ "futures-channel", "futures-util", "h2 0.4.5", - "http 1.1.0", + "http 1.2.0", "http-body", "httparse", "httpdate", @@ -2575,7 +2568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 1.1.0", + "http 1.2.0", "hyper", "hyper-util", "rustls", @@ -2595,7 +2588,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body", "hyper", "pin-project-lite", @@ -2605,6 +2598,124 @@ dependencies = [ "tracing", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -2613,12 +2724,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -2640,7 +2762,7 @@ dependencies = [ "convert_case 0.6.0", "crossbeam-channel", "csv", - "derive_builder 0.20.0", + "derive_builder 0.20.2", "dump", "enum-iterator", "file-store", @@ -2658,7 +2780,7 @@ dependencies = [ "serde_json", "synchronoise", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "tracing", "ureq", @@ -2672,7 +2794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -2741,11 +2863,11 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -2799,7 +2921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1e2b0210dc78b49337af9e49d7ae41a39dceac6e5985613f1cf7763e2f76a25" dependencies = [ "cedarwood", - "derive_builder 0.20.0", + "derive_builder 0.20.2", "fxhash", "lazy_static", "phf", @@ -2879,12 +3001,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "levenshtein_automata" version = "0.2.1" @@ -2919,7 +3035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.48.1", + "windows-targets 0.52.6", ] [[package]] @@ -2940,9 +3056,9 @@ dependencies = [ [[package]] name = "libproc" -version = "0.14.8" +version = "0.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9ea4b75e1a81675429dafe43441df1caea70081e82246a8cccf514884a88bb" +checksum = "e78a09b56be5adbcad5aa1197371688dc6bb249a26da3bca2011ee2fb987ebfb" dependencies = [ "bindgen", "errno", @@ -2997,7 +3113,7 @@ dependencies = [ "regex", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "unicode-blocks", "unicode-normalization", "unicode-segmentation", @@ -3067,7 +3183,7 @@ dependencies = [ "log", "once_cell", "serde", - "thiserror", + "thiserror 1.0.69", "yada", ] @@ -3117,7 +3233,7 @@ dependencies = [ "bincode", "byteorder", "csv", - "derive_builder 0.20.0", + "derive_builder 0.20.2", "encoding", "encoding_rs", "encoding_rs_io", @@ -3288,9 +3404,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "liquid" -version = "0.26.6" +version = "0.26.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10929f201279ba14da3297b957dcda1e0bf7a6f3bb5115688be684aa8864e9cc" +checksum = "7cdcc72b82748f47c2933c172313f5a9aea5b2c4eb3fa4c66b4ea55bb60bb4b1" dependencies = [ "doc-comment", "liquid-core", @@ -3301,12 +3417,12 @@ dependencies = [ [[package]] name = "liquid-core" -version = "0.26.6" +version = "0.26.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aef4b2160791f456eb880c990a97746f693746f92302ef5f1d06111cf14b768" +checksum = "2752e978ffc53670f3f2e8b3ef09f348d6f7b5474a3be3f8a5befe5382e4effb" dependencies = [ "anymap2", - "itertools 0.12.1", + "itertools 0.13.0", "kstring", "liquid-derive", "num-traits", @@ -3319,9 +3435,9 @@ dependencies = [ [[package]] name = "liquid-derive" -version = "0.26.5" +version = "0.26.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915f6d0a2963a27cd5205c1902f32ddfe3bc035816afd268cf88c0fc0f8d287e" +checksum = "3b51f1d220e3fa869e24cfd75915efe3164bd09bb11b3165db3f37f57bf673e3" dependencies = [ "proc-macro2", "quote", @@ -3330,11 +3446,11 @@ dependencies = [ [[package]] name = "liquid-lib" -version = "0.26.6" +version = "0.26.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f48fc446873f74d869582f5c4b8cbf3248c93395e410a67af5809b3731e44a" +checksum = "59b1a298d3d2287ee5b1e43840d885b8fdfc37d3f4e90d82aacfd04d021618da" dependencies = [ - "itertools 0.12.1", + "itertools 0.13.0", "liquid-core", "once_cell", "percent-encoding", @@ -3344,10 +3460,16 @@ dependencies = [ ] [[package]] -name = "lmdb-master-sys" -version = "0.2.2" +name = "litemap" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57640c190703d5ccf4a86aff4aeb749b2d287a8cb1723c76b51f39d77ab53b24" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + +[[package]] +name = "lmdb-master-sys" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "472c3760e2a8d0f61f322fb36788021bb36d573c502b50fa3e2bcaac3ec326c9" dependencies = [ "cc", "doxygen-rs", @@ -3527,7 +3649,7 @@ dependencies = [ "temp-env", "tempfile", "termcolor", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "toml", @@ -3542,7 +3664,7 @@ dependencies = [ "uuid", "wiremock", "yaup", - "zip 2.1.3", + "zip 2.2.2", ] [[package]] @@ -3559,7 +3681,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.69", "time", "uuid", ] @@ -3591,7 +3713,7 @@ dependencies = [ "serde_json", "tar", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "utoipa", @@ -3665,7 +3787,7 @@ dependencies = [ "fxhash", "geoutils", "grenad", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "heed", "hf-hub", "indexmap", @@ -3697,7 +3819,7 @@ dependencies = [ "smallvec", "smartstring", "tempfile", - "thiserror", + "thiserror 1.0.69", "thread_local", "tiktoken-rs", "time", @@ -3771,6 +3893,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "monostate" version = "0.1.9" @@ -3800,9 +3933,9 @@ checksum = "79b7f3e22167862cc7c95b21a6f326c22e4bf40da59cbf000b368a310173ba11" [[package]] name = "mutually_exclusive_features" -version = "0.0.3" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d02c0b00610773bb7fc61d85e13d86c7858cbdf00e1a120bfc41bc055dbaa0e" +checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577" [[package]] name = "nohash" @@ -3903,7 +4036,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -3960,9 +4093,9 @@ checksum = "ae4512a8f418ac322335255a72361b9ac927e106f4d7fe6ab4d8ac59cb01f7a9" [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "onig" @@ -4000,9 +4133,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "4.2.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" dependencies = [ "num-traits", ] @@ -4113,7 +4246,7 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] @@ -4225,9 +4358,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -4320,7 +4453,6 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", "version_check", ] @@ -4381,7 +4513,7 @@ dependencies = [ "parking_lot", "procfs", "protobuf", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4434,7 +4566,7 @@ dependencies = [ "quinn-udp", "rustc-hash 1.1.0", "rustls", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -4451,7 +4583,7 @@ dependencies = [ "rustc-hash 2.1.0", "rustls", "slab", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tracing", ] @@ -4605,14 +4737,14 @@ checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", "redox_syscall 0.2.16", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4622,9 +4754,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -4639,9 +4771,9 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" @@ -4663,7 +4795,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body", "http-body-util", "hyper", @@ -4782,9 +4914,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.12.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008" +checksum = "421400d13ccfd26dfa5858199c30a5d76f9c54e0dba7575273025b43c5175dbb" dependencies = [ "heapless", "num-traits", @@ -4850,9 +4982,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.11" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "log", "once_cell", @@ -4865,25 +4997,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" [[package]] name = "rustls-webpki" -version = "0.102.5" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -4892,9 +5023,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" @@ -4943,7 +5074,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -5015,9 +5146,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -5117,7 +5248,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -5367,7 +5498,7 @@ dependencies = [ "byteorder", "enum-as-inner", "libc", - "thiserror", + "thiserror 1.0.69", "walkdir", ] @@ -5394,9 +5525,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -5446,18 +5577,38 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", @@ -5491,9 +5642,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -5514,9 +5665,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -5531,6 +5682,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -5580,7 +5741,7 @@ dependencies = [ "serde", "serde_json", "spm_precompiled", - "thiserror", + "thiserror 1.0.69", "unicode-normalization-alignments", "unicode-segmentation", "unicode_categories", @@ -5588,28 +5749,27 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.3", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -5642,21 +5802,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.15", + "toml_edit 0.22.22", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -5674,15 +5834,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.15" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.22", ] [[package]] @@ -5714,9 +5874,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5726,9 +5886,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.7.11" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee9e39a66d9b615644893ffc1704d2a89b5b315b7fd0228ad3182ca9a306b19" +checksum = "54a9f5c1aca50ebebf074ee665b9f99f2e84906dcf6b993a0d0090edb835166d" dependencies = [ "actix-web", "mutually_exclusive_features", @@ -5739,9 +5899,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -5750,9 +5910,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -5760,9 +5920,9 @@ dependencies = [ [[package]] name = "tracing-error" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" dependencies = [ "tracing", "tracing-subscriber", @@ -5781,9 +5941,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" dependencies = [ "serde", "tracing-core", @@ -5791,9 +5951,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "nu-ansi-term", "serde", @@ -5855,7 +6015,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5867,12 +6027,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-blocks" version = "0.1.9" @@ -5929,9 +6083,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.10.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" dependencies = [ "base64 0.22.1", "flate2", @@ -5948,9 +6102,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -5964,12 +6118,24 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + [[package]] name = "utf8-width" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.1" @@ -5978,9 +6144,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "5.2.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514a48569e4e21c86d0b84b5612b5e73c0b2cf09db63260134ba426d4e8ea714" +checksum = "435c6f69ef38c9017b4b4eea965dfb91e71e53d869e896db40d1cf2441dd75c0" dependencies = [ "indexmap", "serde", @@ -5990,9 +6156,9 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "5.2.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5629efe65599d0ccd5d493688cbf6e03aa7c1da07fe59ff97cf5977ed0637f66" +checksum = "a77d306bc75294fd52f3e99b13ece67c02c1a2789190a6f31d32f736624326f7" dependencies = [ "proc-macro2", "quote", @@ -6003,9 +6169,9 @@ dependencies = [ [[package]] name = "utoipa-scalar" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1291aa7a2223c2f8399d1c6627ca0ba57ca0d7ecac762a2094a9dfd6376445a" +checksum = "088e93bf19f6bd06e0aacb02ca432b3c5a449c4aec2e4aa9fc333a667f2b2c55" dependencies = [ "actix-web", "serde", @@ -6015,9 +6181,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "serde", @@ -6037,24 +6203,24 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "9.0.0" +version = "9.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32e7318e93a9ac53693b6caccfb05ff22e04a44c7cf8a279051f24c09da286f" +checksum = "31f25fc8f8f05df455c7941e87f093ad22522a9ff33d7a027774815acf6f0639" dependencies = [ "anyhow", - "derive_builder 0.20.0", + "derive_builder 0.20.2", "rustversion", "vergen-lib", ] [[package]] name = "vergen-git2" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62c52cd2b2b8b7ec75fc20111b3022ac3ff83e4fc14b9497cfcfd39c54f9c67" +checksum = "5e63e069d8749fead1e3bab7a9d79e8fb90516b2ec66fc2243a798ecdc1a31d7" dependencies = [ "anyhow", - "derive_builder 0.20.0", + "derive_builder 0.20.2", "git2", "rustversion", "time", @@ -6064,13 +6230,12 @@ dependencies = [ [[package]] name = "vergen-lib" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e06bee42361e43b60f363bad49d63798d0f42fb1768091812270eca00c784720" +checksum = "c0c767e6751c09fc85cde58722cf2f1007e80e4c8d5a4321fc90d83dc54ca147" dependencies = [ "anyhow", - "derive_builder 0.20.0", - "getset", + "derive_builder 0.20.2", "rustversion", ] @@ -6520,25 +6685,25 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" dependencies = [ "memchr", ] [[package]] name = "wiremock" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec874e1eef0df2dcac546057fe5e29186f09c378181cd7b635b4b7bcc98e9d81" +checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "deadpool", "futures", - "http 1.1.0", + "http 1.2.0", "http-body-util", "hyper", "hyper-util", @@ -6551,6 +6716,18 @@ dependencies = [ "url", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -6608,14 +6785,14 @@ checksum = "b0144f1a16a199846cb21024da74edd930b43443463292f536b7110b4855b5c6" dependencies = [ "form_urlencoded", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "yoke" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -6625,9 +6802,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", @@ -6696,6 +6873,28 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "zip" version = "1.1.4" @@ -6708,14 +6907,14 @@ dependencies = [ "displaydoc", "indexmap", "num_enum", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "zip" -version = "2.1.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" +checksum = "ae9c1ea7b3a5e1f4b922ff856a129881167511563dc219869afe3787fc0c1a45" dependencies = [ "aes", "arbitrary", @@ -6733,7 +6932,7 @@ dependencies = [ "pbkdf2", "rand", "sha1", - "thiserror", + "thiserror 2.0.9", "time", "zeroize", "zopfli", diff --git a/crates/filter-parser/Cargo.toml b/crates/filter-parser/Cargo.toml index 88cc68737..2657315a4 100644 --- a/crates/filter-parser/Cargo.toml +++ b/crates/filter-parser/Cargo.toml @@ -17,4 +17,5 @@ nom_locate = "4.2.0" unescaper = "0.1.5" [dev-dependencies] -insta = "1.42.0" +# fixed version due to format breakages in v1.40 +insta = "=1.39.0" diff --git a/crates/index-scheduler/Cargo.toml b/crates/index-scheduler/Cargo.toml index 4ddb0b757..443b367e5 100644 --- a/crates/index-scheduler/Cargo.toml +++ b/crates/index-scheduler/Cargo.toml @@ -47,6 +47,7 @@ uuid = { version = "1.11.0", features = ["serde", "v4"] } arroy = "0.5.0" big_s = "1.0.2" crossbeam-channel = "0.5.14" -insta = { version = "1.42.0", features = ["json", "redactions"] } +# fixed version due to format breakages in v1.40 +insta = { version = "=1.39.0", features = ["json", "redactions"] } maplit = "1.0.2" meili-snap = { path = "../meili-snap" } diff --git a/crates/meilisearch-types/Cargo.toml b/crates/meilisearch-types/Cargo.toml index 1039f7165..1d64a2524 100644 --- a/crates/meilisearch-types/Cargo.toml +++ b/crates/meilisearch-types/Cargo.toml @@ -44,7 +44,8 @@ utoipa = { version = "5.3.1", features = ["macros"] } uuid = { version = "1.11.0", features = ["serde", "v4"] } [dev-dependencies] -insta = "1.42.0" +# fixed version due to format breakages in v1.40 +insta = "=1.39.0" meili-snap = { path = "../meili-snap" } [features] diff --git a/crates/meilisearch/Cargo.toml b/crates/meilisearch/Cargo.toml index 9e3315e0d..f2bc2e381 100644 --- a/crates/meilisearch/Cargo.toml +++ b/crates/meilisearch/Cargo.toml @@ -111,7 +111,8 @@ utoipa-scalar = { version = "0.2.1", optional = true, features = ["actix-web"] } [dev-dependencies] actix-rt = "2.10.0" brotli = "6.0.0" -insta = "1.42.0" +# fixed version due to format breakages in v1.40 +insta = "=1.39.0" manifest-dir-macros = "0.1.18" maplit = "1.0.2" meili-snap = { path = "../meili-snap" } diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index f725f1b16..16a338ffb 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -104,7 +104,8 @@ utoipa = { version = "5.3.1", features = ["non_strict_integers", "preserve_order [dev-dependencies] mimalloc = { version = "0.1.43", default-features = false } -insta = "1.42.0" +# fixed version due to format breakages in v1.40 +insta = "=1.39.0" maplit = "1.0.2" md5 = "0.7.0" meili-snap = { path = "../meili-snap" } From 6f24b438e0d7d06292a6417d3e6f44e0b277b287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 14:12:14 +0100 Subject: [PATCH 03/13] Ignore benchmarks folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0d6750008..07453a58f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ /dumps /bench /_xtask_benchmark.ms +/benchmarks # Snapshots ## ... large From dd28a3fd5ad46f4fe8b14e6eea2b4c1d439a1f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 15:31:13 +0100 Subject: [PATCH 04/13] Bump the minimal version to 1.81 as we use std LazyLock --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 24473f6c8..17116ad8d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.79.0" +channel = "1.81.0" components = ["clippy"] From 091f989b72fe7a3e0adc0ebca885b8896812b426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 15:58:03 +0100 Subject: [PATCH 05/13] Upgrade incompatible dependencies --- Cargo.lock | 240 +++++++++++++++++++--------- crates/dump/Cargo.toml | 2 +- crates/file-store/Cargo.toml | 2 +- crates/index-scheduler/Cargo.toml | 2 +- crates/meilisearch-auth/Cargo.toml | 2 +- crates/meilisearch-types/Cargo.toml | 2 +- crates/meilisearch/Cargo.toml | 10 +- crates/milli/Cargo.toml | 12 +- crates/milli/src/error.rs | 2 +- crates/xtask/Cargo.toml | 4 +- 10 files changed, 187 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 023fabd90..79292a637 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -837,15 +837,15 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5b18de020c2729dbf7ac390325312644808b6ba9b7962f1f724e9185b1d53c7" +checksum = "855dfedff437d2681d68e1f34ae559d88b0dd84aa5a6b63f2c8e75ebdd875bbf" dependencies = [ "byteorder", "candle-kernels", "cudarc", "gemm", - "half 2.4.0", + "half 2.4.1", "memmap2", "num-traits", "num_cpus", @@ -854,27 +854,29 @@ dependencies = [ "rayon", "safetensors", "thiserror 1.0.69", + "ug", + "ug-cuda", "yoke", "zip 1.1.4", ] [[package]] name = "candle-kernels" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bc0a71be8b2f0950b63fd602a5e10a74a4f94a5fd63059ae455e96163389488" +checksum = "53343628fa470b7075c28c589b98735b4220b464e37ddbb8e117040e199f4787" dependencies = [ "bindgen_cuda", ] [[package]] name = "candle-nn" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b006b30f66a0d94fc9cef0ac4de6ce510565f35ae2c6c35ce5d4aacfb0fc8eeb" +checksum = "ddd3c6b2ee0dfd64af12ae5b07e4b7c517898981cdaeffcb10b71d7dd5c8f359" dependencies = [ "candle-core", - "half 2.4.0", + "half 2.4.1", "num-traits", "rayon", "safetensors", @@ -884,14 +886,14 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0d4eb6a0d9279d5829b06b2bf3caa117904eefd6dcf879d16e687c4a84034c" +checksum = "4270cc692c4a3df2051c2e8c3c4da3a189746af7ca3a547b99ecd335582b92e1" dependencies = [ "byteorder", "candle-core", "candle-nn", - "fancy-regex 0.13.0", + "fancy-regex", "num-traits", "rand", "rayon", @@ -912,23 +914,23 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" dependencies = [ "camino", "cargo-platform", "semver", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.9", ] [[package]] name = "cargo_toml" -version = "0.20.5" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88da5a13c620b4ca0078845707ea9c3faf11edbc3ffd8497d11d686211cd1ac0" +checksum = "5fbd1fe9db3ebf71b89060adaf7b0504c2d6a425cf061313099547e382c2e472" dependencies = [ "serde", "toml", @@ -1197,9 +1199,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -1352,11 +1354,11 @@ dependencies = [ [[package]] name = "cudarc" -version = "0.11.7" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee2a3fbbd981e1c7ea73cc2af136e754eb22d17436de37155227ee4dbe0cf4" +checksum = "8cd76de2aa3a7bdb9a65941ea5a3c688d941688f736a81b2fc5beb88747a7f25" dependencies = [ - "half 2.4.0", + "half 2.4.1", "libloading", ] @@ -1685,7 +1687,7 @@ dependencies = [ "serde_json", "tar", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "time", "tracing", "uuid", @@ -1852,16 +1854,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" -[[package]] -name = "fancy-regex" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" -dependencies = [ - "bit-set", - "regex", -] - [[package]] name = "fancy-regex" version = "0.13.0" @@ -1884,7 +1876,7 @@ name = "file-store" version = "1.12.0" dependencies = [ "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "tracing", "uuid", ] @@ -2156,7 +2148,7 @@ checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" dependencies = [ "bytemuck", "dyn-stack", - "half 2.4.0", + "half 2.4.1", "num-complex", "num-traits", "once_cell", @@ -2177,7 +2169,7 @@ dependencies = [ "dyn-stack", "gemm-common", "gemm-f32", - "half 2.4.0", + "half 2.4.1", "num-complex", "num-traits", "paste", @@ -2329,9 +2321,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "bytemuck", "cfg-if", @@ -2780,7 +2772,7 @@ dependencies = [ "serde_json", "synchronoise", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "time", "tracing", "ureq", @@ -2908,6 +2900,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -3012,9 +3013,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.164" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libgit2-sys" @@ -3030,9 +3031,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -3607,7 +3608,7 @@ dependencies = [ "indexmap", "insta", "is-terminal", - "itertools 0.13.0", + "itertools 0.14.0", "jsonwebtoken", "lazy_static", "manifest-dir-macros", @@ -3649,7 +3650,7 @@ dependencies = [ "temp-env", "tempfile", "termcolor", - "thiserror 1.0.69", + "thiserror 2.0.9", "time", "tokio", "toml", @@ -3681,7 +3682,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 1.0.69", + "thiserror 2.0.9", "time", "uuid", ] @@ -3713,7 +3714,7 @@ dependencies = [ "serde_json", "tar", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "time", "tokio", "utoipa", @@ -3792,7 +3793,7 @@ dependencies = [ "hf-hub", "indexmap", "insta", - "itertools 0.13.0", + "itertools 0.14.0", "json-depth-checker", "levenshtein_automata", "liquid", @@ -3819,7 +3820,7 @@ dependencies = [ "smallvec", "smartstring", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "thread_local", "tiktoken-rs", "time", @@ -3984,21 +3985,34 @@ dependencies = [ ] [[package]] -name = "num-bigint" +name = "num" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "bytemuck", "num-traits", @@ -4012,19 +4026,40 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -5066,15 +5101,15 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "segment" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bdca318192c89bb31bffa2ef8e9e9898bc80f15a78db2fdd41cd051f1b41d01" +checksum = "1dd0f21b6eb87a45a7cce06075a29ccdb42658a6eb84bf40c8fc179479630609" dependencies = [ "async-trait", "reqwest", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.9", "time", ] @@ -5504,15 +5539,14 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", "windows", ] @@ -5627,16 +5661,17 @@ dependencies = [ [[package]] name = "tiktoken-rs" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" +checksum = "44075987ee2486402f0808505dd65692163d243a337fc54363d49afac41087f6" dependencies = [ "anyhow", "base64 0.21.7", "bstr", - "fancy-regex 0.12.0", + "fancy-regex", "lazy_static", "parking_lot", + "regex", "rustc-hash 1.1.0", ] @@ -6009,6 +6044,33 @@ dependencies = [ "bumpalo", ] +[[package]] +name = "ug" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4eef2ebfc18c67a6dbcacd9d8a4d85e0568cc58c82515552382312c2730ea13" +dependencies = [ + "half 2.4.1", + "num", + "serde", + "serde_json", + "thiserror 1.0.69", +] + +[[package]] +name = "ug-cuda" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4dcab280ad0ef3957e153a82dcad608c954d02cf253b695322f502d1f8902e" +dependencies = [ + "cudarc", + "half 2.4.1", + "serde", + "serde_json", + "thiserror 1.0.69", + "ug", +] + [[package]] name = "unescaper" version = "0.1.5" @@ -6422,9 +6484,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ "windows-core", "windows-targets 0.52.6", @@ -6432,24 +6494,58 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ + "windows-implement", + "windows-interface", + "windows-result 0.1.2", "windows-targets 0.52.6", ] +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "windows-registry" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-strings", "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.2.0" @@ -6465,7 +6561,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] diff --git a/crates/dump/Cargo.toml b/crates/dump/Cargo.toml index b23b8fa4c..5c427916c 100644 --- a/crates/dump/Cargo.toml +++ b/crates/dump/Cargo.toml @@ -22,7 +22,7 @@ serde = { version = "1.0.217", features = ["derive"] } serde_json = { version = "1.0.135", features = ["preserve_order"] } tar = "0.4.43" tempfile = "3.15.0" -thiserror = "1.0.69" +thiserror = "2.0.9" time = { version = "0.3.37", features = ["serde-well-known", "formatting", "parsing", "macros"] } tracing = "0.1.41" uuid = { version = "1.11.0", features = ["serde", "v4"] } diff --git a/crates/file-store/Cargo.toml b/crates/file-store/Cargo.toml index 339c8a708..66ea65336 100644 --- a/crates/file-store/Cargo.toml +++ b/crates/file-store/Cargo.toml @@ -12,6 +12,6 @@ license.workspace = true [dependencies] tempfile = "3.15.0" -thiserror = "1.0.69" +thiserror = "2.0.9" tracing = "0.1.41" uuid = { version = "1.11.0", features = ["serde", "v4"] } diff --git a/crates/index-scheduler/Cargo.toml b/crates/index-scheduler/Cargo.toml index 443b367e5..69edace77 100644 --- a/crates/index-scheduler/Cargo.toml +++ b/crates/index-scheduler/Cargo.toml @@ -32,7 +32,7 @@ serde = { version = "1.0.217", features = ["derive"] } serde_json = { version = "1.0.135", features = ["preserve_order"] } synchronoise = "1.0.1" tempfile = "3.15.0" -thiserror = "1.0.69" +thiserror = "2.0.9" time = { version = "0.3.37", features = [ "serde-well-known", "formatting", diff --git a/crates/meilisearch-auth/Cargo.toml b/crates/meilisearch-auth/Cargo.toml index 67a2c9ca0..d31effd6e 100644 --- a/crates/meilisearch-auth/Cargo.toml +++ b/crates/meilisearch-auth/Cargo.toml @@ -21,6 +21,6 @@ roaring = { version = "0.10.10", features = ["serde"] } serde = { version = "1.0.217", features = ["derive"] } serde_json = { version = "1.0.135", features = ["preserve_order"] } sha2 = "0.10.8" -thiserror = "1.0.69" +thiserror = "2.0.9" time = { version = "0.3.37", features = ["serde-well-known", "formatting", "parsing", "macros"] } uuid = { version = "1.11.0", features = ["serde", "v4"] } diff --git a/crates/meilisearch-types/Cargo.toml b/crates/meilisearch-types/Cargo.toml index 1d64a2524..ce36c826b 100644 --- a/crates/meilisearch-types/Cargo.toml +++ b/crates/meilisearch-types/Cargo.toml @@ -32,7 +32,7 @@ serde-cs = "0.2.4" serde_json = "1.0.135" tar = "0.4.43" tempfile = "3.15.0" -thiserror = "1.0.69" +thiserror = "2.0.9" time = { version = "0.3.37", features = [ "serde-well-known", "formatting", diff --git a/crates/meilisearch/Cargo.toml b/crates/meilisearch/Cargo.toml index f2bc2e381..1d458af34 100644 --- a/crates/meilisearch/Cargo.toml +++ b/crates/meilisearch/Cargo.toml @@ -49,7 +49,7 @@ futures-util = "0.3.31" index-scheduler = { path = "../index-scheduler" } indexmap = { version = "2.7.0", features = ["serde"] } is-terminal = "0.4.13" -itertools = "0.13.0" +itertools = "0.14.0" jsonwebtoken = "9.3.0" lazy_static = "1.5.0" meilisearch-auth = { path = "../meilisearch-auth" } @@ -75,17 +75,17 @@ reqwest = { version = "0.12.12", features = [ rustls = { version = "0.23.20", features = ["ring"], default-features = false } rustls-pki-types = { version = "1.10.1", features = ["alloc"] } rustls-pemfile = "2.2.0" -segment = { version = "0.2.4" } +segment = { version = "0.2.5" } serde = { version = "1.0.217", features = ["derive"] } serde_json = { version = "1.0.135", features = ["preserve_order"] } sha2 = "0.10.8" siphasher = "1.0.1" slice-group-by = "0.3.1" static-files = { version = "0.2.4", optional = true } -sysinfo = "0.30.13" +sysinfo = "0.33.1" tar = "0.4.43" tempfile = "3.15.0" -thiserror = "1.0.69" +thiserror = "2.0.9" time = { version = "0.3.37", features = [ "serde-well-known", "formatting", @@ -123,7 +123,7 @@ yaup = "0.3.1" [build-dependencies] anyhow = { version = "1.0.95", optional = true } -cargo_toml = { version = "0.20.5", optional = true } +cargo_toml = { version = "0.21.0", optional = true } hex = { version = "0.4.3", optional = true } reqwest = { version = "0.12.12", features = [ "blocking", diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index 16a338ffb..d22829045 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -51,7 +51,7 @@ smallstr = { version = "0.3.0", features = ["serde"] } smallvec = "1.13.2" smartstring = "1.0.1" tempfile = "3.15.0" -thiserror = "1.0.69" +thiserror = "2.0.9" time = { version = "0.3.37", features = [ "serde-well-known", "formatting", @@ -63,19 +63,19 @@ uuid = { version = "1.11.0", features = ["v4"] } filter-parser = { path = "../filter-parser" } # documents words self-join -itertools = "0.13.0" +itertools = "0.14.0" csv = "1.3.1" -candle-core = { version = "0.6.0" } -candle-transformers = { version = "0.6.0" } -candle-nn = { version = "0.6.0" } +candle-core = { version = "0.8.2" } +candle-transformers = { version = "0.8.2" } +candle-nn = { version = "0.8.2" } tokenizers = { git = "https://github.com/huggingface/tokenizers.git", tag = "v0.15.2", version = "0.15.2", default-features = false, features = [ "onig", ] } hf-hub = { git = "https://github.com/dureuill/hf-hub.git", branch = "rust_tls", default-features = false, features = [ "online", ] } -tiktoken-rs = "0.5.9" +tiktoken-rs = "0.6.0" liquid = "0.26.9" rhai = { git = "https://github.com/rhaiscript/rhai", rev = "ef3df63121d27aacd838f366f2b83fd65f20a1e4", features = [ "serde", diff --git a/crates/milli/src/error.rs b/crates/milli/src/error.rs index f5f784ee0..c1b51f192 100644 --- a/crates/milli/src/error.rs +++ b/crates/milli/src/error.rs @@ -134,7 +134,7 @@ and can not be more than 511 bytes.", .document_id.to_string() InvalidVectorsEmbedderConf { document_id: String, error: String }, #[error("{0}")] InvalidFilter(String), - #[error("Invalid type for filter subexpression: expected: {}, found: {1}.", .0.join(", "))] + #[error("Invalid type for filter subexpression: expected: {}, found: {}.", .0.join(", "), .1)] InvalidFilterExpression(&'static [&'static str], Value), #[error("Attribute `{}` is not sortable. {}", .field, diff --git a/crates/xtask/Cargo.toml b/crates/xtask/Cargo.toml index da9a40c8e..496e1d362 100644 --- a/crates/xtask/Cargo.toml +++ b/crates/xtask/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true [dependencies] anyhow = "1.0.95" build-info = { version = "1.7.0", path = "../build-info" } -cargo_metadata = "0.18.1" +cargo_metadata = "0.19.1" clap = { version = "4.5.24", features = ["derive"] } futures-core = "0.3.31" futures-util = "0.3.31" @@ -25,7 +25,7 @@ reqwest = { version = "0.12.12", features = [ serde = { version = "1.0.217", features = ["derive"] } serde_json = "1.0.135" sha2 = "0.10.8" -sysinfo = "0.30.13" +sysinfo = "0.33.1" time = { version = "0.3.37", features = [ "serde", "serde-human-readable", From 3e3695445f403afbb047523e97fd2f091ee6d6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 15:58:32 +0100 Subject: [PATCH 06/13] Fix after upgrading thiserror --- crates/meilisearch/src/error.rs | 6 +++--- crates/milli/src/vector/error.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/meilisearch/src/error.rs b/crates/meilisearch/src/error.rs index 41d62507a..b13eb8d7c 100644 --- a/crates/meilisearch/src/error.rs +++ b/crates/meilisearch/src/error.rs @@ -19,15 +19,15 @@ pub enum MeilisearchHttpError { #[error("The Content-Type `{0}` does not support the use of a csv delimiter. The csv delimiter can only be used with the Content-Type `text/csv`.")] CsvDelimiterWithWrongContentType(String), #[error( - "The Content-Type `{0}` is invalid. Accepted values for the Content-Type header are: {}", - .1.iter().map(|s| format!("`{}`", s)).collect::>().join(", ") + "The Content-Type `{}` is invalid. Accepted values for the Content-Type header are: {}", + .0, .1.iter().map(|s| format!("`{}`", s)).collect::>().join(", ") )] InvalidContentType(String, Vec), #[error("Document `{0}` not found.")] DocumentNotFound(String), #[error("Sending an empty filter is forbidden.")] EmptyFilter, - #[error("Invalid syntax for the filter parameter: `expected {}, found: {1}`.", .0.join(", "))] + #[error("Invalid syntax for the filter parameter: `expected {}, found: {}`.", .0.join(", "), .1)] InvalidExpression(&'static [&'static str], Value), #[error("Using `federationOptions` is not allowed in a non-federated search.\n - Hint: remove `federationOptions` from query #{0} or add `federation` to the request.")] FederationOptionsInNonFederatedRequest(usize), diff --git a/crates/milli/src/vector/error.rs b/crates/milli/src/vector/error.rs index 97bbe5d68..5edabed0d 100644 --- a/crates/milli/src/vector/error.rs +++ b/crates/milli/src/vector/error.rs @@ -86,9 +86,9 @@ pub enum EmbedErrorKind { }, option_info(.0.as_deref(), "server replied with "))] RestBadRequest(Option, ConfigurationSource), - #[error("received internal error HTTP {0} from embedding server{}", option_info(.1.as_deref(), "server replied with "))] + #[error("received internal error HTTP {} from embedding server{}", .0, option_info(.1.as_deref(), "server replied with "))] RestInternalServerError(u16, Option), - #[error("received unexpected HTTP {0} from embedding server{}", option_info(.1.as_deref(), "server replied with "))] + #[error("received unexpected HTTP {} from embedding server{}", .0, option_info(.1.as_deref(), "server replied with "))] RestOtherStatusCode(u16, Option), #[error("could not reach embedding server:\n - {0}")] RestNetwork(ureq::Transport), From 5e8144b0e1aaef69abc27ab89cc4ba33bdcb33c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 15:59:03 +0100 Subject: [PATCH 07/13] Remove fuzzing feature --- crates/milli/src/lib.rs | 1 - crates/milli/src/update/facet/incremental.rs | 205 ------------------- crates/milli/src/update/facet/mod.rs | 49 ----- 3 files changed, 255 deletions(-) diff --git a/crates/milli/src/lib.rs b/crates/milli/src/lib.rs index db44f745f..ea88d2b78 100644 --- a/crates/milli/src/lib.rs +++ b/crates/milli/src/lib.rs @@ -1,4 +1,3 @@ -#![cfg_attr(all(test, fuzzing), feature(no_coverage))] #![allow(clippy::type_complexity)] #[cfg(not(windows))] diff --git a/crates/milli/src/update/facet/incremental.rs b/crates/milli/src/update/facet/incremental.rs index a1fa07fe3..41d1f62ab 100644 --- a/crates/milli/src/update/facet/incremental.rs +++ b/crates/milli/src/update/facet/incremental.rs @@ -1059,208 +1059,3 @@ mod tests { milli_snap!(format!("{index}"), "after_delete"); } } - -// fuzz tests -#[cfg(all(test, fuzzing))] -/** -Fuzz test for the incremental indxer. - -The fuzz test uses fuzzcheck, a coverage-guided fuzzer. -See https://github.com/loiclec/fuzzcheck-rs and https://fuzzcheck.neocities.org -for more information. - -It is only run when using the `cargo fuzzcheck` command line tool, which can be installed with: -```sh -cargo install cargo-fuzzcheck -``` -To start the fuzz test, run (from the base folder or from milli/): -```sh -cargo fuzzcheck update::facet::incremental::fuzz::fuzz -``` -and wait a couple minutes to make sure the code was thoroughly tested, then -hit `Ctrl-C` to stop the fuzzer. The corpus generated by the fuzzer is located in milli/fuzz. - -To work on this module with rust-analyzer working properly, add the following to your .cargo/config.toml file: -```toml -[build] -rustflags = ["--cfg", "fuzzing"] -``` - -The fuzz test generates sequences of additions and deletions to the facet database and -ensures that: -1. its structure is still internally valid -2. its content is the same as a trivially correct implementation of the same database -*/ -mod fuzz { - use std::collections::{BTreeMap, HashMap}; - use std::iter::FromIterator; - use std::rc::Rc; - - use fuzzcheck::mutators::integer::U8Mutator; - use fuzzcheck::mutators::integer_within_range::{U16WithinRangeMutator, U8WithinRangeMutator}; - use fuzzcheck::mutators::vector::VecMutator; - use fuzzcheck::DefaultMutator; - use roaring::RoaringBitmap; - use tempfile::TempDir; - - use super::*; - use crate::update::facet::test_helpers::FacetIndex; - #[derive(Default)] - pub struct TrivialDatabase { - pub elements: BTreeMap>, - } - impl TrivialDatabase - where - T: Ord + Clone + Eq + std::fmt::Debug, - { - #[no_coverage] - pub fn insert(&mut self, field_id: u16, new_key: &T, new_values: &RoaringBitmap) { - if new_values.is_empty() { - return; - } - let values_field_id = self.elements.entry(field_id).or_default(); - let values = values_field_id.entry(new_key.clone()).or_default(); - *values |= new_values; - } - #[no_coverage] - pub fn delete(&mut self, field_id: u16, key: &T, values_to_remove: &RoaringBitmap) { - if let Some(values_field_id) = self.elements.get_mut(&field_id) { - if let Some(values) = values_field_id.get_mut(&key) { - *values -= values_to_remove; - if values.is_empty() { - values_field_id.remove(&key); - } - } - if values_field_id.is_empty() { - self.elements.remove(&field_id); - } - } - } - } - #[derive(Clone, DefaultMutator, serde::Serialize, serde::Deserialize)] - struct Operation { - #[field_mutator(VecMutator = { VecMutator::new(u8::default_mutator(), 0 ..= 5) })] - key: Vec, - #[field_mutator(U8WithinRangeMutator = { U8WithinRangeMutator::new(..32) })] - group_size: u8, - #[field_mutator(U8WithinRangeMutator = { U8WithinRangeMutator::new(..32) })] - max_group_size: u8, - #[field_mutator(U8WithinRangeMutator = { U8WithinRangeMutator::new(..32) })] - min_level_size: u8, - #[field_mutator(U16WithinRangeMutator = { U16WithinRangeMutator::new(..=3) })] - field_id: u16, - kind: OperationKind, - } - #[derive(Clone, DefaultMutator, serde::Serialize, serde::Deserialize)] - enum OperationKind { - Insert( - #[field_mutator(VecMutator = { VecMutator::new(U8Mutator::default(), 0 ..= 10) })] - Vec, - ), - Delete( - #[field_mutator(VecMutator = { VecMutator::new(U8Mutator::default(), 0 ..= 10) })] - Vec, - ), - } - - #[no_coverage] - fn compare_with_trivial_database(tempdir: Rc, operations: &[Operation]) { - let index = FacetIndex::::open_from_tempdir(tempdir, 4, 8, 5); // dummy params, they'll be overwritten - let mut txn = index.env.write_txn().unwrap(); - - let mut trivial_db = TrivialDatabase::>::default(); - let mut value_to_keys = HashMap::>>::new(); - for Operation { key, group_size, max_group_size, min_level_size, field_id, kind } in - operations - { - index.set_group_size(*group_size); - index.set_max_group_size(*max_group_size); - index.set_min_level_size(*min_level_size); - match kind { - OperationKind::Insert(values) => { - let mut bitmap = RoaringBitmap::new(); - for value in values { - bitmap.insert(*value as u32); - value_to_keys.entry(*value).or_default().push(key.clone()); - } - index.insert(&mut txn, *field_id, &key.as_slice(), &bitmap); - trivial_db.insert(*field_id, &key, &bitmap); - } - OperationKind::Delete(values) => { - let values = RoaringBitmap::from_iter(values.iter().copied().map(|x| x as u32)); - let mut values_per_key = HashMap::new(); - - for value in values { - if let Some(keys) = value_to_keys.get(&(value as u8)) { - for key in keys { - let values: &mut RoaringBitmap = - values_per_key.entry(key).or_default(); - values.insert(value); - } - } - } - for (key, values) in values_per_key { - index.delete(&mut txn, *field_id, &key.as_slice(), &values); - trivial_db.delete(*field_id, &key, &values); - } - } - } - } - - for (field_id, values_field_id) in trivial_db.elements.iter() { - let level0iter = index - .content - .as_polymorph() - .prefix_iter::<_, Bytes, FacetGroupValueCodec>(&mut txn, &field_id.to_be_bytes()) - .unwrap(); - - for ((key, values), group) in values_field_id.iter().zip(level0iter) { - let (group_key, group_values) = group.unwrap(); - let group_key = - FacetGroupKeyCodec::::bytes_decode(group_key).unwrap(); - assert_eq!(key, &group_key.left_bound); - assert_eq!(values, &group_values.bitmap); - } - } - - for (field_id, values_field_id) in trivial_db.elements.iter() { - let level0iter = index - .content - .as_polymorph() - .prefix_iter::<_, Bytes, FacetGroupValueCodec>(&txn, &field_id.to_be_bytes()) - .unwrap(); - - for ((key, values), group) in values_field_id.iter().zip(level0iter) { - let (group_key, group_values) = group.unwrap(); - let group_key = - FacetGroupKeyCodec::::bytes_decode(group_key).unwrap(); - assert_eq!(key, &group_key.left_bound); - assert_eq!(values, &group_values.bitmap); - } - index.verify_structure_validity(&txn, *field_id); - } - txn.abort().unwrap(); - } - - #[test] - #[no_coverage] - fn fuzz() { - let tempdir = Rc::new(TempDir::new().unwrap()); - let tempdir_cloned = tempdir.clone(); - let result = fuzzcheck::fuzz_test(move |operations: &[Operation]| { - compare_with_trivial_database(tempdir_cloned.clone(), operations) - }) - .default_mutator() - .serde_serializer() - .default_sensor_and_pool_with_custom_filter(|file, function| { - file == std::path::Path::new("milli/src/update/facet/incremental.rs") - && !function.contains("serde") - && !function.contains("tests::") - && !function.contains("fuzz::") - && !function.contains("display_bitmap") - }) - .arguments_from_cargo_fuzzcheck() - .launch(); - assert!(!result.found_test_failure); - } -} diff --git a/crates/milli/src/update/facet/mod.rs b/crates/milli/src/update/facet/mod.rs index 911296577..c78610e23 100644 --- a/crates/milli/src/update/facet/mod.rs +++ b/crates/milli/src/update/facet/mod.rs @@ -346,35 +346,6 @@ pub(crate) mod test_helpers { for<'a> BoundCodec: BytesEncode<'a> + BytesDecode<'a, DItem = >::EItem>, { - #[cfg(all(test, fuzzing))] - pub fn open_from_tempdir( - tempdir: Rc, - group_size: u8, - max_group_size: u8, - min_level_size: u8, - ) -> FacetIndex { - let group_size = std::cmp::min(16, std::cmp::max(group_size, 2)); // 2 <= x <= 16 - let max_group_size = std::cmp::min(16, std::cmp::max(group_size * 2, max_group_size)); // 2*group_size <= x <= 16 - let min_level_size = std::cmp::min(17, std::cmp::max(1, min_level_size)); // 1 <= x <= 17 - - let mut options = heed::EnvOpenOptions::new(); - let options = options.map_size(4096 * 4 * 10 * 1000); - unsafe { - options.flag(heed::flags::Flags::MdbAlwaysFreePages); - } - let env = options.open(tempdir.path()).unwrap(); - let content = env.open_database(None).unwrap().unwrap(); - - FacetIndex { - content, - group_size: Cell::new(group_size), - max_group_size: Cell::new(max_group_size), - min_level_size: Cell::new(min_level_size), - _tempdir: tempdir, - env, - _phantom: PhantomData, - } - } pub fn new( group_size: u8, max_group_size: u8, @@ -402,26 +373,6 @@ pub(crate) mod test_helpers { } } - #[cfg(all(test, fuzzing))] - pub fn set_group_size(&self, group_size: u8) { - // 2 <= x <= 64 - self.group_size.set(std::cmp::min(64, std::cmp::max(group_size, 2))); - } - #[cfg(all(test, fuzzing))] - pub fn set_max_group_size(&self, max_group_size: u8) { - // 2*group_size <= x <= 128 - let max_group_size = std::cmp::max(4, std::cmp::min(128, max_group_size)); - self.max_group_size.set(max_group_size); - if self.group_size.get() < max_group_size / 2 { - self.group_size.set(max_group_size / 2); - } - } - #[cfg(all(test, fuzzing))] - pub fn set_min_level_size(&self, min_level_size: u8) { - // 1 <= x <= inf - self.min_level_size.set(std::cmp::max(1, min_level_size)); - } - pub fn insert<'a>( &self, wtxn: &'a mut RwTxn<'_>, From d4529d8c8392b45210b391a069389c2bdb9e1130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 15:59:30 +0100 Subject: [PATCH 08/13] Fix after upgrading sysinfo --- crates/meilisearch/src/option.rs | 4 ++-- crates/xtask/src/bench/env_info.rs | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/crates/meilisearch/src/option.rs b/crates/meilisearch/src/option.rs index 33a8a2f71..4405031ae 100644 --- a/crates/meilisearch/src/option.rs +++ b/crates/meilisearch/src/option.rs @@ -760,8 +760,8 @@ impl MaxMemory { /// Returns the total amount of bytes available or `None` if this system isn't supported. fn total_memory_bytes() -> Option { 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); + let mem_kind = RefreshKind::nothing().with_memory(MemoryRefreshKind::nothing().with_ram()); + let mut system = System::new_with_specifics(mem_kind); system.refresh_memory(); Some(system.total_memory()) } else { diff --git a/crates/xtask/src/bench/env_info.rs b/crates/xtask/src/bench/env_info.rs index 08dacf915..877e7c2ff 100644 --- a/crates/xtask/src/bench/env_info.rs +++ b/crates/xtask/src/bench/env_info.rs @@ -27,8 +27,7 @@ impl Environment { let unknown_string = String::from("Unknown"); let mut system = System::new(); - system.refresh_cpu(); - system.refresh_cpu_frequency(); + system.refresh_cpu_all(); system.refresh_memory(); let (cpu, frequency) = match system.cpus().first() { @@ -50,9 +49,7 @@ impl Environment { if let Some(os) = System::os_version() { software.push(VersionInfo { name: os, version: String::from("kernel-release") }); } - if let Some(arch) = System::cpu_arch() { - software.push(VersionInfo { name: arch, version: String::from("arch") }); - } + software.push(VersionInfo { name: System::cpu_arch(), version: String::from("arch") }); Self { hostname: System::host_name(), From 68333424c6cd11de5ee1b0b7952d8ab2f11f1440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 15:59:43 +0100 Subject: [PATCH 09/13] Remove a useless script test --- .../milli/src/update/index_documents/mod.rs | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/crates/milli/src/update/index_documents/mod.rs b/crates/milli/src/update/index_documents/mod.rs index d416c1a2b..f2c5fe2b9 100644 --- a/crates/milli/src/update/index_documents/mod.rs +++ b/crates/milli/src/update/index_documents/mod.rs @@ -2093,33 +2093,6 @@ mod tests { index.add_documents(doc1).unwrap(); } - #[cfg(feature = "default")] - #[test] - fn store_detected_script_and_language_per_document_during_indexing() { - use charabia::{Language, Script}; - let index = TempIndex::new(); - index - .add_documents(documents!([ - { "id": 1, "title": "The quick (\"brown\") fox can't jump 32.3 feet, right? Brr, it's 29.3°F!" }, - { "id": 2, "title": "人人生而自由﹐在尊嚴和權利上一律平等。他們賦有理性和良心﹐並應以兄弟關係的精神互相對待。" }, - { "id": 3, "title": "הַשּׁוּעָל הַמָּהִיר (״הַחוּם״) לֹא יָכוֹל לִקְפֹּץ 9.94 מֶטְרִים, נָכוֹן? ברר, 1.5°C- בַּחוּץ!" }, - { "id": 4, "title": "関西国際空港限定トートバッグ すもももももももものうち" }, - { "id": 5, "title": "ภาษาไทยง่ายนิดเดียว" }, - { "id": 6, "title": "The quick 在尊嚴和權利上一律平等。" }, - ])) - .unwrap(); - - let rtxn = index.read_txn().unwrap(); - let key_jpn = (Script::Cj, Language::Jpn); - let key_cmn = (Script::Cj, Language::Cmn); - let cj_jpn_docs = index.script_language_documents_ids(&rtxn, &key_jpn).unwrap().unwrap(); - let cj_cmn_docs = index.script_language_documents_ids(&rtxn, &key_cmn).unwrap().unwrap(); - let expected_cj_jpn_docids = [3].iter().collect(); - assert_eq!(cj_jpn_docs, expected_cj_jpn_docids); - let expected_cj_cmn_docids = [1, 5].iter().collect(); - assert_eq!(cj_cmn_docs, expected_cj_cmn_docids); - } - #[test] fn add_and_delete_documents_in_single_transform() { let mut index = TempIndex::new(); From 0ee4671a9154e51eb2fd15c2aaf8b4ef048754b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 15:59:56 +0100 Subject: [PATCH 10/13] Fix after upgrading candle --- crates/milli/src/vector/hf.rs | 12 ++++++++---- crates/milli/src/vector/openai.rs | 12 +++++++++++- crates/milli/src/vector/rest.rs | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/crates/milli/src/vector/hf.rs b/crates/milli/src/vector/hf.rs index 3fe28e53a..447a88f5d 100644 --- a/crates/milli/src/vector/hf.rs +++ b/crates/milli/src/vector/hf.rs @@ -163,8 +163,10 @@ impl Embedder { let token_ids = Tensor::stack(&token_ids, 0).map_err(EmbedError::tensor_shape)?; let token_type_ids = token_ids.zeros_like().map_err(EmbedError::tensor_shape)?; - let embeddings = - self.model.forward(&token_ids, &token_type_ids).map_err(EmbedError::model_forward)?; + let embeddings = self + .model + .forward(&token_ids, &token_type_ids, None) + .map_err(EmbedError::model_forward)?; // Apply some avg-pooling by taking the mean embedding value for all tokens (including padding) let (_n_sentence, n_tokens, _hidden_size) = @@ -185,8 +187,10 @@ impl Embedder { Tensor::new(token_ids, &self.model.device).map_err(EmbedError::tensor_shape)?; let token_ids = Tensor::stack(&[token_ids], 0).map_err(EmbedError::tensor_shape)?; let token_type_ids = token_ids.zeros_like().map_err(EmbedError::tensor_shape)?; - let embeddings = - self.model.forward(&token_ids, &token_type_ids).map_err(EmbedError::model_forward)?; + let embeddings = self + .model + .forward(&token_ids, &token_type_ids, None) + .map_err(EmbedError::model_forward)?; // Apply some avg-pooling by taking the mean embedding value for all tokens (including padding) let (_n_sentence, n_tokens, _hidden_size) = diff --git a/crates/milli/src/vector/openai.rs b/crates/milli/src/vector/openai.rs index 7262bfef8..938c04fe3 100644 --- a/crates/milli/src/vector/openai.rs +++ b/crates/milli/src/vector/openai.rs @@ -1,3 +1,4 @@ +use std::fmt; use std::time::Instant; use ordered_float::OrderedFloat; @@ -168,7 +169,6 @@ fn infer_api_key() -> String { .unwrap_or_default() } -#[derive(Debug)] pub struct Embedder { tokenizer: tiktoken_rs::CoreBPE, rest_embedder: RestEmbedder, @@ -302,3 +302,13 @@ impl Embedder { self.options.distribution() } } + +impl fmt::Debug for Embedder { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("Embedder") + .field("tokenizer", &"CoreBPE") + .field("rest_embedder", &self.rest_embedder) + .field("options", &self.options) + .finish() + } +} diff --git a/crates/milli/src/vector/rest.rs b/crates/milli/src/vector/rest.rs index 98be311d4..eb05bac64 100644 --- a/crates/milli/src/vector/rest.rs +++ b/crates/milli/src/vector/rest.rs @@ -175,7 +175,7 @@ impl Embedder { pub fn embed_tokens( &self, - tokens: &[usize], + tokens: &[u32], deadline: Option, ) -> Result { let mut embeddings = embed(&self.data, tokens, 1, Some(self.dimensions), deadline)?; From 71e5605daa0b4c5a43efcecefa6467d8c5d8bbfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 16:16:21 +0100 Subject: [PATCH 11/13] Make clippy happy --- crates/index-scheduler/src/lib.rs | 10 +++--- crates/index-scheduler/src/queue/batches.rs | 2 +- .../src/scheduler/process_dump_creation.rs | 2 +- .../src/analytics/segment_analytics.rs | 9 ++---- crates/meilisearch/src/lib.rs | 4 +-- crates/meilisearch/src/routes/mod.rs | 2 +- crates/meilisearch/tests/index/get_index.rs | 4 +-- .../src/search/facet/facet_range_search.rs | 8 ++--- crates/milli/src/search/new/distinct.rs | 6 ++-- .../src/search/new/matches/matching_words.rs | 2 +- crates/milli/src/search/new/query_graph.rs | 4 +-- .../new/ranking_rule_graph/cheapest_paths.rs | 3 +- .../src/search/new/ranking_rule_graph/mod.rs | 2 +- .../milli/src/search/new/tests/exactness.rs | 2 +- .../milli/src/search/new/tests/proximity.rs | 9 +++--- crates/milli/src/search/new/tests/typo.rs | 2 +- .../milli/src/search/new/tests/words_tms.rs | 4 +-- crates/milli/src/update/facet/incremental.rs | 31 ++++++++++--------- crates/milli/src/update/new/thread_local.rs | 8 ++--- 19 files changed, 55 insertions(+), 59 deletions(-) diff --git a/crates/index-scheduler/src/lib.rs b/crates/index-scheduler/src/lib.rs index d5b12e99f..d3fb5b737 100644 --- a/crates/index-scheduler/src/lib.rs +++ b/crates/index-scheduler/src/lib.rs @@ -1,7 +1,7 @@ /*! This crate defines the index scheduler, which is responsible for: 1. Keeping references to meilisearch's indexes and mapping them to their -user-defined names. + user-defined names. 2. Scheduling tasks given by the user and executing them, in batch if possible. When an `IndexScheduler` is created, a new thread containing a reference to the @@ -513,7 +513,7 @@ impl IndexScheduler { /// the user. /// /// 1. IndexSwap tasks are not publicly associated with any index, but they are associated - /// with many indexes internally. + /// with many indexes internally. /// 2. The user may not have the rights to access the tasks (internally) associated with all indexes. pub fn get_tasks_from_authorized_indexes( &self, @@ -532,7 +532,7 @@ impl IndexScheduler { /// the user. /// /// 1. IndexSwap tasks are not publicly associated with any index, but they are associated - /// with many indexes internally. + /// with many indexes internally. /// 2. The user may not have the rights to access the tasks (internally) associated with all indexes. pub fn get_task_ids_from_authorized_indexes( &self, @@ -551,7 +551,7 @@ impl IndexScheduler { /// the user. /// /// 1. IndexSwap tasks are not publicly associated with any index, but they are associated - /// with many indexes internally. + /// with many indexes internally. /// 2. The user may not have the rights to access the tasks (internally) associated with all indexes. pub fn get_batches_from_authorized_indexes( &self, @@ -570,7 +570,7 @@ impl IndexScheduler { /// the user. /// /// 1. IndexSwap tasks are not publicly associated with any index, but they are associated - /// with many indexes internally. + /// with many indexes internally. /// 2. The user may not have the rights to access the tasks (internally) associated with all indexes. pub fn get_batch_ids_from_authorized_indexes( &self, diff --git a/crates/index-scheduler/src/queue/batches.rs b/crates/index-scheduler/src/queue/batches.rs index 6abfb42a0..a31653387 100644 --- a/crates/index-scheduler/src/queue/batches.rs +++ b/crates/index-scheduler/src/queue/batches.rs @@ -444,7 +444,7 @@ impl Queue { /// the user. /// /// 1. IndexSwap tasks are not publicly associated with any index, but they are associated - /// with many indexes internally. + /// with many indexes internally. /// 2. The user may not have the rights to access the tasks (internally) associated with all indexes. pub(crate) fn get_batch_ids_from_authorized_indexes( &self, diff --git a/crates/index-scheduler/src/scheduler/process_dump_creation.rs b/crates/index-scheduler/src/scheduler/process_dump_creation.rs index 3770303da..3fd5c795b 100644 --- a/crates/index-scheduler/src/scheduler/process_dump_creation.rs +++ b/crates/index-scheduler/src/scheduler/process_dump_creation.rs @@ -106,7 +106,7 @@ impl IndexScheduler { progress.update_progress(DumpCreationProgress::DumpTheIndexes); let nb_indexes = self.index_mapper.index_mapping.len(&rtxn)? as u32; let mut count = 0; - self.index_mapper.try_for_each_index(&rtxn, |uid, index| -> Result<()> { + let () = self.index_mapper.try_for_each_index(&rtxn, |uid, index| -> Result<()> { progress.update_progress(VariableNameStep::new(uid.to_string(), count, nb_indexes)); count += 1; diff --git a/crates/meilisearch/src/analytics/segment_analytics.rs b/crates/meilisearch/src/analytics/segment_analytics.rs index 7dc746b14..ecb887374 100644 --- a/crates/meilisearch/src/analytics/segment_analytics.rs +++ b/crates/meilisearch/src/analytics/segment_analytics.rs @@ -426,13 +426,8 @@ impl Segment { &AuthFilter::default(), ) { // Replace the version number with the prototype name if any. - let version = if let Some(prototype) = build_info::DescribeResult::from_build() - .and_then(|describe| describe.as_prototype()) - { - prototype - } else { - env!("CARGO_PKG_VERSION") - }; + let version = build_info::DescribeResult::from_build() + .and_then(|describe| describe.as_prototype()).unwrap_or(env!("CARGO_PKG_VERSION")); let _ = self .batcher diff --git a/crates/meilisearch/src/lib.rs b/crates/meilisearch/src/lib.rs index 3ea8c06c6..8359c5255 100644 --- a/crates/meilisearch/src/lib.rs +++ b/crates/meilisearch/src/lib.rs @@ -188,13 +188,13 @@ impl tracing_actix_web::RootSpanBuilder for AwebTracingLogger { if let Some(error) = response.response().error() { // use the status code already constructed for the outgoing HTTP response - span.record("error", &tracing::field::display(error.as_response_error())); + span.record("error", tracing::field::display(error.as_response_error())); } } Err(error) => { let code: i32 = error.error_response().status().as_u16().into(); span.record("status_code", code); - span.record("error", &tracing::field::display(error.as_response_error())); + span.record("error", tracing::field::display(error.as_response_error())); } }; } diff --git a/crates/meilisearch/src/routes/mod.rs b/crates/meilisearch/src/routes/mod.rs index 131986712..e37532359 100644 --- a/crates/meilisearch/src/routes/mod.rs +++ b/crates/meilisearch/src/routes/mod.rs @@ -545,5 +545,5 @@ pub async fn get_health( index_scheduler.health().unwrap(); auth_controller.health().unwrap(); - Ok(HttpResponse::Ok().json(&HealthResponse::default())) + Ok(HttpResponse::Ok().json(HealthResponse::default())) } diff --git a/crates/meilisearch/tests/index/get_index.rs b/crates/meilisearch/tests/index/get_index.rs index ce08251be..5e3098751 100644 --- a/crates/meilisearch/tests/index/get_index.rs +++ b/crates/meilisearch/tests/index/get_index.rs @@ -73,8 +73,8 @@ async fn get_and_paginate_indexes() { let server = Server::new().await; const NB_INDEXES: usize = 50; for i in 0..NB_INDEXES { - server.index(&format!("test_{i:02}")).create(None).await; - server.index(&format!("test_{i:02}")).wait_task(i as u64).await; + server.index(format!("test_{i:02}")).create(None).await; + server.index(format!("test_{i:02}")).wait_task(i as u64).await; } // basic diff --git a/crates/milli/src/search/facet/facet_range_search.rs b/crates/milli/src/search/facet/facet_range_search.rs index 0f8f58771..47e4defec 100644 --- a/crates/milli/src/search/facet/facet_range_search.rs +++ b/crates/milli/src/search/facet/facet_range_search.rs @@ -132,12 +132,12 @@ impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> { /// /// 1. So long as the element's range is less than the left bound, we do nothing and keep iterating /// 2. If the element's range is fully contained by the bounds, then all of its docids are added to - /// the roaring bitmap. + /// the roaring bitmap. /// 3. If the element's range merely intersects the bounds, then we call the algorithm recursively - /// on the children of the element from the level below. + /// on the children of the element from the level below. /// 4. If the element's range is greater than the right bound, we do nothing and stop iterating. - /// Note that the right bound is found through either the `left_bound` of the *next* element, - /// or from the `rightmost_bound` argument + /// Note that the right bound is found through either the `left_bound` of the *next* element, + /// or from the `rightmost_bound` argument /// /// ## Arguments /// - `level`: the level being visited diff --git a/crates/milli/src/search/new/distinct.rs b/crates/milli/src/search/new/distinct.rs index d2ace6ffb..17859b6f8 100644 --- a/crates/milli/src/search/new/distinct.rs +++ b/crates/milli/src/search/new/distinct.rs @@ -18,10 +18,10 @@ pub struct DistinctOutput { /// Return a [`DistinctOutput`] containing: /// - `remaining`: a set of docids built such that exactly one element from `candidates` -/// is kept for each distinct value inside the given field. If the field does not exist, it -/// is considered unique. +/// is kept for each distinct value inside the given field. If the field does not exist, it +/// is considered unique. /// - `excluded`: the set of document ids that contain a value for the given field that occurs -/// in the given candidates. +/// in the given candidates. pub fn apply_distinct_rule( ctx: &mut SearchContext<'_>, field_id: u16, diff --git a/crates/milli/src/search/new/matches/matching_words.rs b/crates/milli/src/search/new/matches/matching_words.rs index 1f30a17ad..64235298b 100644 --- a/crates/milli/src/search/new/matches/matching_words.rs +++ b/crates/milli/src/search/new/matches/matching_words.rs @@ -149,7 +149,7 @@ pub type WordId = u16; /// A given token can partially match a query word for several reasons: /// - split words /// - multi-word synonyms -/// In these cases we need to match consecutively several tokens to consider that the match is full. +/// In these cases we need to match consecutively several tokens to consider that the match is full. #[derive(Debug, PartialEq)] pub enum MatchType<'a> { Full { char_count: usize, byte_len: usize, ids: &'a RangeInclusive }, diff --git a/crates/milli/src/search/new/query_graph.rs b/crates/milli/src/search/new/query_graph.rs index 9ab5d9dad..24cce039b 100644 --- a/crates/milli/src/search/new/query_graph.rs +++ b/crates/milli/src/search/new/query_graph.rs @@ -21,9 +21,9 @@ use crate::Result; /// 1. `Start` : unique, represents the start of the query /// 2. `End` : unique, represents the end of a query /// 3. `Deleted` : represents a node that was deleted. -/// All deleted nodes are unreachable from the start node. +/// All deleted nodes are unreachable from the start node. /// 4. `Term` is a regular node representing a word or combination of words -/// from the user query. +/// from the user query. #[derive(Clone)] pub struct QueryNode { pub data: QueryNodeData, diff --git a/crates/milli/src/search/new/ranking_rule_graph/cheapest_paths.rs b/crates/milli/src/search/new/ranking_rule_graph/cheapest_paths.rs index cacdcfa9f..65580bce5 100644 --- a/crates/milli/src/search/new/ranking_rule_graph/cheapest_paths.rs +++ b/crates/milli/src/search/new/ranking_rule_graph/cheapest_paths.rs @@ -8,7 +8,7 @@ with them, they are "unconditional". These kinds of edges are used to "skip" a n The algorithm uses a depth-first search. It benefits from two main optimisations: - The list of all possible costs to go from any node to the END node is precomputed - The `DeadEndsCache` reduces the number of valid paths drastically, by making some edges -untraversable depending on what other edges were selected. + untraversable depending on what other edges were selected. These two optimisations are meant to avoid traversing edges that wouldn't lead to a valid path. In practically all cases, we avoid the exponential complexity @@ -24,6 +24,7 @@ For example, the DeadEndsCache could say the following: - if we take `g`, then `[f]` is also forbidden - etc. - etc. + As we traverse the graph, we also traverse the `DeadEndsCache` and keep a list of forbidden conditions in memory. Then, we know to avoid all edges which have a condition that is forbidden. diff --git a/crates/milli/src/search/new/ranking_rule_graph/mod.rs b/crates/milli/src/search/new/ranking_rule_graph/mod.rs index 670402bcb..041cb99b8 100644 --- a/crates/milli/src/search/new/ranking_rule_graph/mod.rs +++ b/crates/milli/src/search/new/ranking_rule_graph/mod.rs @@ -58,7 +58,7 @@ pub struct ComputedCondition { /// 2. The cost of traversing this edge /// 3. The condition associated with it /// 4. The list of nodes that have to be skipped -/// if this edge is traversed. +/// if this edge is traversed. #[derive(Clone)] pub struct Edge { pub source_node: Interned, diff --git a/crates/milli/src/search/new/tests/exactness.rs b/crates/milli/src/search/new/tests/exactness.rs index c52006e3d..e1d6cc1ca 100644 --- a/crates/milli/src/search/new/tests/exactness.rs +++ b/crates/milli/src/search/new/tests/exactness.rs @@ -14,7 +14,7 @@ This module tests the following properties about the exactness ranking rule: 3. those that contain the most exact words from the remaining query - if it is followed by other graph-based ranking rules (`typo`, `proximity`, `attribute`). -Then these rules will only work with + Then these rules will only work with 1. the exact terms selected by `exactness 2. the full query term otherwise */ diff --git a/crates/milli/src/search/new/tests/proximity.rs b/crates/milli/src/search/new/tests/proximity.rs index 2d181a537..97c85a53d 100644 --- a/crates/milli/src/search/new/tests/proximity.rs +++ b/crates/milli/src/search/new/tests/proximity.rs @@ -4,15 +4,14 @@ This module tests the Proximity ranking rule: 1. A proximity of >7 always has the same cost. 2. Phrase terms can be in sprximity to other terms via their start and end words, -but we need to make sure that the phrase exists in the document that meets this -proximity condition. This is especially relevant with split words and synonyms. + but we need to make sure that the phrase exists in the document that meets this + proximity condition. This is especially relevant with split words and synonyms. 3. An ngram has the same sprximity cost as its component words being consecutive. -e.g. `sunflower` equivalent to `sun flower`. + e.g. `sunflower` equivalent to `sun flower`. 4. The prefix databases can be used to find the sprximity between two words, but -they store fewer sprximities than the regular word sprximity DB. - + they store fewer sprximities than the regular word sprximity DB. */ use std::collections::BTreeMap; diff --git a/crates/milli/src/search/new/tests/typo.rs b/crates/milli/src/search/new/tests/typo.rs index 61d4c4387..1bbe08977 100644 --- a/crates/milli/src/search/new/tests/typo.rs +++ b/crates/milli/src/search/new/tests/typo.rs @@ -11,7 +11,7 @@ This module tests the following properties: 8. 2grams can have 1 typo if they are larger than `min_word_len_two_typos` 9. 3grams are not typo tolerant (but they can be split into two words) 10. The `typo` ranking rule assumes the role of the `words` ranking rule implicitly -if `words` doesn't exist before it. + if `words` doesn't exist before it. 11. The `typo` ranking rule places documents with the same number of typos in the same bucket 12. Prefix tolerance costs nothing according to the typo ranking rule 13. Split words cost 1 typo according to the typo ranking rule diff --git a/crates/milli/src/search/new/tests/words_tms.rs b/crates/milli/src/search/new/tests/words_tms.rs index ee8cfc51b..e058d81ae 100644 --- a/crates/milli/src/search/new/tests/words_tms.rs +++ b/crates/milli/src/search/new/tests/words_tms.rs @@ -2,11 +2,11 @@ This module tests the following properties: 1. The `last` term matching strategy starts removing terms from the query -starting from the end if no more results match it. + starting from the end if no more results match it. 2. Phrases are never deleted by the `last` term matching strategy 3. Duplicate words don't affect the ranking of a document according to the `words` ranking rule 4. The proximity of the first and last word of a phrase to its adjacent terms is taken into -account by the proximity ranking rule. + account by the proximity ranking rule. 5. Unclosed double quotes still make a phrase 6. The `all` term matching strategy does not remove any term from the query 7. The search is capable of returning no results if no documents match the query diff --git a/crates/milli/src/update/facet/incremental.rs b/crates/milli/src/update/facet/incremental.rs index 41d1f62ab..fc869ad65 100644 --- a/crates/milli/src/update/facet/incremental.rs +++ b/crates/milli/src/update/facet/incremental.rs @@ -21,29 +21,30 @@ use crate::{CboRoaringBitmapCodec, Index, Result}; /// Enum used as a return value for the facet incremental indexing. /// /// - `ModificationResult::InPlace` means that modifying the `facet_value` into the `level` did not have -/// an effect on the number of keys in that level. Therefore, it did not increase the number of children -/// of the parent node. +/// an effect on the number of keys in that level. Therefore, it did not increase the number of children +/// of the parent node. /// /// - `ModificationResult::Insert` means that modifying the `facet_value` into the `level` resulted -/// in the addition of a new key in that level, and that therefore the number of children -/// of the parent node should be incremented. +/// in the addition of a new key in that level, and that therefore the number of children +/// of the parent node should be incremented. /// /// - `ModificationResult::Remove` means that modifying the `facet_value` into the `level` resulted in a change in the -/// number of keys in the level. For example, removing a document id from the facet value `3` could -/// cause it to have no corresponding document in level 0 anymore, and therefore the key was deleted -/// entirely. In that case, `ModificationResult::Remove` is returned. The parent of the deleted key must -/// then adjust its group size. If its group size falls to 0, then it will need to be deleted as well. +/// number of keys in the level. For example, removing a document id from the facet value `3` could +/// cause it to have no corresponding document in level 0 anymore, and therefore the key was deleted +/// entirely. In that case, `ModificationResult::Remove` is returned. The parent of the deleted key must +/// then adjust its group size. If its group size falls to 0, then it will need to be deleted as well. /// /// - `ModificationResult::Reduce/Expand` means that modifying the `facet_value` into the `level` resulted in a change in the -/// bounds of the keys of the level. For example, removing a document id from the facet value -/// `3` might have caused the facet value `3` to have no corresponding document in level 0. Therefore, -/// in level 1, the key with the left bound `3` had to be changed to the next facet value (e.g. 4). -/// In that case `ModificationResult::Reduce` is returned. The parent of the reduced key may need to adjust -/// its left bound as well. +/// bounds of the keys of the level. For example, removing a document id from the facet value +/// `3` might have caused the facet value `3` to have no corresponding document in level 0. Therefore, +/// in level 1, the key with the left bound `3` had to be changed to the next facet value (e.g. 4). +/// In that case `ModificationResult::Reduce` is returned. The parent of the reduced key may need to adjust +/// its left bound as well. /// /// - `ModificationResult::Nothing` means that modifying the `facet_value` didn't have any impact into the `level`. -/// This case is reachable when a document id is removed from a sub-level node but is still present in another one. -/// For example, removing `2` from a document containing `2` and `3`, the document id will removed form the `level 0` but should remain in the group node [1..4] in `level 1`. +/// This case is reachable when a document id is removed from a sub-level node but is still present in another one. +/// For example, removing `2` from a document containing `2` and `3`, the document id will removed form the `level 0` +/// but should remain in the group node [1..4] in `level 1`. enum ModificationResult { InPlace, Expand, diff --git a/crates/milli/src/update/new/thread_local.rs b/crates/milli/src/update/new/thread_local.rs index acdc78c7b..a5af2b0bb 100644 --- a/crates/milli/src/update/new/thread_local.rs +++ b/crates/milli/src/update/new/thread_local.rs @@ -29,9 +29,9 @@ use std::cell::RefCell; /// - An example of a type that verifies (1) and (2) is [`std::rc::Rc`] (when `T` is `Send` and `Sync`). /// - An example of a type that doesn't verify (1) is thread-local data. /// - An example of a type that doesn't verify (2) is [`std::sync::MutexGuard`]: a lot of mutex implementations require that -/// a lock is returned to the operating system on the same thread that initially locked the mutex, failing to uphold this -/// invariant will cause Undefined Behavior -/// (see last § in [the nomicon](https://doc.rust-lang.org/nomicon/send-and-sync.html)). +/// a lock is returned to the operating system on the same thread that initially locked the mutex, failing to uphold this +/// invariant will cause Undefined Behavior +/// (see last § in [the nomicon](https://doc.rust-lang.org/nomicon/send-and-sync.html)). /// /// It is **always safe** to implement this trait on a type that is `Send`, but no placeholder impl is provided due to limitations in /// coherency. Use the [`FullySend`] wrapper in this situation. @@ -86,7 +86,7 @@ impl MostlySendWrapper { /// # Safety /// /// 1. `T` is [`MostlySend`], so by its safety contract it can be accessed by any thread and all of its operations are available -/// from any thread. +/// from any thread. /// 2. (P1) of `MostlySendWrapper::new` forces the user to never access the value from multiple threads concurrently. unsafe impl Send for MostlySendWrapper {} From cf4c3c287b887bb0e0150abdf3f3e6784e43fbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 16:20:33 +0100 Subject: [PATCH 12/13] Make rustfmt happy --- crates/meilisearch/src/analytics/segment_analytics.rs | 3 ++- crates/meilisearch/src/routes/metrics.rs | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/meilisearch/src/analytics/segment_analytics.rs b/crates/meilisearch/src/analytics/segment_analytics.rs index ecb887374..9d187a52c 100644 --- a/crates/meilisearch/src/analytics/segment_analytics.rs +++ b/crates/meilisearch/src/analytics/segment_analytics.rs @@ -427,7 +427,8 @@ impl Segment { ) { // Replace the version number with the prototype name if any. let version = build_info::DescribeResult::from_build() - .and_then(|describe| describe.as_prototype()).unwrap_or(env!("CARGO_PKG_VERSION")); + .and_then(|describe| describe.as_prototype()) + .unwrap_or(env!("CARGO_PKG_VERSION")); let _ = self .batcher diff --git a/crates/meilisearch/src/routes/metrics.rs b/crates/meilisearch/src/routes/metrics.rs index 192164288..03a1923ca 100644 --- a/crates/meilisearch/src/routes/metrics.rs +++ b/crates/meilisearch/src/routes/metrics.rs @@ -1,7 +1,3 @@ -use crate::extractors::authentication::policies::ActionPolicy; -use crate::extractors::authentication::{AuthenticationError, GuardedData}; -use crate::routes::create_all_stats; -use crate::search_queue::SearchQueue; use actix_web::http::header; use actix_web::web::{self, Data}; use actix_web::HttpResponse; @@ -14,6 +10,11 @@ use prometheus::{Encoder, TextEncoder}; use time::OffsetDateTime; use utoipa::OpenApi; +use crate::extractors::authentication::policies::ActionPolicy; +use crate::extractors::authentication::{AuthenticationError, GuardedData}; +use crate::routes::create_all_stats; +use crate::search_queue::SearchQueue; + #[derive(OpenApi)] #[openapi(paths(get_metrics))] pub struct MetricApi; From fe2c0cc3d5bc844cf42944de2e73b3ab20b85ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 9 Jan 2025 09:47:08 +0100 Subject: [PATCH 13/13] Bump rust version to v1.81 --- .github/workflows/bench-manual.yml | 2 +- .github/workflows/bench-pr.yml | 2 +- .github/workflows/bench-push-indexing.yml | 2 +- .github/workflows/benchmarks-manual.yml | 2 +- .github/workflows/benchmarks-pr.yml | 2 +- .github/workflows/benchmarks-push-indexing.yml | 2 +- .github/workflows/benchmarks-push-search-geo.yml | 2 +- .github/workflows/benchmarks-push-search-songs.yml | 2 +- .github/workflows/benchmarks-push-search-wiki.yml | 2 +- .github/workflows/flaky-tests.yml | 2 +- .github/workflows/fuzzer-indexing.yml | 2 +- .github/workflows/publish-apt-brew-pkg.yml | 2 +- .github/workflows/publish-binaries.yml | 8 ++++---- .github/workflows/test-suite.yml | 14 +++++++------- .github/workflows/update-cargo-toml-version.yml | 2 +- Dockerfile | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/bench-manual.yml b/.github/workflows/bench-manual.yml index 3f2b67d52..09699d94f 100644 --- a/.github/workflows/bench-manual.yml +++ b/.github/workflows/bench-manual.yml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 180 # 3h steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/bench-pr.yml b/.github/workflows/bench-pr.yml index 632c86d4e..1bcf16bfc 100644 --- a/.github/workflows/bench-pr.yml +++ b/.github/workflows/bench-pr.yml @@ -66,7 +66,7 @@ jobs: fetch-depth: 0 # fetch full history to be able to get main commit sha ref: ${{ steps.comment-branch.outputs.head_ref }} - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/bench-push-indexing.yml b/.github/workflows/bench-push-indexing.yml index 0d9975eb7..0fca05f24 100644 --- a/.github/workflows/bench-push-indexing.yml +++ b/.github/workflows/bench-push-indexing.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 180 # 3h steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/benchmarks-manual.yml b/.github/workflows/benchmarks-manual.yml index 14b77c83d..044f8a827 100644 --- a/.github/workflows/benchmarks-manual.yml +++ b/.github/workflows/benchmarks-manual.yml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 4320 # 72h steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/benchmarks-pr.yml b/.github/workflows/benchmarks-pr.yml index 7c081932a..78f27541c 100644 --- a/.github/workflows/benchmarks-pr.yml +++ b/.github/workflows/benchmarks-pr.yml @@ -44,7 +44,7 @@ jobs: exit 1 fi - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/benchmarks-push-indexing.yml b/.github/workflows/benchmarks-push-indexing.yml index 4495b4b9d..0144e20cf 100644 --- a/.github/workflows/benchmarks-push-indexing.yml +++ b/.github/workflows/benchmarks-push-indexing.yml @@ -16,7 +16,7 @@ jobs: timeout-minutes: 4320 # 72h steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/benchmarks-push-search-geo.yml b/.github/workflows/benchmarks-push-search-geo.yml index 22218cd6e..cce6cb9b9 100644 --- a/.github/workflows/benchmarks-push-search-geo.yml +++ b/.github/workflows/benchmarks-push-search-geo.yml @@ -15,7 +15,7 @@ jobs: runs-on: benchmarks steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/benchmarks-push-search-songs.yml b/.github/workflows/benchmarks-push-search-songs.yml index e9744a434..2ba584a69 100644 --- a/.github/workflows/benchmarks-push-search-songs.yml +++ b/.github/workflows/benchmarks-push-search-songs.yml @@ -15,7 +15,7 @@ jobs: runs-on: benchmarks steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/benchmarks-push-search-wiki.yml b/.github/workflows/benchmarks-push-search-wiki.yml index bc9e1bcd0..2436cc356 100644 --- a/.github/workflows/benchmarks-push-search-wiki.yml +++ b/.github/workflows/benchmarks-push-search-wiki.yml @@ -15,7 +15,7 @@ jobs: runs-on: benchmarks steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/flaky-tests.yml b/.github/workflows/flaky-tests.yml index 3fa9c549c..530767387 100644 --- a/.github/workflows/flaky-tests.yml +++ b/.github/workflows/flaky-tests.yml @@ -17,7 +17,7 @@ jobs: run: | apt-get update && apt-get install -y curl apt-get install build-essential -y - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 - name: Install cargo-flaky run: cargo install cargo-flaky - name: Run cargo flaky in the dumps diff --git a/.github/workflows/fuzzer-indexing.yml b/.github/workflows/fuzzer-indexing.yml index ad0962802..5da7f73ed 100644 --- a/.github/workflows/fuzzer-indexing.yml +++ b/.github/workflows/fuzzer-indexing.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 4320 # 72h steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal diff --git a/.github/workflows/publish-apt-brew-pkg.yml b/.github/workflows/publish-apt-brew-pkg.yml index 546ec1bee..143d3e7f4 100644 --- a/.github/workflows/publish-apt-brew-pkg.yml +++ b/.github/workflows/publish-apt-brew-pkg.yml @@ -25,7 +25,7 @@ jobs: run: | apt-get update && apt-get install -y curl apt-get install build-essential -y - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 - name: Install cargo-deb run: cargo install cargo-deb - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml index c53946fea..fe0f95474 100644 --- a/.github/workflows/publish-binaries.yml +++ b/.github/workflows/publish-binaries.yml @@ -45,7 +45,7 @@ jobs: run: | apt-get update && apt-get install -y curl apt-get install build-essential -y - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 - name: Build run: cargo build --release --locked # No need to upload binaries for dry run (cron) @@ -75,7 +75,7 @@ jobs: asset_name: meilisearch-windows-amd64.exe steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 - name: Build run: cargo build --release --locked # No need to upload binaries for dry run (cron) @@ -101,7 +101,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Installing Rust toolchain - uses: dtolnay/rust-toolchain@1.79 + uses: dtolnay/rust-toolchain@1.81 with: profile: minimal target: ${{ matrix.target }} @@ -148,7 +148,7 @@ jobs: add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" apt-get update -y && apt-get install -y docker-ce - name: Installing Rust toolchain - uses: dtolnay/rust-toolchain@1.79 + uses: dtolnay/rust-toolchain@1.81 with: profile: minimal target: ${{ matrix.target }} diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index e56125ebf..fae93bd66 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -31,7 +31,7 @@ jobs: apt-get update && apt-get install -y curl apt-get install build-essential -y - name: Setup test with Rust stable - uses: dtolnay/rust-toolchain@1.79 + uses: dtolnay/rust-toolchain@1.81 - name: Cache dependencies uses: Swatinem/rust-cache@v2.7.7 - name: Run cargo check without any default features @@ -56,7 +56,7 @@ jobs: - uses: actions/checkout@v3 - name: Cache dependencies uses: Swatinem/rust-cache@v2.7.7 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 - name: Run cargo check without any default features uses: actions-rs/cargo@v1 with: @@ -81,7 +81,7 @@ jobs: run: | apt-get update apt-get install --assume-yes build-essential curl - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 - name: Run cargo build with almost all features run: | cargo build --workspace --locked --release --features "$(cargo xtask list-features --exclude-feature cuda)" @@ -101,7 +101,7 @@ jobs: run: | apt-get update apt-get install --assume-yes build-essential curl - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 - name: Run cargo tree without default features and check lindera is not present run: | if cargo tree -f '{p} {f}' -e normal --no-default-features | grep -qz lindera; then @@ -125,7 +125,7 @@ jobs: run: | apt-get update && apt-get install -y curl apt-get install build-essential -y - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 - name: Cache dependencies uses: Swatinem/rust-cache@v2.7.7 - name: Run tests in debug @@ -139,7 +139,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal components: clippy @@ -156,7 +156,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal toolchain: nightly-2024-07-09 diff --git a/.github/workflows/update-cargo-toml-version.yml b/.github/workflows/update-cargo-toml-version.yml index d9d79d595..cda76e6bb 100644 --- a/.github/workflows/update-cargo-toml-version.yml +++ b/.github/workflows/update-cargo-toml-version.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.79 + - uses: dtolnay/rust-toolchain@1.81 with: profile: minimal - name: Install sd diff --git a/Dockerfile b/Dockerfile index 04557df59..ce4b3bfd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Compile -FROM rust:1.79.0-alpine3.20 AS compiler +FROM rust:1.81.0-alpine3.20 AS compiler RUN apk add -q --no-cache build-base openssl-dev