From 74d1a67a99c7c8f62c8e3ad54e4207f531edd81c Mon Sep 17 00:00:00 2001 From: Tamo Date: Wed, 15 Feb 2023 13:51:07 +0100 Subject: [PATCH] Use the workspace inheritance feature of rust 1.64 --- Cargo.lock | 4 ++-- Cargo.toml | 9 +++++++++ benchmarks/Cargo.toml | 10 ++++++++-- dump/Cargo.toml | 11 +++++++++-- file-store/Cargo.toml | 11 +++++++++-- filter-parser/Cargo.toml | 10 ++++++++-- flatten-serde-json/Cargo.toml | 10 ++++++++-- index-scheduler/Cargo.toml | 11 +++++++++-- json-depth-checker/Cargo.toml | 10 ++++++++-- meili-snap/Cargo.toml | 11 +++++++++-- meilisearch-auth/Cargo.toml | 11 +++++++++-- meilisearch-types/Cargo.toml | 12 +++++++++--- meilisearch/Cargo.toml | 16 ++++++++++------ milli/Cargo.toml | 11 +++++++++-- permissive-json-pointer/Cargo.toml | 11 +++++++++-- 15 files changed, 125 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28ac2ca63..d0fcd431c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.13.3" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a" +checksum = "2bfbc36312494041e2cdd5f06697b7e89d4b76f42773a0b5556ac290ff22acc2" dependencies = [ "serde", "toml", diff --git a/Cargo.toml b/Cargo.toml index a76827de0..d330b3a42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,15 @@ members = [ "benchmarks" ] +[workspace.package] +version = "1.0.0" +authors = ["Quentin de Quelen ", "Clément Renault "] +description = "Meilisearch HTTP server" +homepage = "https://meilisearch.com" +readme = "README.md" +edition = "2021" +license = "MIT" + [profile.release] codegen-units = 1 diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 561fe9d3a..5203a7601 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -1,9 +1,15 @@ [package] name = "benchmarks" -version = "1.0.0" -edition = "2018" publish = false +version.workspace = true +authors.workspace = true +description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true + [dependencies] anyhow = "1.0.65" csv = "1.1.6" diff --git a/dump/Cargo.toml b/dump/Cargo.toml index 611b93735..d0ed46d7c 100644 --- a/dump/Cargo.toml +++ b/dump/Cargo.toml @@ -1,7 +1,14 @@ [package] name = "dump" -version = "1.0.0" -edition = "2021" +publish = false + +version.workspace = true +authors.workspace = true +description.workspace = true +edition.workspace = true +homepage.workspace = true +readme.workspace = true +license.workspace = true [dependencies] anyhow = "1.0.65" diff --git a/file-store/Cargo.toml b/file-store/Cargo.toml index 577d54ac6..b9ab9ea36 100644 --- a/file-store/Cargo.toml +++ b/file-store/Cargo.toml @@ -1,7 +1,14 @@ [package] name = "file-store" -version = "1.0.0" -edition = "2021" +publish = false + +version.workspace = true +authors.workspace = true +description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true [dependencies] tempfile = "3.3.0" diff --git a/filter-parser/Cargo.toml b/filter-parser/Cargo.toml index f7d3f044f..e6652a489 100644 --- a/filter-parser/Cargo.toml +++ b/filter-parser/Cargo.toml @@ -1,10 +1,16 @@ [package] name = "filter-parser" -version = "1.0.0" -edition = "2021" description = "The parser for the Meilisearch filter syntax" publish = false +version.workspace = true +authors.workspace = true +# description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true + [dependencies] nom = "7.1.1" nom_locate = "4.0.0" diff --git a/flatten-serde-json/Cargo.toml b/flatten-serde-json/Cargo.toml index 36667486f..1ad00b0b3 100644 --- a/flatten-serde-json/Cargo.toml +++ b/flatten-serde-json/Cargo.toml @@ -1,11 +1,17 @@ [package] name = "flatten-serde-json" -version = "1.0.0" -edition = "2021" description = "Flatten serde-json objects like elastic search" readme = "README.md" publish = false +version.workspace = true +authors.workspace = true +# description.workspace = true +homepage.workspace = true +# readme.workspace = true +edition.workspace = true +license.workspace = true + [dependencies] serde_json = "1.0" diff --git a/index-scheduler/Cargo.toml b/index-scheduler/Cargo.toml index c5fd03533..77936c435 100644 --- a/index-scheduler/Cargo.toml +++ b/index-scheduler/Cargo.toml @@ -1,7 +1,14 @@ [package] name = "index-scheduler" -version = "1.0.0" -edition = "2021" +publish = false + +version.workspace = true +authors.workspace = true +description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true [dependencies] anyhow = "1.0.64" diff --git a/json-depth-checker/Cargo.toml b/json-depth-checker/Cargo.toml index 0cf8344fd..01b2d03a7 100644 --- a/json-depth-checker/Cargo.toml +++ b/json-depth-checker/Cargo.toml @@ -1,10 +1,16 @@ [package] name = "json-depth-checker" -version = "1.0.0" -edition = "2021" description = "A library that indicates if a JSON must be flattened" publish = false +version.workspace = true +authors.workspace = true +# description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true + [dependencies] serde_json = "1.0" diff --git a/meili-snap/Cargo.toml b/meili-snap/Cargo.toml index 547f76dbe..8aeb30141 100644 --- a/meili-snap/Cargo.toml +++ b/meili-snap/Cargo.toml @@ -1,7 +1,14 @@ [package] name = "meili-snap" -version = "1.0.0" -edition = "2021" +publish = false + +version.workspace = true +authors.workspace = true +description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true [dependencies] insta = { version = "^1.19.1", features = ["json", "redactions"] } diff --git a/meilisearch-auth/Cargo.toml b/meilisearch-auth/Cargo.toml index a42cbae02..9a00140fa 100644 --- a/meilisearch-auth/Cargo.toml +++ b/meilisearch-auth/Cargo.toml @@ -1,7 +1,14 @@ [package] name = "meilisearch-auth" -version = "1.0.0" -edition = "2021" +publish = false + +version.workspace = true +authors.workspace = true +description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true [dependencies] base64 = "0.13.1" diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml index 3ed9464d3..50abbc105 100644 --- a/meilisearch-types/Cargo.toml +++ b/meilisearch-types/Cargo.toml @@ -1,8 +1,14 @@ [package] name = "meilisearch-types" -version = "1.0.0" -authors = ["marin "] -edition = "2021" +publish = false + +version.workspace = true +authors.workspace = true +description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true [dependencies] actix-web = { version = "4.2.1", default-features = false } diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml index b4a87c632..bb30767e5 100644 --- a/meilisearch/Cargo.toml +++ b/meilisearch/Cargo.toml @@ -1,10 +1,14 @@ [package] -authors = ["Quentin de Quelen ", "Clément Renault "] -description = "Meilisearch HTTP server" -edition = "2021" -license = "MIT" name = "meilisearch" -version = "1.0.0" +publish = false + +version.workspace = true +authors.workspace = true +description.workspace = true +homepage.workspace = true +readme.workspace = true +edition.workspace = true +license.workspace = true [dependencies] actix-cors = "0.6.3" @@ -90,7 +94,7 @@ yaup = "0.2.1" [build-dependencies] anyhow = { version = "1.0.65", optional = true } -cargo_toml = { version = "0.13.0", optional = true } +cargo_toml = { version = "0.14.0", 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 } diff --git a/milli/Cargo.toml b/milli/Cargo.toml index 1752cb3d9..2f14b8fdf 100644 --- a/milli/Cargo.toml +++ b/milli/Cargo.toml @@ -1,8 +1,15 @@ [package] name = "milli" -version = "1.0.0" -authors = ["Kerollmops "] edition = "2018" +publish = false + +version.workspace = true +authors.workspace = true +description.workspace = true +homepage.workspace = true +readme.workspace = true +# edition.workspace = true +license.workspace = true [dependencies] bimap = { version = "0.6.2", features = ["serde"] } diff --git a/permissive-json-pointer/Cargo.toml b/permissive-json-pointer/Cargo.toml index c15c341db..697555364 100644 --- a/permissive-json-pointer/Cargo.toml +++ b/permissive-json-pointer/Cargo.toml @@ -1,9 +1,16 @@ [package] name = "permissive-json-pointer" -version = "1.0.0" -edition = "2021" description = "A permissive json pointer" readme = "README.md" +publish = false + +version.workspace = true +authors.workspace = true +# description.workspace = true +homepage.workspace = true +# readme.workspace = true +edition.workspace = true +license.workspace = true [dependencies] serde_json = "1.0"