From e8491172b1955b7c62b3bf6c532ca66f389cae9e Mon Sep 17 00:00:00 2001 From: mdecimus <11444311+mdecimus@users.noreply.github.com> Date: Wed, 5 Nov 2025 17:45:07 +0100 Subject: [PATCH] Cargo.toml fixes --- Cargo.lock | 393 +++++------------------ crates/cli/Cargo.toml | 1 - crates/common/Cargo.toml | 1 - crates/dav-proto/Cargo.toml | 2 +- crates/dav-proto/src/parser/header.rs | 16 +- crates/dav-proto/src/parser/property.rs | 27 +- crates/dav-proto/src/parser/tokenizer.rs | 14 +- crates/dav/Cargo.toml | 1 - crates/directory/Cargo.toml | 1 - crates/email/Cargo.toml | 1 - crates/groupware/Cargo.toml | 1 - crates/http-proto/Cargo.toml | 1 - crates/http/Cargo.toml | 1 - crates/imap-proto/Cargo.toml | 1 - crates/imap/Cargo.toml | 1 - crates/jmap-proto/Cargo.lock | 159 --------- crates/jmap-proto/Cargo.toml | 1 - crates/jmap/Cargo.toml | 1 - crates/main/Cargo.toml | 1 - crates/managesieve/Cargo.toml | 1 - crates/migration/Cargo.toml | 1 - crates/nlp/Cargo.toml | 1 - crates/pop3/Cargo.toml | 1 - crates/services/Cargo.toml | 1 - crates/smtp/Cargo.toml | 1 - crates/spam-filter/Cargo.toml | 1 - crates/store/Cargo.toml | 2 - crates/store/src/backend/elastic/main.rs | 3 +- crates/trc/Cargo.toml | 1 - crates/types/Cargo.toml | 1 - crates/utils/Cargo.toml | 1 - tests/Cargo.toml | 4 +- 32 files changed, 110 insertions(+), 533 deletions(-) delete mode 100644 crates/jmap-proto/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock index 1dd22615..c1d3885b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -278,19 +278,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "async-compression" -version = "0.4.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0" -dependencies = [ - "compression-codecs", - "compression-core", - "futures-core", - "pin-project-lite", - "tokio", -] - [[package]] name = "async-lock" version = "3.4.1" @@ -397,7 +384,7 @@ checksum = "07a9b245ba0739fc90935094c29adbaee3f977218b5fb95e822e261cda7f56a3" dependencies = [ "http 1.3.1", "log", - "rustls 0.23.34", + "rustls 0.23.35", "serde", "serde_json", "url", @@ -455,8 +442,8 @@ dependencies = [ "pin-project", "quick-xml 0.31.0", "rand 0.8.5", - "reqwest 0.12.24", - "rustc_version 0.4.1", + "reqwest", + "rustc_version", "serde", "serde_json", "sha2 0.10.9", @@ -549,12 +536,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "022dfe9eb35f19ebbcb51e0b40a5ab759f46ad60cadf7297e0bd085afb50e076" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.13.1" @@ -614,7 +595,7 @@ version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ - "bitflags 2.10.0", + "bitflags", "cexpr", "clang-sys", "itertools 0.13.0", @@ -634,7 +615,7 @@ version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.10.0", + "bitflags", "cexpr", "clang-sys", "itertools 0.13.0", @@ -692,12 +673,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.10.0" @@ -1109,7 +1084,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -1219,11 +1194,11 @@ dependencies = [ "pwhash", "rcgen 0.12.1", "regex", - "reqwest 0.12.24", + "reqwest", "ring", "rkyv", "rsa", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", @@ -1262,23 +1237,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "compression-codecs" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23" -dependencies = [ - "compression-core", - "flate2", - "memchr", -] - -[[package]] -name = "compression-core" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" - [[package]] name = "concurrent-queue" version = "2.5.0" @@ -1578,7 +1536,7 @@ dependencies = [ "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "rustc_version 0.4.1", + "rustc_version", "subtle", "zeroize", ] @@ -1594,16 +1552,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - [[package]] name = "darling" version = "0.20.11" @@ -1624,20 +1572,6 @@ dependencies = [ "darling_macro 0.21.3", ] -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - [[package]] name = "darling_core" version = "0.20.11" @@ -1648,7 +1582,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.108", ] @@ -1662,21 +1596,10 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.108", ] -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.20.11" @@ -1921,9 +1844,9 @@ dependencies = [ "proc_macros", "pwhash", "regex", - "reqwest 0.12.24", + "reqwest", "rkyv", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "scrypt", "serde", @@ -2009,7 +1932,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fb12339544bc327ee50abbb4f522e3367216f5ccf6240c01ca4018d17a88ea2" dependencies = [ "hickory-client", - "reqwest 0.12.24", + "reqwest", "serde", "serde_json", "serde_urlencoded", @@ -2131,26 +2054,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -[[package]] -name = "elasticsearch" -version = "8.5.0-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d9bd57d914cc66ce878f098f63ed7b5d5b64c30644a5adb950b008f874a6c6" -dependencies = [ - "base64 0.11.0", - "bytes", - "dyn-clone", - "lazy_static", - "percent-encoding", - "reqwest 0.11.27", - "rustc_version 0.2.3", - "serde", - "serde_json", - "serde_with 1.14.0", - "url", - "void", -] - [[package]] name = "elliptic-curve" version = "0.13.8" @@ -2985,7 +2888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62d7684f766b0f96344be88c023f9b6650039aea09d526b4974cce302eb61b1" dependencies = [ "async-trait", - "bitflags 2.10.0", + "bitflags", "bytes", "cfg-if", "data-encoding", @@ -2998,7 +2901,7 @@ dependencies = [ "once_cell", "rand 0.9.2", "ring", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "thiserror 2.0.17", "time", @@ -3024,7 +2927,7 @@ dependencies = [ "parking_lot", "rand 0.9.2", "resolv-conf", - "rustls 0.23.34", + "rustls 0.23.35", "smallvec", "thiserror 2.0.17", "tokio", @@ -3252,7 +3155,6 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.27", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -3312,7 +3214,7 @@ dependencies = [ "http 1.3.1", "hyper 1.7.0", "hyper-util", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "tokio", "tokio-rustls 0.26.4", @@ -3521,7 +3423,7 @@ dependencies = [ "nlp", "parking_lot", "rand 0.9.2", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "store", "tokio", @@ -3681,9 +3583,9 @@ dependencies = [ [[package]] name = "iri-string" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" dependencies = [ "memchr", "serde", @@ -3824,7 +3726,7 @@ dependencies = [ "p256", "pkcs8", "rand 0.9.2", - "reqwest 0.12.24", + "reqwest", "rkyv", "rsa", "serde", @@ -3858,8 +3760,8 @@ dependencies = [ "futures-util", "maybe-async", "parking_lot", - "reqwest 0.12.24", - "rustls 0.23.34", + "reqwest", + "rustls 0.23.35", "rustls-pki-types", "serde", "serde_json", @@ -3880,8 +3782,8 @@ dependencies = [ "futures-util", "maybe-async", "parking_lot", - "reqwest 0.12.24", - "rustls 0.23.34", + "reqwest", + "rustls 0.23.35", "rustls-pki-types", "serde", "serde_json", @@ -4083,7 +3985,7 @@ dependencies = [ "log", "nom", "percent-encoding", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-native-certs 0.8.2", "thiserror 2.0.17", "tokio", @@ -4152,7 +4054,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ - "bitflags 2.10.0", + "bitflags", "libc", "redox_syscall", ] @@ -4344,7 +4246,7 @@ dependencies = [ "base64 0.22.1", "gethostname", "md5 0.8.0", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "smtp-proto", "tokio", @@ -4369,7 +4271,7 @@ dependencies = [ "md5 0.8.0", "parking_lot", "rkyv", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "sieve-rs", "store", @@ -4547,7 +4449,7 @@ dependencies = [ "equivalent", "parking_lot", "portable-atomic", - "rustc_version 0.4.1", + "rustc_version", "smallvec", "tagptr", "uuid", @@ -4609,7 +4511,7 @@ dependencies = [ "pem", "percent-encoding", "rand 0.9.2", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "serde", "serde_json", @@ -4630,7 +4532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbb9f371618ce723f095c61fbcdc36e8936956d2b62832f9c7648689b338e052" dependencies = [ "base64 0.22.1", - "bitflags 2.10.0", + "bitflags", "btoi", "byteorder", "bytes", @@ -4680,7 +4582,7 @@ version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ - "bitflags 2.10.0", + "bitflags", "cfg-if", "cfg_aliases", "libc", @@ -4938,7 +4840,7 @@ version = "0.10.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654" dependencies = [ - "bitflags 2.10.0", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -5000,7 +4902,7 @@ dependencies = [ "bytes", "http 1.3.1", "opentelemetry", - "reqwest 0.12.24", + "reqwest", "tracing", ] @@ -5017,7 +4919,7 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk", "prost", - "reqwest 0.12.24", + "reqwest", "thiserror 2.0.17", "tokio", "tonic", @@ -5455,7 +5357,7 @@ dependencies = [ "imap", "mail-parser", "mail-send", - "rustls 0.23.34", + "rustls 0.23.35", "store", "tokio", "tokio-rustls 0.26.4", @@ -5807,7 +5709,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.1.1", - "rustls 0.23.34", + "rustls 0.23.35", "socket2 0.6.1", "thiserror 2.0.17", "tokio", @@ -5828,7 +5730,7 @@ dependencies = [ "rand 0.9.2", "ring", "rustc-hash 2.1.1", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "rustls-platform-verifier", "slab", @@ -6163,7 +6065,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rand 0.9.2", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-native-certs 0.8.2", "ryu", "sha1_smol", @@ -6181,7 +6083,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.10.0", + "bitflags", ] [[package]] @@ -6264,49 +6166,6 @@ dependencies = [ "bytecheck", ] -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "async-compression", - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.27", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - [[package]] name = "reqwest" version = "0.12.24" @@ -6331,12 +6190,12 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-rustls 0.26.4", "tokio-util", @@ -6472,7 +6331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468" dependencies = [ "base64 0.22.1", - "bitflags 2.10.0", + "bitflags", "serde", "serde_derive", "unicode-ident", @@ -6531,7 +6390,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" dependencies = [ - "bitflags 2.10.0", + "bitflags", "fallible-iterator 0.3.0", "fallible-streaming-iterator", "hashlink", @@ -6614,22 +6473,13 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.27", + "semver", ] [[package]] @@ -6647,7 +6497,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ - "bitflags 2.10.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -6668,9 +6518,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.34" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "log", "once_cell", @@ -6757,7 +6607,7 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-native-certs 0.8.2", "rustls-platform-verifier-android", "rustls-webpki 0.103.8", @@ -6895,9 +6745,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" +checksum = "1317c3bf3e7df961da95b0a56a172a02abead31276215a0497241a7624b487ce" dependencies = [ "dyn-clone", "ref-cast", @@ -6981,7 +6831,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.10.0", + "bitflags", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -6994,7 +6844,7 @@ version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ - "bitflags 2.10.0", + "bitflags", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -7011,27 +6861,12 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "sequoia-openpgp" version = "2.0.0" @@ -7198,16 +7033,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" -dependencies = [ - "serde", - "serde_with_macros 1.5.2", -] - [[package]] name = "serde_with" version = "3.15.1" @@ -7220,25 +7045,13 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.12.0", "schemars 0.9.0", - "schemars 1.0.4", + "schemars 1.0.5", "serde_core", "serde_json", - "serde_with_macros 3.15.1", + "serde_with_macros", "time", ] -[[package]] -name = "serde_with_macros" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" -dependencies = [ - "darling 0.13.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "serde_with_macros" version = "3.15.1" @@ -7309,7 +7122,7 @@ dependencies = [ "mail-parser", "memory-stats", "p256", - "reqwest 0.12.24", + "reqwest", "rsa", "serde", "serde_json", @@ -7533,9 +7346,9 @@ dependencies = [ "rand 0.9.2", "rayon", "regex", - "reqwest 0.12.24", + "reqwest", "rkyv", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", @@ -7624,7 +7437,7 @@ dependencies = [ "mail-send", "nlp", "psl", - "reqwest 0.12.24", + "reqwest", "sha1", "sha2 0.10.9", "smtp-proto", @@ -7676,7 +7489,7 @@ version = "36.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc7a63b8276b54e51bfffe3d85da56e7906b2dcfcb29018a8ab666c06734c1a" dependencies = [ - "rustc_version 0.4.1", + "rustc_version", "rustversion", "sha2-const-stable", "stabby-macros", @@ -7745,7 +7558,7 @@ dependencies = [ "prettytable-rs", "pwhash", "rand 0.9.2", - "reqwest 0.12.24", + "reqwest", "rpassword", "serde", "serde_json", @@ -7774,7 +7587,6 @@ dependencies = [ "compact_str", "deadpool 0.12.3", "deadpool-postgres", - "elasticsearch", "farmhash", "flate2", "foundationdb", @@ -7792,14 +7604,14 @@ dependencies = [ "rdkafka", "redis", "regex", - "reqwest 0.12.24", + "reqwest", "ring", "rkyv", "roaring", "rocksdb", "rusqlite", "rust-s3", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "serde", "serde_json", @@ -7836,12 +7648,6 @@ dependencies = [ "unicode-properties", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -7876,12 +7682,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -7902,27 +7702,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tagptr" version = "0.2.0" @@ -7999,10 +7778,10 @@ dependencies = [ "pop3", "quick-xml 0.38.3", "rayon", - "reqwest 0.12.24", + "reqwest", "ring", "rkyv", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", @@ -8228,7 +8007,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.34", + "rustls 0.23.35", "tokio", ] @@ -8251,7 +8030,7 @@ checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" dependencies = [ "futures-util", "log", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "tokio", "tokio-rustls 0.26.4", @@ -8397,7 +8176,7 @@ dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -8409,7 +8188,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ - "bitflags 2.10.0", + "bitflags", "bytes", "futures-util", "http 1.3.1", @@ -8519,7 +8298,7 @@ dependencies = [ "mail-auth", "mail-parser", "parking_lot", - "reqwest 0.12.24", + "reqwest", "rkyv", "rtrb", "serde", @@ -8561,7 +8340,7 @@ dependencies = [ "httparse", "log", "rand 0.9.2", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "sha1", "thiserror 2.0.17", @@ -8805,10 +8584,10 @@ dependencies = [ "rand 0.9.2", "rcgen 0.14.5", "regex", - "reqwest 0.12.24", + "reqwest", "ring", "rkyv", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", @@ -8889,12 +8668,6 @@ version = "0.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "waker-fn" version = "1.2.0" @@ -9047,12 +8820,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.11" @@ -9626,7 +9393,7 @@ dependencies = [ "phf 0.13.1", "rand 0.8.5", "ref-cast", - "rustc_version 0.4.1", + "rustc_version", "serde", "serde_json", "socket2 0.5.10", @@ -9696,7 +9463,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_with 3.15.1", + "serde_with", "serde_yaml", "tracing", "uhlc", @@ -9778,7 +9545,7 @@ dependencies = [ "flume", "futures", "quinn", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "rustls-pki-types", "rustls-webpki 0.102.8", @@ -9810,7 +9577,7 @@ dependencies = [ "async-trait", "base64 0.22.1", "quinn", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "rustls-webpki 0.102.8", "secrecy", @@ -9853,7 +9620,7 @@ checksum = "a810a4ba44011cc4c75713eadcf1a03fb2e22f0907d62f9b12c04d42ba1d596f" dependencies = [ "async-trait", "base64 0.22.1", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pemfile 2.2.0", "rustls-pki-types", "rustls-webpki 0.102.8", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index e2fcd949..f5fe9b36 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -8,7 +8,6 @@ homepage = "https://github.com/stalwartlabs/cli" version = "0.14.1" edition = "2024" readme = "README.md" -resolver = "2" [dependencies] jmap-client = { version = "0.3", features = ["async"] } diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index bccc828b..c373afcf 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -2,7 +2,6 @@ name = "common" version = "0.14.1" edition = "2024" -resolver = "2" build = "build.rs" [dependencies] diff --git a/crates/dav-proto/Cargo.toml b/crates/dav-proto/Cargo.toml index 62144a75..df390029 100644 --- a/crates/dav-proto/Cargo.toml +++ b/crates/dav-proto/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dav-proto" version = "0.14.1" -edition = "2021" +edition = "2024" [dependencies] trc = { path = "../trc" } diff --git a/crates/dav-proto/src/parser/header.rs b/crates/dav-proto/src/parser/header.rs index 4f2ba1bb..dd09a852 100644 --- a/crates/dav-proto/src/parser/header.rs +++ b/crates/dav-proto/src/parser/header.rs @@ -85,16 +85,14 @@ impl<'x> RequestHeaders<'x> { }, "Accept" => { for value in value.split(',') { - if value.trim().starts_with("text/vcard") { - if let Some(version) = value.split_once("version=") - .and_then(|(_, version)| VCardVersion::try_parse(version.trim())) { - if let Some(max_vcard_version) = &mut self.max_vcard_version { - if version > *max_vcard_version { - *max_vcard_version = version; - } - } else { - self.max_vcard_version = Some(version); + if value.trim().starts_with("text/vcard") && let Some(version) = value.split_once("version=") + .and_then(|(_, version)| VCardVersion::try_parse(version.trim())) { + if let Some(max_vcard_version) = &mut self.max_vcard_version { + if version > *max_vcard_version { + *max_vcard_version = version; } + } else { + self.max_vcard_version = Some(version); } } } diff --git a/crates/dav-proto/src/parser/property.rs b/crates/dav-proto/src/parser/property.rs index 8994fff2..cc77c6bc 100644 --- a/crates/dav-proto/src/parser/property.rs +++ b/crates/dav-proto/src/parser/property.rs @@ -4,24 +4,24 @@ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL */ -use super::{tokenizer::Tokenizer, DavParser, RawElement, Token, XmlValueParser}; +use super::{DavParser, RawElement, Token, XmlValueParser, tokenizer::Tokenizer}; use crate::schema::{ + Attribute, AttributeValue, Element, NamedElement, Namespace, property::{ CalDavProperty, CalDavPropertyName, CalendarData, CardDavProperty, CardDavPropertyName, Comp, DavProperty, DavValue, PrincipalProperty, ResourceType, WebDavProperty, }, request::{DavPropertyValue, VCardPropertyWithGroup}, response::List, - Attribute, AttributeValue, Element, NamedElement, Namespace, }; use calcard::{ + Entry, Parser, common::{IanaParse, PartialDateTime}, icalendar::{ICalendar, ICalendarComponentType, ICalendarParameterName, ICalendarProperty}, vcard::{VCardParameterName, VCardProperty}, - Entry, Parser, }; use mail_parser::DateTime; -use types::{dead_property::DeadProperty, TimeRange}; +use types::{TimeRange, dead_property::DeadProperty}; impl Tokenizer<'_> { pub(crate) fn collect_properties( @@ -200,16 +200,15 @@ impl Tokenizer<'_> { if depth == 0 { break; } - if let Some(last_component) = components.pop() { - if last_component != ICalendarComponentType::VCalendar - && !matches!(data.properties.last(), Some(CalDavPropertyName { component: Some(component), .. }) if component == &last_component) - { - data.properties.push(CalDavPropertyName { - component: Some(last_component), - name: None, - no_value: false, - }); - } + if let Some(last_component) = components.pop() + && last_component != ICalendarComponentType::VCalendar + && !matches!(data.properties.last(), Some(CalDavPropertyName { component: Some(component), .. }) if component == &last_component) + { + data.properties.push(CalDavPropertyName { + component: Some(last_component), + name: None, + no_value: false, + }); } } Token::Eof => { diff --git a/crates/dav-proto/src/parser/tokenizer.rs b/crates/dav-proto/src/parser/tokenizer.rs index 325e5710..156669b2 100644 --- a/crates/dav-proto/src/parser/tokenizer.rs +++ b/crates/dav-proto/src/parser/tokenizer.rs @@ -7,9 +7,9 @@ use super::{Error, RawElement, Token, UnexpectedToken, XmlValueParser}; use crate::schema::{Attribute, AttributeValue, Element, NamedElement, Namespace}; use quick_xml::{ - events::{attributes::AttrError, Event}, - name::ResolveResult, NsReader, + events::{Event, attributes::AttrError}, + name::ResolveResult, }; pub struct Tokenizer<'x> { @@ -98,7 +98,7 @@ impl<'x> Tokenizer<'x> { ResolveResult::Unknown(p) => { return Err(Error::Xml(Box::new(quick_xml::Error::Namespace( quick_xml::name::NamespaceError::UnknownPrefix(p), - )))) + )))); } _ => { return Ok(Token::UnknownElement(RawElement::new(tag))); @@ -251,10 +251,10 @@ impl<'x> Tokenizer<'x> { loop { match self.token()? { Token::ElementStart { name, .. } => { - if depth == 1 { - if let Ok(element) = T::try_from(name) { - elements.push(element); - } + if depth == 1 + && let Ok(element) = T::try_from(name) + { + elements.push(element); } depth += 1; diff --git a/crates/dav/Cargo.toml b/crates/dav/Cargo.toml index a15731fb..eda8b60d 100644 --- a/crates/dav/Cargo.toml +++ b/crates/dav/Cargo.toml @@ -2,7 +2,6 @@ name = "dav" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] dav-proto = { path = "../dav-proto" } diff --git a/crates/directory/Cargo.toml b/crates/directory/Cargo.toml index 575b8c8a..57fa1843 100644 --- a/crates/directory/Cargo.toml +++ b/crates/directory/Cargo.toml @@ -2,7 +2,6 @@ name = "directory" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } diff --git a/crates/email/Cargo.toml b/crates/email/Cargo.toml index c46c6858..a70a6314 100644 --- a/crates/email/Cargo.toml +++ b/crates/email/Cargo.toml @@ -2,7 +2,6 @@ name = "email" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } diff --git a/crates/groupware/Cargo.toml b/crates/groupware/Cargo.toml index e9a3f206..50173baa 100644 --- a/crates/groupware/Cargo.toml +++ b/crates/groupware/Cargo.toml @@ -2,7 +2,6 @@ name = "groupware" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } diff --git a/crates/http-proto/Cargo.toml b/crates/http-proto/Cargo.toml index a92f349c..7f331fb4 100644 --- a/crates/http-proto/Cargo.toml +++ b/crates/http-proto/Cargo.toml @@ -2,7 +2,6 @@ name = "http_proto" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] common = { path = "../common" } diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index ecb564ef..b8f3d267 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -2,7 +2,6 @@ name = "http" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] store = { path = "../store" } diff --git a/crates/imap-proto/Cargo.toml b/crates/imap-proto/Cargo.toml index 20fb96d6..6635fcf5 100644 --- a/crates/imap-proto/Cargo.toml +++ b/crates/imap-proto/Cargo.toml @@ -2,7 +2,6 @@ name = "imap_proto" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] types = { path = "../types" } diff --git a/crates/imap/Cargo.toml b/crates/imap/Cargo.toml index 9bca13e6..1a07c6a9 100644 --- a/crates/imap/Cargo.toml +++ b/crates/imap/Cargo.toml @@ -2,7 +2,6 @@ name = "imap" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] imap_proto = { path = "../imap-proto" } diff --git a/crates/jmap-proto/Cargo.lock b/crates/jmap-proto/Cargo.lock deleted file mode 100644 index 4cfd8d9d..00000000 --- a/crates/jmap-proto/Cargo.lock +++ /dev/null @@ -1,159 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "serde", - "version_check", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "fast-float" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jmap-parser" -version = "0.1.0" -dependencies = [ - "ahash", - "fast-float", - "serde", - "serde_json", - "utils", -] - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "proc-macro2" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "utils" -version = "0.1.0" -dependencies = [ - "serde", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" diff --git a/crates/jmap-proto/Cargo.toml b/crates/jmap-proto/Cargo.toml index a4bdb867..439e49e5 100644 --- a/crates/jmap-proto/Cargo.toml +++ b/crates/jmap-proto/Cargo.toml @@ -2,7 +2,6 @@ name = "jmap_proto" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } diff --git a/crates/jmap/Cargo.toml b/crates/jmap/Cargo.toml index 702d550e..b941e590 100644 --- a/crates/jmap/Cargo.toml +++ b/crates/jmap/Cargo.toml @@ -2,7 +2,6 @@ name = "jmap" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] store = { path = "../store" } diff --git a/crates/main/Cargo.toml b/crates/main/Cargo.toml index 9c61dede..3e93e90c 100644 --- a/crates/main/Cargo.toml +++ b/crates/main/Cargo.toml @@ -9,7 +9,6 @@ categories = ["email"] license = "AGPL-3.0-only OR LicenseRef-SEL" version = "0.14.1" edition = "2024" -resolver = "2" [[bin]] name = "stalwart" diff --git a/crates/managesieve/Cargo.toml b/crates/managesieve/Cargo.toml index 1cc83e88..665ffeed 100644 --- a/crates/managesieve/Cargo.toml +++ b/crates/managesieve/Cargo.toml @@ -2,7 +2,6 @@ name = "managesieve" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] imap_proto = { path = "../imap-proto" } diff --git a/crates/migration/Cargo.toml b/crates/migration/Cargo.toml index f8cb0003..bb139909 100644 --- a/crates/migration/Cargo.toml +++ b/crates/migration/Cargo.toml @@ -2,7 +2,6 @@ name = "migration" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } diff --git a/crates/nlp/Cargo.toml b/crates/nlp/Cargo.toml index d6bb3561..8bee0e40 100644 --- a/crates/nlp/Cargo.toml +++ b/crates/nlp/Cargo.toml @@ -2,7 +2,6 @@ name = "nlp" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } diff --git a/crates/pop3/Cargo.toml b/crates/pop3/Cargo.toml index 81614956..4beeae53 100644 --- a/crates/pop3/Cargo.toml +++ b/crates/pop3/Cargo.toml @@ -2,7 +2,6 @@ name = "pop3" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] store = { path = "../store" } diff --git a/crates/services/Cargo.toml b/crates/services/Cargo.toml index a9fe39c3..dc06f45d 100644 --- a/crates/services/Cargo.toml +++ b/crates/services/Cargo.toml @@ -2,7 +2,6 @@ name = "services" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] store = { path = "../store" } diff --git a/crates/smtp/Cargo.toml b/crates/smtp/Cargo.toml index 760592d9..8d5c9b5f 100644 --- a/crates/smtp/Cargo.toml +++ b/crates/smtp/Cargo.toml @@ -9,7 +9,6 @@ categories = ["email"] license = "AGPL-3.0-only OR LicenseRef-SEL" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] store = { path = "../store" } diff --git a/crates/spam-filter/Cargo.toml b/crates/spam-filter/Cargo.toml index 0c60d77b..0befd4e6 100644 --- a/crates/spam-filter/Cargo.toml +++ b/crates/spam-filter/Cargo.toml @@ -2,7 +2,6 @@ name = "spam-filter" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml index 7fe4a7bd..45429fe5 100644 --- a/crates/store/Cargo.toml +++ b/crates/store/Cargo.toml @@ -2,7 +2,6 @@ name = "store" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } @@ -58,7 +57,6 @@ rdkafka = { version = "0.38", features = ["cmake-build"], optional = true } tokio = { version = "1.47", features = ["full"] } [features] - # Data Stores rocks = ["rocksdb", "rayon", "num_cpus"] sqlite = ["rusqlite", "rayon", "r2d2", "num_cpus", "lru-cache"] diff --git a/crates/store/src/backend/elastic/main.rs b/crates/store/src/backend/elastic/main.rs index dfe13280..75596dce 100644 --- a/crates/store/src/backend/elastic/main.rs +++ b/crates/store/src/backend/elastic/main.rs @@ -4,11 +4,10 @@ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL */ -use std::time::Duration; - use crate::backend::elastic::ElasticSearchStore; use reqwest::Client; use serde_json::json; +use std::time::Duration; use utils::config::{Config, http::build_http_client, utils::AsKey}; pub(crate) static INDEX_NAMES: &[&str] = &["stalwart_email"]; diff --git a/crates/trc/Cargo.toml b/crates/trc/Cargo.toml index 9caa8340..29f8f41a 100644 --- a/crates/trc/Cargo.toml +++ b/crates/trc/Cargo.toml @@ -2,7 +2,6 @@ name = "trc" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] event_macro = { path = "./event-macro" } diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml index 4c67e754..73976a91 100644 --- a/crates/types/Cargo.toml +++ b/crates/types/Cargo.toml @@ -2,7 +2,6 @@ name = "types" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] utils = { path = "../utils" } diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index bcfd8666..ec6f5391 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -2,7 +2,6 @@ name = "utils" version = "0.14.1" edition = "2024" -resolver = "2" [dependencies] trc = { path = "../trc" } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 07e255ed..70ea39f2 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -2,10 +2,9 @@ name = "tests" version = "0.14.1" edition = "2024" -resolver = "2" [features] -default = ["sqlite", "postgres", "mysql", "rocks", "elastic", "s3", "redis", "nats", "azure", "foundationdb"] +default = ["sqlite", "postgres", "mysql", "rocks", "s3", "redis", "nats", "azure", "foundationdb"] #default = ["sqlite", "postgres", "mysql", "rocks", "s3", "redis"] #default = ["rocks", "redis", "s3"] sqlite = ["store/sqlite"] @@ -13,7 +12,6 @@ foundationdb = ["store/foundation", "common/foundation"] postgres = ["store/postgres"] mysql = ["store/mysql"] rocks = ["store/rocks"] -elastic = ["store/elastic"] s3 = ["store/s3"] redis = ["store/redis"] nats = ["store/nats"]