From 32cfac0cfd95b962d4ebbdc14459bf47e6151f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 20 Oct 2022 18:03:35 +0200 Subject: [PATCH] Sort the TOML dependencies --- dump/Cargo.toml | 24 +++++++++++------------- file-store/Cargo.toml | 4 +--- index-scheduler/Cargo.toml | 8 +++----- meili-snap/Cargo.toml | 4 +--- meilisearch-http/Cargo.toml | 34 +++++++++++++++++----------------- meilisearch-types/Cargo.toml | 6 +++--- 6 files changed, 36 insertions(+), 44 deletions(-) diff --git a/dump/Cargo.toml b/dump/Cargo.toml index 741d28010..dba94ba47 100644 --- a/dump/Cargo.toml +++ b/dump/Cargo.toml @@ -3,29 +3,27 @@ name = "dump" version = "0.29.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -uuid = { version = "1.1.2", features = ["serde", "v4"] } -serde_json = { version = "1.0.85", features = ["preserve_order"] } -serde = { version = "1.0.136", features = ["derive"] } -tempfile = "3.3.0" -flate2 = "1.0.22" -thiserror = "1.0.30" -time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] } -tar = "0.4.38" anyhow = "1.0.65" +flate2 = "1.0.22" +http = "0.2.8" log = "0.4.17" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -http = "0.2.8" -regex = "1.6.0" once_cell = "1.15.0" +regex = "1.6.0" roaring = { version = "0.10.0", features = ["serde"] } +serde = { version = "1.0.136", features = ["derive"] } +serde_json = { version = "1.0.85", features = ["preserve_order"] } +tar = "0.4.38" +tempfile = "3.3.0" +thiserror = "1.0.30" +time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] } +uuid = { version = "1.1.2", features = ["serde", "v4"] } [dev-dependencies] big_s = "1.0.2" insta = { version = "1.19.1", features = ["json", "redactions"] } -meili-snap = { path = "../meili-snap" } maplit = "1.0.2" +meili-snap = { path = "../meili-snap" } meilisearch-types = { path = "../meilisearch-types" } diff --git a/file-store/Cargo.toml b/file-store/Cargo.toml index 419ae0d01..3dafcbecc 100644 --- a/file-store/Cargo.toml +++ b/file-store/Cargo.toml @@ -3,12 +3,10 @@ name = "file-store" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -uuid = { version = "1.1.2", features = ["serde", "v4"] } tempfile = "3.3.0" thiserror = "1.0.30" +uuid = { version = "1.1.2", features = ["serde", "v4"] } [dev-dependencies] faux = "0.1.8" diff --git a/index-scheduler/Cargo.toml b/index-scheduler/Cargo.toml index 9bfaca506..3b29d158f 100644 --- a/index-scheduler/Cargo.toml +++ b/index-scheduler/Cargo.toml @@ -3,8 +3,6 @@ name = "index-scheduler" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] anyhow = "1.0.64" bincode = "1.3.3" @@ -25,8 +23,8 @@ time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsi uuid = { version = "1.1.2", features = ["serde", "v4"] } [dev-dependencies] -crossbeam = "0.8.2" -nelson = { git = "https://github.com/meilisearch/nelson.git", rev = "675f13885548fb415ead8fbb447e9e6d9314000a"} -insta = { version = "1.19.1", features = ["json", "redactions"] } big_s = "1.0.2" +crossbeam = "0.8.2" +insta = { version = "1.19.1", features = ["json", "redactions"] } meili-snap = { path = "../meili-snap" } +nelson = { git = "https://github.com/meilisearch/nelson.git", rev = "675f13885548fb415ead8fbb447e9e6d9314000a"} diff --git a/meili-snap/Cargo.toml b/meili-snap/Cargo.toml index 27efc7e97..ac214a734 100644 --- a/meili-snap/Cargo.toml +++ b/meili-snap/Cargo.toml @@ -3,9 +3,7 @@ name = "meili-snap" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] insta = { version = "1.19.1", features = ["json", "redactions"] } md5 = "0.7.0" -once_cell = "1.15" \ No newline at end of file +once_cell = "1.15" diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml index 1068dd100..dd1c9d7e5 100644 --- a/meilisearch-http/Cargo.toml +++ b/meilisearch-http/Cargo.toml @@ -10,17 +10,6 @@ version = "0.29.1" name = "meilisearch" path = "src/main.rs" -[build-dependencies] -anyhow = { version = "1.0.65", optional = true } -cargo_toml = { version = "0.12.4", optional = true } -hex = { version = "0.4.3", optional = true } -reqwest = { version = "0.11.12", features = ["blocking", "rustls-tls"], default-features = false, optional = true } -sha-1 = { version = "0.10.0", optional = true } -static-files = { version = "0.2.3", optional = true } -tempfile = { version = "3.3.0", optional = true } -vergen = { version = "7.4.2", default-features = false, features = ["git"] } -zip = { version = "0.6.2", optional = true } - [dependencies] actix-cors = "0.6.3" actix-http = { version = "3.2.2", default-features = false, features = ["compress-brotli", "compress-gzip", "rustls"] } @@ -37,19 +26,20 @@ crossbeam-channel = "0.5.6" dump = { path = "../dump" } either = "1.8.0" env_logger = "0.9.1" +file-store = { path = "../file-store" } flate2 = "1.0.24" fst = "0.4.7" futures = "0.3.24" futures-util = "0.3.24" http = "0.2.8" +index-scheduler = { path = "../index-scheduler" } indexmap = { version = "1.9.1", features = ["serde-1"] } itertools = "0.10.5" jsonwebtoken = "8.1.1" +lazy_static = "1.4.0" log = "0.4.17" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -index-scheduler = { path = "../index-scheduler" } -file-store = { path = "../file-store" } mimalloc = { version = "0.1.29", default-features = false } mime = "0.3.16" num_cpus = "1.13.1" @@ -59,6 +49,7 @@ parking_lot = "0.12.1" permissive-json-pointer = { path = "../permissive-json-pointer" } pin-project-lite = "0.2.9" platform-dirs = "0.3.0" +prometheus = { version = "0.13.2", features = ["process"], optional = true } rand = "0.8.5" rayon = "1.5.3" regex = "1.6.0" @@ -84,8 +75,6 @@ toml = "0.5.9" uuid = { version = "1.1.2", features = ["serde", "v4"] } walkdir = "2.3.2" yaup = "0.2.0" -prometheus = { version = "0.13.2", features = ["process"], optional = true } -lazy_static = "1.4.0" [dev-dependencies] actix-rt = "2.7.0" @@ -93,10 +82,21 @@ assert-json-diff = "2.0.2" brotli = "3.3.4" manifest-dir-macros = "0.1.16" maplit = "1.0.2" -urlencoding = "2.1.2" meili-snap = {path = "../meili-snap"} -yaup = "0.2.1" temp-env = "0.3.1" +urlencoding = "2.1.2" +yaup = "0.2.1" + +[build-dependencies] +anyhow = { version = "1.0.65", optional = true } +cargo_toml = { version = "0.12.4", optional = true } +hex = { version = "0.4.3", optional = true } +reqwest = { version = "0.11.12", features = ["blocking", "rustls-tls"], default-features = false, optional = true } +sha-1 = { version = "0.10.0", optional = true } +static-files = { version = "0.2.3", optional = true } +tempfile = { version = "3.3.0", optional = true } +vergen = { version = "7.4.2", default-features = false, features = ["git"] } +zip = { version = "0.6.2", optional = true } [features] default = ["analytics", "meilisearch-types/default", "mini-dashboard"] diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml index 9d996f9c2..520df67e8 100644 --- a/meilisearch-types/Cargo.toml +++ b/meilisearch-types/Cargo.toml @@ -9,8 +9,8 @@ actix-web = { version = "4.2.1", default-features = false } csv = "1.1.6" either = { version = "1.6.1", features = ["serde"] } enum-iterator = "1.1.3" -milli = { git = "https://github.com/meilisearch/milli.git", branch = "indexation-abortion", default-features = false } fst = "0.4.7" +milli = { git = "https://github.com/meilisearch/milli.git", branch = "indexation-abortion", default-features = false } proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } roaring = { version = "0.10.0", features = ["serde"] } @@ -22,10 +22,10 @@ tokio = "1.0" uuid = { version = "1.1.2", features = ["serde", "v4"] } [dev-dependencies] +insta = "1.19.1" +meili-snap = { path = "../meili-snap" } proptest = "1.0.0" proptest-derive = "0.3.0" -meili-snap = { path = "../meili-snap" } -insta = "1.19.1" [features] # all specialized tokenizations