From a109802d45796b8788ba396039847b27f5c515c5 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Tue, 11 Apr 2023 15:55:23 +0200 Subject: [PATCH] Upgrade the incompatible versions of the dependencies --- Cargo.lock | 102 +++++++++++++++++++++++------------- index-scheduler/Cargo.toml | 2 +- meilisearch-auth/Cargo.toml | 2 +- meilisearch/Cargo.toml | 8 +-- milli/Cargo.toml | 2 +- 5 files changed, 73 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 473891871..454749dab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -644,9 +644,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.14.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfbc36312494041e2cdd5f06697b7e89d4b76f42773a0b5556ac290ff22acc2" +checksum = "7f83bc2e401ed041b7057345ebc488c005efa0341d5541ce7004d30458d0090b" dependencies = [ "serde", "toml", @@ -1099,18 +1099,18 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ "darling", "proc-macro2", @@ -1120,9 +1120,9 @@ dependencies = [ [[package]] name = "derive_builder_macro" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ "derive_builder_core", "syn 1.0.109", @@ -1350,19 +1350,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.10.0" @@ -1789,7 +1776,7 @@ dependencies = [ "atomic-polyfill", "hash32", "rustc_version", - "spin 0.9.4", + "spin 0.9.8", "stable_deref_trait", ] @@ -2256,7 +2243,7 @@ dependencies = [ "byteorder", "csv", "encoding", - "env_logger 0.10.0", + "env_logger", "glob", "lindera-core", "lindera-decompress", @@ -2344,7 +2331,7 @@ dependencies = [ "csv", "encoding_rs", "encoding_rs_io", - "env_logger 0.10.0", + "env_logger", "glob", "lindera-compress", "lindera-core", @@ -2382,7 +2369,7 @@ dependencies = [ "byteorder", "csv", "encoding", - "env_logger 0.10.0", + "env_logger", "glob", "lindera-compress", "lindera-core", @@ -2402,7 +2389,7 @@ dependencies = [ "byteorder", "csv", "encoding", - "env_logger 0.10.0", + "env_logger", "glob", "lindera-core", "lindera-decompress", @@ -2555,7 +2542,7 @@ dependencies = [ "deserr", "dump", "either", - "env_logger 0.9.3", + "env_logger", "file-store", "flate2", "fst", @@ -2622,7 +2609,7 @@ dependencies = [ name = "meilisearch-auth" version = "1.1.1" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "enum-iterator", "hmac", "maplit", @@ -3458,9 +3445,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40f1bfe5acdab44bc63e6699c28b74f75ec43afb59f3eda01e145aff86a25fa" +checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a" dependencies = [ "heapless", "num-traits", @@ -3630,6 +3617,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3768,9 +3764,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -3855,9 +3851,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.26.9" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c18a6156d1f27a9592ee18c1a846ca8dd5c258b7179fc193ae87c74ebb666f5" +checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4056,11 +4052,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -4564,6 +4585,15 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.10.1" diff --git a/index-scheduler/Cargo.toml b/index-scheduler/Cargo.toml index b90b9786e..36c28cd67 100644 --- a/index-scheduler/Cargo.toml +++ b/index-scheduler/Cargo.toml @@ -14,7 +14,7 @@ license.workspace = true anyhow = "1.0.70" bincode = "1.3.3" csv = "1.2.1" -derive_builder = "0.11.2" +derive_builder = "0.12.0" dump = { path = "../dump" } enum-iterator = "1.4.0" file-store = { path = "../file-store" } diff --git a/meilisearch-auth/Cargo.toml b/meilisearch-auth/Cargo.toml index 2065c6f4c..51be88f9e 100644 --- a/meilisearch-auth/Cargo.toml +++ b/meilisearch-auth/Cargo.toml @@ -11,7 +11,7 @@ edition.workspace = true license.workspace = true [dependencies] -base64 = "0.13.1" +base64 = "0.21.0" enum-iterator = "1.4.0" hmac = "0.12.1" maplit = "1.0.2" diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml index 09b461417..92588a063 100644 --- a/meilisearch/Cargo.toml +++ b/meilisearch/Cargo.toml @@ -28,7 +28,7 @@ crossbeam-channel = "0.5.8" deserr = "0.5.0" dump = { path = "../dump" } either = "1.8.1" -env_logger = "0.9.3" +env_logger = "0.10.0" file-store = { path = "../file-store" } flate2 = "1.0.25" fst = "0.4.7" @@ -66,14 +66,14 @@ sha2 = "0.10.6" siphasher = "0.3.10" slice-group-by = "0.3.0" static-files = { version = "0.2.3", optional = true } -sysinfo = "0.26.9" +sysinfo = "0.28.4" tar = "0.4.38" tempfile = "3.5.0" thiserror = "1.0.40" time = { version = "0.3.20", features = ["serde-well-known", "formatting", "parsing", "macros"] } tokio = { version = "1.27.0", features = ["full"] } tokio-stream = "0.1.12" -toml = "0.5.11" +toml = "0.7.3" uuid = { version = "1.3.1", features = ["serde", "v4"] } walkdir = "2.3.3" yaup = "0.2.1" @@ -96,7 +96,7 @@ yaup = "0.2.1" [build-dependencies] anyhow = { version = "1.0.70", optional = true } -cargo_toml = { version = "0.14.1", optional = true } +cargo_toml = { version = "0.15.2", optional = true } hex = { version = "0.4.3", optional = true } reqwest = { version = "0.11.16", features = ["blocking", "rustls-tls"], default-features = false, optional = true } sha-1 = { version = "0.10.1", optional = true } diff --git a/milli/Cargo.toml b/milli/Cargo.toml index 1b9a88700..0e0cee595 100644 --- a/milli/Cargo.toml +++ b/milli/Cargo.toml @@ -35,7 +35,7 @@ once_cell = "1.17.1" ordered-float = "3.6.0" rayon = "1.7.0" roaring = "0.10.1" -rstar = { version = "0.9.3", features = ["serde"] } +rstar = { version = "0.10.0", features = ["serde"] } serde = { version = "1.0.160", features = ["derive"] } serde_json = { version = "1.0.95", features = ["preserve_order"] } slice-group-by = "0.3.0"