From 7f125bfb12c11a55ff17e7da6d696caf2c0b29b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 16 Jan 2024 15:15:54 +0100 Subject: [PATCH] Update incompatible dependencies --- Cargo.lock | 137 ++++++++++++++++++++++++++++++----------- dump/Cargo.toml | 2 +- meilisearch/Cargo.toml | 18 +++--- milli/Cargo.toml | 2 +- 4 files changed, 111 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a1bc8f183..2f7db0a32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ "actix-utils", "actix-web", @@ -149,7 +149,7 @@ dependencies = [ "impl-more", "pin-project-lite", "rustls 0.21.6", - "rustls-webpki", + "rustls-webpki 0.101.7", "tokio", "tokio-rustls 0.23.4", "tokio-util", @@ -392,7 +392,7 @@ dependencies = [ "heed", "log", "memmap2 0.9.3", - "ordered-float 4.2.0", + "ordered-float", "rand", "rayon", "roaring", @@ -753,9 +753,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.15.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" dependencies = [ "serde", "toml", @@ -1427,7 +1427,7 @@ dependencies = [ "anyhow", "big_s", "flate2", - "http 0.2.11", + "http 1.0.0", "log", "maplit", "meili-snap", @@ -3549,7 +3549,7 @@ dependencies = [ "futures", "futures-util", "hex", - "http 0.2.11", + "http 1.0.0", "index-scheduler", "indexmap 2.1.0", "insta", @@ -3568,7 +3568,7 @@ dependencies = [ "num_cpus", "obkv", "once_cell", - "ordered-float 3.9.2", + "ordered-float", "parking_lot", "permissive-json-pointer", "pin-project-lite", @@ -3579,15 +3579,15 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.20.9", - "rustls-pemfile", + "rustls 0.22.2", + "rustls-pemfile 2.0.0", "segment", "serde", "serde_json", "serde_urlencoded", "sha-1", "sha2", - "siphasher", + "siphasher 1.0.0", "slice-group-by", "static-files", "sysinfo", @@ -3741,7 +3741,7 @@ dependencies = [ "mimalloc", "obkv", "once_cell", - "ordered-float 3.9.2", + "ordered-float", "puffin", "rand", "rand_pcg", @@ -3984,15 +3984,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "ordered-float" -version = "3.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-float" version = "4.2.0" @@ -4205,7 +4196,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -4607,7 +4598,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.6", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -4756,10 +4747,24 @@ checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring 0.16.20", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring 0.17.3", + "rustls-pki-types", + "rustls-webpki 0.102.1", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -4769,6 +4774,22 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +dependencies = [ + "base64 0.21.7", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4779,6 +4800,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +dependencies = [ + "ring 0.17.3", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -4904,9 +4936,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -4989,6 +5021,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" + [[package]] name = "slab" version = "0.4.8" @@ -5186,9 +5224,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.11" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ "cfg-if", "core-foundation-sys", @@ -5196,7 +5234,7 @@ dependencies = [ "ntapi", "once_cell", "rayon", - "winapi", + "windows", ] [[package]] @@ -5470,9 +5508,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -5482,18 +5520,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap 2.1.0", "serde", @@ -5654,7 +5692,7 @@ dependencies = [ "log", "once_cell", "rustls 0.21.6", - "rustls-webpki", + "rustls-webpki 0.101.7", "serde", "serde_json", "socks", @@ -5929,6 +5967,25 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -6237,6 +6294,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + [[package]] name = "zerotrie" version = "0.1.1" diff --git a/dump/Cargo.toml b/dump/Cargo.toml index 941cec72d..8ab648b05 100644 --- a/dump/Cargo.toml +++ b/dump/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true [dependencies] anyhow = "1.0.79" flate2 = "1.0.28" -http = "0.2.11" +http = "1.0.0" log = "0.4.20" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml index 1ea796fb5..f7098dd8d 100644 --- a/meilisearch/Cargo.toml +++ b/meilisearch/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true default-run = "meilisearch" [dependencies] -actix-cors = "0.6.5" +actix-cors = "0.7.0" actix-http = { version = "3.5.1", default-features = false, features = [ "compress-brotli", "compress-gzip", @@ -48,7 +48,7 @@ flate2 = "1.0.28" fst = "0.4.7" futures = "0.3.30" futures-util = "0.3.30" -http = "0.2.11" +http = "1.0.0" index-scheduler = { path = "../index-scheduler" } indexmap = { version = "2.1.0", features = ["serde"] } is-terminal = "0.4.10" @@ -63,7 +63,7 @@ mime = "0.3.17" num_cpus = "1.16.0" obkv = "0.2.1" once_cell = "1.19.0" -ordered-float = "3.9.2" +ordered-float = "4.2.0" parking_lot = "0.12.1" permissive-json-pointer = { path = "../permissive-json-pointer" } pin-project-lite = "0.2.13" @@ -77,16 +77,16 @@ reqwest = { version = "0.11.23", features = [ "rustls-tls", "json", ], default-features = false } -rustls = "0.20.9" -rustls-pemfile = "1.0.4" +rustls = "0.22.2" +rustls-pemfile = "2.0.0" segment = { version = "0.2.3", optional = true } serde = { version = "1.0.195", features = ["derive"] } serde_json = { version = "1.0.111", features = ["preserve_order"] } sha2 = "0.10.8" -siphasher = "0.3.11" +siphasher = "1.0.0" slice-group-by = "0.3.1" static-files = { version = "0.2.3", optional = true } -sysinfo = "0.29.11" +sysinfo = "0.30.5" tar = "0.4.40" tempfile = "3.9.0" thiserror = "1.0.56" @@ -98,7 +98,7 @@ time = { version = "0.3.31", features = [ ] } tokio = { version = "1.35.1", features = ["full"] } tokio-stream = "0.1.14" -toml = "0.7.8" +toml = "0.8.8" uuid = { version = "1.6.1", features = ["serde", "v4"] } walkdir = "2.4.0" yaup = "0.2.1" @@ -120,7 +120,7 @@ yaup = "0.2.1" [build-dependencies] anyhow = { version = "1.0.79", optional = true } -cargo_toml = { version = "0.15.3", optional = true } +cargo_toml = { version = "0.18.0", optional = true } hex = { version = "0.4.3", optional = true } reqwest = { version = "0.11.23", features = [ "blocking", diff --git a/milli/Cargo.toml b/milli/Cargo.toml index 4f3885acc..f3b92dbd0 100644 --- a/milli/Cargo.toml +++ b/milli/Cargo.toml @@ -41,7 +41,7 @@ levenshtein_automata = { version = "0.2.1", features = ["fst_automaton"] } memmap2 = "0.7.1" obkv = "0.2.1" once_cell = "1.19.0" -ordered-float = "3.9.2" +ordered-float = "4.2.0" rand_pcg = { version = "0.3.1", features = ["serde1"] } rayon = "1.8.0" roaring = "0.10.2"