Author: Manos Pitsidianakis [manos@pitsidianak.is]
Hash: 7be8912c1438853d72813277ba90197f603da23d
Timestamp: Fri, 02 Aug 2024 15:20:05 +0000 (1 month ago)

+26 -29 +/-3 browse
Cargo.tomls: make formatting more consistent 
Cargo.tomls: make formatting more consistent

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
1diff --git a/Makefile b/Makefile
2index 6a937db..dd548a4 100644
3--- a/Makefile
4+++ b/Makefile
5 @@ -107,7 +107,7 @@ check: check-tagrefs
6 .PHONY: fmt
7 fmt:
8 $(CARGO_BIN) +nightly fmt --all || $(CARGO_BIN) fmt --all
9- @OUT=$$($(CARGO_SORT_BIN) -w 2>&1) || $(PRINTF) "WARN: %s cargo-sort failed or binary not found in PATH.\n" "$$OUT"
10+ @OUT=$$($(CARGO_SORT_BIN) melib -w 2>&1 && $(CARGO_SORT_BIN) meli -w 2>&1) || $(PRINTF) "WARN: %s cargo-sort failed or binary not found in PATH.\n" "$$OUT"
11
12 .PHONY: lint
13 lint:
14 diff --git a/meli/Cargo.toml b/meli/Cargo.toml
15index 41b5a1d..face6b6 100644
16--- a/meli/Cargo.toml
17+++ b/meli/Cargo.toml
18 @@ -4,7 +4,7 @@ version = "0.8.7"
19 authors = ["Manos Pitsidianakis <manos@pitsidianak.is>"]
20 edition = "2021"
21 rust-version = "1.70.0"
22- license = "GPL-3.0-or-later"
23+ license = "EUPL-1.2 OR GPL-3.0-or-later"
24 readme = "README.md"
25 description = "terminal e-mail client"
26 homepage = "https://meli-email.org"
27 @@ -22,7 +22,7 @@ name = "meli"
28 path = "src/lib.rs"
29
30 [dependencies]
31- async-task = "^4.2.0"
32+ async-task = { version = "^4.2.0" }
33 bitflags = { version = "2.4", features = ["serde"] }
34 crossbeam = { version = "^0.8" }
35 flate2 = { version = "1", optional = true }
36 @@ -33,17 +33,17 @@ libz-sys = { version = "1.1", features = ["static"], optional = true }
37 linkify = { version = "^0.10", default-features = false }
38 melib = { path = "../melib", version = "0.8.7", features = [] }
39 nix = { version = "0.27", default-features = false, features = ["signal", "poll", "term", "ioctl", "process"] }
40- serde = "1.0.71"
41- serde_derive = "1.0.71"
42- serde_json = "1.0"
43+ serde = { version = "1.0.71" }
44+ serde_derive = { version = "1.0.71" }
45+ serde_json = { version = "1.0" }
46 signal-hook = { version = "^0.3", default-features = false, features = ["iterator"] }
47 signal-hook-registry = { version = "1.2.0", default-features = false }
48 smallvec = { version = "^1.5.0", features = ["serde"] }
49- structopt = { version = "0.3.14", default-features = false }
50+ structopt = { version = "0.3.26", default-features = false }
51 svg_crate = { version = "^0.13", optional = true, package = "svg" }
52 termion = { version = "1.5.1", default-features = false }
53 toml = { version = "0.8", default-features = false, features = ["display","preserve_order","parse"] }
54- xdg = "2.1.0"
55+ xdg = { version = "2.1.0" }
56
57 [dependencies.pcre2]
58 # An [env] entry in .cargo/config.toml should force a static build instead of
59 @@ -77,17 +77,17 @@ debug-tracing = ["melib/debug-tracing"]
60
61 [build-dependencies]
62 flate2 = { version = "1", optional = true }
63- proc-macro2 = "1.0.37"
64- quote = "^1.0"
65- regex = "1"
66+ proc-macro2 = { version = "1.0.37" }
67+ quote = { version = "^1.0" }
68+ regex = { version = "1" }
69 syn = { version = "1", features = [] }
70
71 [dev-dependencies]
72 assert_cmd = { version = "=2.0.13" }
73 flate2 = { version = "1" }
74 predicates = { version = "3" }
75- regex = "1"
76- tempfile = "3.3"
77+ regex = { version = "1" }
78+ tempfile = { version = "3.3" }
79
80 [target.'cfg(target_os="linux")'.dependencies]
81 notify-rust = { version = "^4", default-features = false, features = ["dbus"], optional = true }
82 diff --git a/melib/Cargo.toml b/melib/Cargo.toml
83index a8a77a7..2136100 100644
84--- a/melib/Cargo.toml
85+++ b/melib/Cargo.toml
86 @@ -2,57 +2,54 @@
87 name = "melib"
88 version = "0.8.7"
89 authors = ["Manos Pitsidianakis <manos@pitsidianak.is>"]
90- edition = "2021"
91- build = "build.rs"
92- rust-version = "1.70.0"
93-
94 homepage = "https://meli-email.org"
95 repository = "https://git.meli-email.org/meli/meli.git"
96 description = "library for e-mail clients and other e-mail applications"
97 keywords = ["mail", "mua", "maildir", "imap", "jmap"]
98 categories = ["email", "parser-implementations"]
99- license = "GPL-3.0-or-later"
100+ license = "EUPL-1.2 OR GPL-3.0-or-later"
101 readme = "README.md"
102+ edition = "2021"
103+ build = "build.rs"
104+ rust-version = "1.70.0"
105
106 [lib]
107 name = "melib"
108 path = "src/lib.rs"
109
110 [dependencies]
111- async-fn-stream = "=0.2.2"
112+ async-fn-stream = { version = "=0.2.2" }
113 base64 = { version = "^0.13", optional = true }
114 bitflags = { version = "2.4", features = ["serde"] }
115 data-encoding = { version = "2.1.1" }
116 encoding = { version = "0.2.33", default-features = false }
117 encoding_rs = { version = "^0.8" }
118 flate2 = { version = "1.0.16" }
119- futures = "0.3.5"
120-
121+ futures = { version = "0.3.5" }
122 imap-codec = { version = "2.0.0-alpha.1", features = ["ext_condstore_qresync", "ext_id", "ext_uidplus"], optional = true }
123 indexmap = { version = "^2.3", default-features = false, features = ["serde", "std"] }
124 isahc = { version = "^1.7.2", optional = true, default-features = false, features = ["http2", "json", "text-decoding"] }
125 libc = { version = "0.2.125", features = ["extra_traits"] }
126-
127- libloading = "^0.8"
128+ libloading = { version = "^0.8" }
129 log = { version = "0.4", features = ["std"] }
130 native-tls = { version = "0.2.3", default-features = false, optional = true }
131 nix = { version = "0.27", default-features = false, features = ["fs", "socket", "dir", "hostname"] }
132 nom = { version = "7" }
133 notify = { version = "6.1.1", optional = true }
134- polling = "2.8"
135+ polling = { version = "2.8" }
136 regex = { version = "1" }
137 rusqlite = { version = "^0.29", default-features = false, features = ["array"], optional = true }
138 serde = { version = "1.0", features = ["rc"] }
139- serde_derive = "1.0"
140+ serde_derive = { version = "1.0" }
141 serde_json = { version = "1.0", features = ["raw_value"] }
142 serde_path_to_error = { version = "0.1" }
143 smallvec = { version = "^1.5.0", features = ["serde"] }
144- smol = "1.0.0"
145+ smol = { version = "1.0.0" }
146 socket2 = { version = "0.5", features = [] }
147 unicode-segmentation = { version = "1.2.1", default-features = false }
148 url = { version = "2.4", optional = true }
149 uuid = { version = "^1", features = ["serde", "v4", "v5"] }
150- xdg = "2.1.0"
151+ xdg = { version = "2.1.0" }
152
153 [features]
154 default = ["imap", "nntp", "maildir", "mbox", "vcard", "smtp"]
155 @@ -83,5 +80,5 @@ flate2 = { version = "1.0.16" }
156
157 [dev-dependencies]
158 mailin-embedded = { version = "0.8", features = ["rtls"] }
159- stderrlog = "^0.5"
160- tempfile = "3.3"
161+ stderrlog = { version = "^0.5" }
162+ tempfile = { version = "3.3" }