From e19f3e572c0ac585a6c2023e50f8fd0bd2ea2dae Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Sat, 9 Dec 2023 22:27:52 +0200 Subject: [PATCH] Cargo-sort all Cargo.toml files With: cargo sort --grouped --order package,bin,lib,dependencies,features,build-dependencies,dev-dependencies,workspace meli cargo sort --grouped --order package,bin,lib,dependencies,features,build-dependencies,dev-dependencies,workspace melib cargo sort --grouped --order package,bin,lib,dependencies,features,build-dependencies,dev-dependencies,workspace tools cargo sort --grouped --order package,bin,lib,dependencies,features,build-dependencies,dev-dependencies,workspace fuzz Signed-off-by: Manos Pitsidianakis --- fuzz/Cargo.toml | 8 ++++---- meli/Cargo.toml | 30 +++++++++++++++--------------- melib/Cargo.toml | 14 +++++++------- tools/Cargo.toml | 8 ++++---- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 4273c81e..459b6b70 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -8,6 +8,10 @@ edition = "2018" [package.metadata] cargo-fuzz = true +[[bin]] +name = "envelope_parse" +path = "fuzz_targets/envelope_parse.rs" + [dependencies] libfuzzer-sys = "0.3" @@ -18,7 +22,3 @@ features = ["unicode-algorithms"] # Prevent this from interfering with workspaces [workspace] members = ["."] - -[[bin]] -name = "envelope_parse" -path = "fuzz_targets/envelope_parse.rs" diff --git a/meli/Cargo.toml b/meli/Cargo.toml index acd26249..371c35e8 100644 --- a/meli/Cargo.toml +++ b/meli/Cargo.toml @@ -53,21 +53,6 @@ xdg = "2.1.0" version = "0.2.3" optional = true -[target.'cfg(target_os="linux")'.dependencies] -notify-rust = { version = "^4", default-features = false, features = ["dbus"], optional = true } - -[build-dependencies] -flate2 = { version = "1", optional = true } -proc-macro2 = "1.0.37" -quote = "^1.0" -regex = "1" -syn = { version = "1", features = [] } - -[dev-dependencies] -flate2 = { version = "1" } -regex = "1" -tempfile = "3.3" - [features] default = ["sqlite3", "notmuch", "smtp", "dbus-notifications", "gpgme", "cli-docs", "jmap", "text-processing", "static"] notmuch = ["melib/notmuch"] @@ -92,3 +77,18 @@ static = ["tls-static", "http-static", "sqlite3-static", "dbus-static", "libz-st # Print tracing logs as meli runs in stderr # enable for debug tracing logs: build with --features=debug-tracing and export MELI_DEBUG_STDERR debug-tracing = ["melib/debug-tracing"] + +[build-dependencies] +flate2 = { version = "1", optional = true } +proc-macro2 = "1.0.37" +quote = "^1.0" +regex = "1" +syn = { version = "1", features = [] } + +[dev-dependencies] +flate2 = { version = "1" } +regex = "1" +tempfile = "3.3" + +[target.'cfg(target_os="linux")'.dependencies] +notify-rust = { version = "^4", default-features = false, features = ["dbus"], optional = true } diff --git a/melib/Cargo.toml b/melib/Cargo.toml index 76089dc9..ccfa5f4a 100644 --- a/melib/Cargo.toml +++ b/melib/Cargo.toml @@ -55,13 +55,6 @@ unicode-segmentation = { version = "1.2.1", default-features = false, optional = uuid = { version = "^1", features = ["serde", "v4", "v5"] } xdg = "2.1.0" -[dev-dependencies] -mailin-embedded = { version = "0.7", features = ["rtls"] } -stderrlog = "^0.5" - -[build-dependencies] -flate2 = { version = "1.0.16" } - [features] default = ["imap", "nntp", "maildir", "mbox", "vcard", "smtp"] @@ -88,3 +81,10 @@ text-processing = [] unicode-algorithms = ["text-processing", "unicode-segmentation"] unicode-algorithms-cached = ["text-processing", "unicode-segmentation"] vcard = [] + +[build-dependencies] +flate2 = { version = "1.0.16" } + +[dev-dependencies] +mailin-embedded = { version = "0.7", features = ["rtls"] } +stderrlog = "^0.5" diff --git a/tools/Cargo.toml b/tools/Cargo.toml index 24fdfa53..6cc5f181 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -10,10 +10,6 @@ homepage = "https://meli.delivery" repository = "https://git.meli.delivery/meli/meli.git" publish = false -# Prevent this from interfering with workspaces -[workspace] -members = ["."] - [[bin]] name = "emailparse" path = "src/email_parse.rs" @@ -54,3 +50,7 @@ default = ["debug-tracing"] # Print tracing logs as meli runs debug-tracing = ["meli/debug-tracing"] + +# Prevent this from interfering with workspaces +[workspace] +members = ["."]