+53 -148 +/-2 browse
1 | diff --git a/Cargo.lock b/Cargo.lock |
2 | index 2a63a85..816a867 100644 |
3 | --- a/Cargo.lock |
4 | +++ b/Cargo.lock |
5 | @@ -1017,6 +1017,15 @@ dependencies = [ |
6 | ] |
7 | |
8 | [[package]] |
9 | + name = "crossbeam-channel" |
10 | + version = "0.5.13" |
11 | + source = "registry+https://github.com/rust-lang/crates.io-index" |
12 | + checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" |
13 | + dependencies = [ |
14 | + "crossbeam-utils", |
15 | + ] |
16 | + |
17 | + [[package]] |
18 | name = "crossbeam-utils" |
19 | version = "0.8.19" |
20 | source = "registry+https://github.com/rust-lang/crates.io-index" |
21 | @@ -1502,41 +1511,15 @@ dependencies = [ |
22 | ] |
23 | |
24 | [[package]] |
25 | - name = "fsevent" |
26 | - version = "0.4.0" |
27 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
28 | - checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" |
29 | - dependencies = [ |
30 | - "bitflags 1.3.2", |
31 | - "fsevent-sys", |
32 | - ] |
33 | - |
34 | - [[package]] |
35 | name = "fsevent-sys" |
36 | - version = "2.0.1" |
37 | + version = "4.1.0" |
38 | source = "registry+https://github.com/rust-lang/crates.io-index" |
39 | - checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" |
40 | + checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" |
41 | dependencies = [ |
42 | "libc", |
43 | ] |
44 | |
45 | [[package]] |
46 | - name = "fuchsia-zircon" |
47 | - version = "0.3.3" |
48 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
49 | - checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" |
50 | - dependencies = [ |
51 | - "bitflags 1.3.2", |
52 | - "fuchsia-zircon-sys", |
53 | - ] |
54 | - |
55 | - [[package]] |
56 | - name = "fuchsia-zircon-sys" |
57 | - version = "0.3.3" |
58 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
59 | - checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" |
60 | - |
61 | - [[package]] |
62 | name = "futures" |
63 | version = "0.3.30" |
64 | source = "registry+https://github.com/rust-lang/crates.io-index" |
65 | @@ -1872,7 +1855,7 @@ dependencies = [ |
66 | "httpdate", |
67 | "itoa", |
68 | "pin-project-lite", |
69 | - "socket2 0.4.10", |
70 | + "socket2 0.5.5", |
71 | "tokio", |
72 | "tower-service", |
73 | "tracing", |
74 | @@ -1954,9 +1937,9 @@ dependencies = [ |
75 | |
76 | [[package]] |
77 | name = "inotify" |
78 | - version = "0.7.1" |
79 | + version = "0.9.6" |
80 | source = "registry+https://github.com/rust-lang/crates.io-index" |
81 | - checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" |
82 | + checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" |
83 | dependencies = [ |
84 | "bitflags 1.3.2", |
85 | "inotify-sys", |
86 | @@ -2002,15 +1985,6 @@ dependencies = [ |
87 | ] |
88 | |
89 | [[package]] |
90 | - name = "iovec" |
91 | - version = "0.1.4" |
92 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
93 | - checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" |
94 | - dependencies = [ |
95 | - "libc", |
96 | - ] |
97 | - |
98 | - [[package]] |
99 | name = "ipnet" |
100 | version = "2.9.0" |
101 | source = "registry+https://github.com/rust-lang/crates.io-index" |
102 | @@ -2100,13 +2074,23 @@ dependencies = [ |
103 | ] |
104 | |
105 | [[package]] |
106 | - name = "kernel32-sys" |
107 | - version = "0.2.2" |
108 | + name = "kqueue" |
109 | + version = "1.0.8" |
110 | source = "registry+https://github.com/rust-lang/crates.io-index" |
111 | - checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" |
112 | + checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" |
113 | dependencies = [ |
114 | - "winapi 0.2.8", |
115 | - "winapi-build", |
116 | + "kqueue-sys", |
117 | + "libc", |
118 | + ] |
119 | + |
120 | + [[package]] |
121 | + name = "kqueue-sys" |
122 | + version = "1.0.4" |
123 | + source = "registry+https://github.com/rust-lang/crates.io-index" |
124 | + checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" |
125 | + dependencies = [ |
126 | + "bitflags 1.3.2", |
127 | + "libc", |
128 | ] |
129 | |
130 | [[package]] |
131 | @@ -2119,12 +2103,6 @@ dependencies = [ |
132 | ] |
133 | |
134 | [[package]] |
135 | - name = "lazycell" |
136 | - version = "1.3.0" |
137 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
138 | - checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" |
139 | - |
140 | - [[package]] |
141 | name = "libc" |
142 | version = "0.2.152" |
143 | source = "registry+https://github.com/rust-lang/crates.io-index" |
144 | @@ -2149,7 +2127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" |
145 | checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" |
146 | dependencies = [ |
147 | "cfg-if 1.0.0", |
148 | - "winapi 0.3.9", |
149 | + "winapi", |
150 | ] |
151 | |
152 | [[package]] |
153 | @@ -2395,8 +2373,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" |
154 | |
155 | [[package]] |
156 | name = "melib" |
157 | - version = "0.8.5-rc.3" |
158 | - source = "git+https://git.meli-email.org/meli/meli.git?rev=64e60cb#64e60cb0ee79841ab40e3dba94ac27150a264c5c" |
159 | + version = "0.8.6" |
160 | + source = "registry+https://github.com/rust-lang/crates.io-index" |
161 | + checksum = "4f233699ab6a71d41529624e3d9600c8a3a208874fcf4ec4a05778314afdd2e7" |
162 | dependencies = [ |
163 | "async-stream", |
164 | "base64 0.13.1", |
165 | @@ -2422,7 +2401,7 @@ dependencies = [ |
166 | "serde_path_to_error", |
167 | "smallvec", |
168 | "smol", |
169 | - "socket2 0.4.10", |
170 | + "socket2 0.5.5", |
171 | "unicode-segmentation", |
172 | "uuid", |
173 | "xdg", |
174 | @@ -2442,9 +2421,9 @@ checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" |
175 | |
176 | [[package]] |
177 | name = "memoffset" |
178 | - version = "0.6.5" |
179 | + version = "0.9.1" |
180 | source = "registry+https://github.com/rust-lang/crates.io-index" |
181 | - checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" |
182 | + checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" |
183 | dependencies = [ |
184 | "autocfg", |
185 | ] |
186 | @@ -2483,59 +2462,17 @@ dependencies = [ |
187 | |
188 | [[package]] |
189 | name = "mio" |
190 | - version = "0.6.23" |
191 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
192 | - checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" |
193 | - dependencies = [ |
194 | - "cfg-if 0.1.10", |
195 | - "fuchsia-zircon", |
196 | - "fuchsia-zircon-sys", |
197 | - "iovec", |
198 | - "kernel32-sys", |
199 | - "libc", |
200 | - "log", |
201 | - "miow", |
202 | - "net2", |
203 | - "slab", |
204 | - "winapi 0.2.8", |
205 | - ] |
206 | - |
207 | - [[package]] |
208 | - name = "mio" |
209 | version = "0.8.10" |
210 | source = "registry+https://github.com/rust-lang/crates.io-index" |
211 | checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" |
212 | dependencies = [ |
213 | "libc", |
214 | + "log", |
215 | "wasi", |
216 | "windows-sys 0.48.0", |
217 | ] |
218 | |
219 | [[package]] |
220 | - name = "mio-extras" |
221 | - version = "2.0.6" |
222 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
223 | - checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" |
224 | - dependencies = [ |
225 | - "lazycell", |
226 | - "log", |
227 | - "mio 0.6.23", |
228 | - "slab", |
229 | - ] |
230 | - |
231 | - [[package]] |
232 | - name = "miow" |
233 | - version = "0.2.2" |
234 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
235 | - checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" |
236 | - dependencies = [ |
237 | - "kernel32-sys", |
238 | - "net2", |
239 | - "winapi 0.2.8", |
240 | - "ws2_32-sys", |
241 | - ] |
242 | - |
243 | - [[package]] |
244 | name = "native-tls" |
245 | version = "0.2.11" |
246 | source = "registry+https://github.com/rust-lang/crates.io-index" |
247 | @@ -2554,23 +2491,12 @@ dependencies = [ |
248 | ] |
249 | |
250 | [[package]] |
251 | - name = "net2" |
252 | - version = "0.2.39" |
253 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
254 | - checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" |
255 | - dependencies = [ |
256 | - "cfg-if 0.1.10", |
257 | - "libc", |
258 | - "winapi 0.3.9", |
259 | - ] |
260 | - |
261 | - [[package]] |
262 | name = "nix" |
263 | - version = "0.24.3" |
264 | + version = "0.27.1" |
265 | source = "registry+https://github.com/rust-lang/crates.io-index" |
266 | - checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" |
267 | + checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" |
268 | dependencies = [ |
269 | - "bitflags 1.3.2", |
270 | + "bitflags 2.4.1", |
271 | "cfg-if 1.0.0", |
272 | "libc", |
273 | "memoffset", |
274 | @@ -2594,20 +2520,21 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" |
275 | |
276 | [[package]] |
277 | name = "notify" |
278 | - version = "4.0.17" |
279 | + version = "6.1.1" |
280 | source = "registry+https://github.com/rust-lang/crates.io-index" |
281 | - checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" |
282 | + checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" |
283 | dependencies = [ |
284 | - "bitflags 1.3.2", |
285 | + "bitflags 2.4.1", |
286 | + "crossbeam-channel", |
287 | "filetime", |
288 | - "fsevent", |
289 | "fsevent-sys", |
290 | "inotify", |
291 | + "kqueue", |
292 | "libc", |
293 | - "mio 0.6.23", |
294 | - "mio-extras", |
295 | + "log", |
296 | + "mio", |
297 | "walkdir", |
298 | - "winapi 0.3.9", |
299 | + "windows-sys 0.48.0", |
300 | ] |
301 | |
302 | [[package]] |
303 | @@ -3265,7 +3192,7 @@ dependencies = [ |
304 | "spin 0.5.2", |
305 | "untrusted 0.7.1", |
306 | "web-sys", |
307 | - "winapi 0.3.9", |
308 | + "winapi", |
309 | ] |
310 | |
311 | [[package]] |
312 | @@ -3699,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" |
313 | checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" |
314 | dependencies = [ |
315 | "libc", |
316 | - "winapi 0.3.9", |
317 | + "winapi", |
318 | ] |
319 | |
320 | [[package]] |
321 | @@ -3978,7 +3905,7 @@ dependencies = [ |
322 | "backtrace", |
323 | "bytes", |
324 | "libc", |
325 | - "mio 0.8.10", |
326 | + "mio", |
327 | "num_cpus", |
328 | "parking_lot", |
329 | "pin-project-lite", |
330 | @@ -4379,12 +4306,6 @@ dependencies = [ |
331 | |
332 | [[package]] |
333 | name = "winapi" |
334 | - version = "0.2.8" |
335 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
336 | - checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" |
337 | - |
338 | - [[package]] |
339 | - name = "winapi" |
340 | version = "0.3.9" |
341 | source = "registry+https://github.com/rust-lang/crates.io-index" |
342 | checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" |
343 | @@ -4394,12 +4315,6 @@ dependencies = [ |
344 | ] |
345 | |
346 | [[package]] |
347 | - name = "winapi-build" |
348 | - version = "0.1.1" |
349 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
350 | - checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" |
351 | - |
352 | - [[package]] |
353 | name = "winapi-i686-pc-windows-gnu" |
354 | version = "0.4.0" |
355 | source = "registry+https://github.com/rust-lang/crates.io-index" |
356 | @@ -4411,7 +4326,7 @@ version = "0.1.6" |
357 | source = "registry+https://github.com/rust-lang/crates.io-index" |
358 | checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" |
359 | dependencies = [ |
360 | - "winapi 0.3.9", |
361 | + "winapi", |
362 | ] |
363 | |
364 | [[package]] |
365 | @@ -4572,16 +4487,6 @@ dependencies = [ |
366 | ] |
367 | |
368 | [[package]] |
369 | - name = "ws2_32-sys" |
370 | - version = "0.2.1" |
371 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
372 | - checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" |
373 | - dependencies = [ |
374 | - "winapi 0.2.8", |
375 | - "winapi-build", |
376 | - ] |
377 | - |
378 | - [[package]] |
379 | name = "xdg" |
380 | version = "2.5.2" |
381 | source = "registry+https://github.com/rust-lang/crates.io-index" |
382 | diff --git a/mailpot/Cargo.toml b/mailpot/Cargo.toml |
383 | index 7e995aa..83caa19 100644 |
384 | --- a/mailpot/Cargo.toml |
385 | +++ b/mailpot/Cargo.toml |
386 | @@ -18,7 +18,7 @@ anyhow = "1.0.58" |
387 | chrono = { version = "^0.4", features = ["serde", ] } |
388 | jsonschema = { version = "0.17", default-features = false } |
389 | log = "0.4" |
390 | - melib = { default-features = false, features = ["mbox", "smtp", "unicode-algorithms", "maildir"], git = "https://git.meli-email.org/meli/meli.git", rev = "64e60cb" } |
391 | + melib = { version = "0.8.6", default-features = false, features = ["mbox", "smtp", "maildir"] } |
392 | minijinja = { version = "0.31.0", features = ["source", ] } |
393 | percent-encoding = { version = "^2.1" } |
394 | rusqlite = { version = "^0.30", features = ["bundled", "functions", "trace", "hooks", "serde_json", "array", "chrono", "unlock_notify"] } |