From bffcff1037754e0399c72af5961af5cb466ee5f7 Mon Sep 17 00:00:00 2001 From: aumetra Date: Wed, 18 Oct 2023 21:30:06 +0200 Subject: [PATCH] use typed-builder in kitsune-cache --- Cargo.lock | 206 +++++++++++----------- Cargo.toml | 6 +- crates/kitsune-cache/Cargo.toml | 4 +- crates/kitsune-cache/src/redis.rs | 17 +- crates/kitsune-captcha/Cargo.toml | 4 +- crates/kitsune-core/Cargo.toml | 6 +- crates/kitsune-core/src/lib.rs | 1 - crates/kitsune-db/Cargo.toml | 2 +- crates/kitsune-email/Cargo.toml | 4 +- crates/kitsune-embed/Cargo.toml | 2 +- crates/kitsune-http-signatures/Cargo.toml | 2 +- crates/kitsune-messaging/Cargo.toml | 2 +- crates/kitsune-search/Cargo.toml | 2 +- crates/kitsune-storage/Cargo.toml | 2 +- kitsune/Cargo.toml | 4 +- lib/athena/Cargo.toml | 4 +- lib/speedy-uuid/Cargo.toml | 2 +- 17 files changed, 133 insertions(+), 137 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de0abebec..d9f29c1cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -413,9 +413,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.1" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" @@ -451,7 +451,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "typed-builder 0.16.2", + "typed-builder", ] [[package]] @@ -739,9 +739,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitflags_serde_shim" @@ -945,6 +945,16 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "chumsky" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d" +dependencies = [ + "hashbrown 0.12.3", + "stacker", +] + [[package]] name = "ciborium" version = "0.2.1" @@ -1578,7 +1588,7 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2268a214a6f118fce1838edba3d1561cf0e78d8de785475957a580a7f8c69d33" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "byteorder", "diesel_derives", "itoa", @@ -1723,9 +1733,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", "signature", @@ -2146,9 +2156,9 @@ dependencies = [ [[package]] name = "garde" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae9eba929c46323014c5ec1adf6d2fa94d68ff1947c489c165fcd7f216b34f2" +checksum = "94320acdd9159591d0f8079eb347fb52c2ffbe206b5214f6f4d482f2866e4d91" dependencies = [ "compact_str", "garde_derive", @@ -2161,9 +2171,9 @@ dependencies = [ [[package]] name = "garde_derive" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da663fa0f4a2bb40b93ee1b2f77656276b999df3b88574ddafe51d72fc1dfdd9" +checksum = "c3c617dc2454b80bcf7232a47efccdbd7aee2acb2a92a332b3ea7398dcc7f31d" dependencies = [ "proc-macro2", "quote", @@ -2501,16 +2511,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2814,7 +2824,7 @@ dependencies = [ "tracing", "tracing-error", "tracing-subscriber", - "typed-builder 0.16.2", + "typed-builder", "url", "utoipa", "utoipa-swagger-ui", @@ -2826,7 +2836,6 @@ version = "0.0.1-pre.3" dependencies = [ "async-trait", "deadpool-redis", - "derive_builder", "enum_dispatch", "moka", "redis", @@ -2835,6 +2844,7 @@ dependencies = [ "thiserror", "tokio", "tracing", + "typed-builder", ] [[package]] @@ -2850,7 +2860,7 @@ dependencies = [ "simd-json", "strum", "thiserror", - "typed-builder 0.16.2", + "typed-builder", ] [[package]] @@ -2937,7 +2947,7 @@ dependencies = [ "toml 0.8.2", "tower", "tracing", - "typed-builder 0.16.2", + "typed-builder", "url", "vergen", "zxcvbn", @@ -2962,7 +2972,7 @@ dependencies = [ "thiserror", "tokio", "tracing-log", - "typed-builder 0.16.2", + "typed-builder", ] [[package]] @@ -2974,7 +2984,7 @@ dependencies = [ "lettre", "mrml", "thiserror", - "typed-builder 0.16.2", + "typed-builder", ] [[package]] @@ -2992,7 +3002,7 @@ dependencies = [ "scraper", "smol_str", "thiserror", - "typed-builder 0.16.2", + "typed-builder", ] [[package]] @@ -3025,11 +3035,11 @@ dependencies = [ "pem", "pkcs8", "rayon", - "ring 0.17.3", + "ring 0.17.4", "thiserror", "time", "tokio", - "typed-builder 0.17.0", + "typed-builder", ] [[package]] @@ -3161,30 +3171,32 @@ dependencies = [ [[package]] name = "lettre" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d" +checksum = "d47084ad58f99c26816d174702f60e873f861fcef3f9bd6075b4ad2dd72d07d5" dependencies = [ "async-trait", "base64 0.21.4", + "chumsky", "email-encoding", "email_address", - "fastrand 1.9.0", + "fastrand 2.0.1", "futures-io", "futures-util", "hostname", "httpdate", - "idna 0.3.0", + "idna 0.4.0", "mime", "nom", "once_cell", "quoted_printable", "rustls", "rustls-pemfile", - "socket2 0.4.9", + "socket2 0.5.4", "tokio", "tokio-rustls", "tracing", + "url", "webpki-roots", ] @@ -3330,9 +3342,9 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -4052,9 +4064,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -4068,13 +4080,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -4452,6 +4464,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + [[package]] name = "pulldown-cmark" version = "0.9.3" @@ -4496,9 +4517,9 @@ dependencies = [ [[package]] name = "quoted_printable" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" [[package]] name = "radix_trie" @@ -4614,6 +4635,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -4627,9 +4657,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -4639,9 +4669,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -4704,9 +4734,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.3" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +checksum = "fce3045ffa7c981a6ee93f640b538952e155f1ae3a1a02b84547fc7a56b7059a" dependencies = [ "cc", "getrandom", @@ -4834,7 +4864,7 @@ version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -4849,7 +4879,7 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring 0.16.20", - "rustls-webpki 0.101.6", + "rustls-webpki", "sct", ] @@ -4874,16 +4904,6 @@ dependencies = [ "base64 0.21.4", ] -[[package]] -name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[package]] name = "rustls-webpki" version = "0.101.6" @@ -5023,7 +5043,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cssparser", "derive_more", "fxhash", @@ -5152,9 +5172,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ "base64 0.21.4", "chrono", @@ -5169,9 +5189,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling 0.20.3", "proc-macro2", @@ -5449,6 +5469,19 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -5519,9 +5552,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", @@ -5887,7 +5920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "async-compression", - "bitflags 2.4.0", + "bitflags 2.4.1", "bytes", "futures-core", "futures-util", @@ -6031,40 +6064,18 @@ dependencies = [ "utf-8", ] -[[package]] -name = "typed-builder" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16" -dependencies = [ - "typed-builder-macro 0.16.2", -] - [[package]] name = "typed-builder" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c6a006a6d3d6a6f143fda41cf4d1ad35110080687628c9f2117bd3cc7924f3" +source = "git+https://github.com/idanarye/rust-typed-builder.git?rev=fd1bd8336aeb0dc334060635e2a6a1d8dc329e3c#fd1bd8336aeb0dc334060635e2a6a1d8dc329e3c" dependencies = [ - "typed-builder-macro 0.17.0", -] - -[[package]] -name = "typed-builder-macro" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", + "typed-builder-macro", ] [[package]] name = "typed-builder-macro" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa054ee5e2346187d631d2f1d1fd3b33676772d6d03a2d84e1c5213b31674ee" +source = "git+https://github.com/idanarye/rust-typed-builder.git?rev=fd1bd8336aeb0dc334060635e2a6a1d8dc329e3c#fd1bd8336aeb0dc334060635e2a6a1d8dc329e3c" dependencies = [ "proc-macro2", "quote", @@ -6205,9 +6216,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "atomic", "getrandom", @@ -6382,12 +6393,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "whatlang" @@ -6447,10 +6455,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] diff --git a/Cargo.toml b/Cargo.toml index 871fb7d1f..42721c393 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,3 @@ -[profile.dev.package.backtrace] -opt-level = 3 - -[profile.dev.package.num-bigint-dig] -opt-level = 3 [profile.release] codegen-units = 1 @@ -42,3 +37,4 @@ version = "0.0.1-pre.3" [patch.crates-io] redis = { git = "https://github.com/aumetra/redis-rs.git", rev = "3c4ee09d432a69e1d87d66dcba14c519467c9b81" } +typed-builder = { git = "https://github.com/idanarye/rust-typed-builder.git", rev = "fd1bd8336aeb0dc334060635e2a6a1d8dc329e3c" } diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml index 186277f34..acf5a1061 100644 --- a/crates/kitsune-cache/Cargo.toml +++ b/crates/kitsune-cache/Cargo.toml @@ -4,9 +4,8 @@ edition.workspace = true version.workspace = true [dependencies] -async-trait = "0.1.73" +async-trait = "0.1.74" deadpool-redis = "0.13.0" -derive_builder = "0.12.0" enum_dispatch = "0.3.12" moka = { version = "0.12.1", features = ["sync"] } redis = "0.23.3" @@ -14,6 +13,7 @@ serde = "1.0.189" simd-json = "0.12.0" thiserror = "1.0.49" tracing = "0.1.39" +typed-builder = "0.17.0" [dev-dependencies] tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/crates/kitsune-cache/src/redis.rs b/crates/kitsune-cache/src/redis.rs index 703623d25..fa8926b3b 100644 --- a/crates/kitsune-cache/src/redis.rs +++ b/crates/kitsune-cache/src/redis.rs @@ -1,17 +1,16 @@ use super::{CacheBackend, CacheResult}; use async_trait::async_trait; -use derive_builder::Builder; use redis::AsyncCommands; use serde::{de::DeserializeOwned, Serialize}; use std::{fmt::Display, marker::PhantomData, time::Duration}; +use typed_builder::TypedBuilder; -#[derive(Builder)] -#[builder(pattern = "owned")] +#[derive(TypedBuilder)] pub struct Redis where K: ?Sized, { - #[builder(default = "\"DEFAULT-REDIS-CACHER\".into()")] + #[builder(default = "DEFAULT-REDIS-CACHER".into())] namespace: String, #[builder(setter(into))] prefix: String, @@ -19,9 +18,9 @@ where ttl: Duration, // Type phantom data - #[builder(setter(skip))] + #[builder(default, setter(skip))] _key: PhantomData, - #[builder(setter(skip))] + #[builder(default, setter(skip))] _value: PhantomData, } @@ -39,12 +38,6 @@ where .prefix(prefix) .ttl(ttl) .build() - .unwrap() - } - - #[must_use] - pub fn builder() -> RedisBuilder { - RedisBuilder::default() } fn compute_key(&self, key: impl Display) -> String { diff --git a/crates/kitsune-captcha/Cargo.toml b/crates/kitsune-captcha/Cargo.toml index d99209d63..a56ee3b9f 100644 --- a/crates/kitsune-captcha/Cargo.toml +++ b/crates/kitsune-captcha/Cargo.toml @@ -4,7 +4,7 @@ version.workspace = true edition.workspace = true [dependencies] -async-trait = "0.1.73" +async-trait = "0.1.74" enum_dispatch = "0.3.12" http = "0.2.9" kitsune-http-client = { path = "../kitsune-http-client" } @@ -13,4 +13,4 @@ serde_urlencoded = "0.7.1" simd-json = "0.12.0" strum = { version = "0.25.0", features = ["derive"] } thiserror = "1.0.49" -typed-builder = "0.16.2" +typed-builder = "0.17.0" diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml index 5d0ae8be1..51ba686dd 100644 --- a/crates/kitsune-core/Cargo.toml +++ b/crates/kitsune-core/Cargo.toml @@ -8,7 +8,7 @@ ammonia = "3.3.0" argon2 = "0.5.2" async-recursion = "1.0.5" async-stream = "0.3.5" -async-trait = "0.1.73" +async-trait = "0.1.74" athena = { path = "../../lib/athena" } autometrics = { version = "0.6.0", default-features = false } base64-simd = "0.8.0" @@ -20,7 +20,7 @@ diesel = "2.1.3" diesel-async = { version = "0.4.1", features = ["postgres"] } eyre = "0.6.8" futures-util = "0.3.28" -garde = { version = "0.15.0", default-features = false, features = [ +garde = { version = "0.16.0", default-features = false, features = [ "derive", "email", "email-idna", @@ -67,7 +67,7 @@ time = "0.3.30" tokio = { version = "1.33.0", features = ["macros", "rt"] } toml = { version = "0.8.2", default-features = false, features = ["parse"] } tracing = "0.1.39" -typed-builder = "0.16.2" +typed-builder = "0.17.0" url = "2.4.1" zxcvbn = { version = "2.2.2", default-features = false } diff --git a/crates/kitsune-core/src/lib.rs b/crates/kitsune-core/src/lib.rs index a4b49c94e..7c2d43e5e 100644 --- a/crates/kitsune-core/src/lib.rs +++ b/crates/kitsune-core/src/lib.rs @@ -94,7 +94,6 @@ where .redis_conn(pool.clone()) .ttl(Duration::from_secs(60)) // TODO: Parameterise this .build() - .expect("[Bug] Failed to build the Redis cache") .into() } }; diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml index bdb223515..ef7c83e2d 100644 --- a/crates/kitsune-db/Cargo.toml +++ b/crates/kitsune-db/Cargo.toml @@ -25,4 +25,4 @@ speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] } thiserror = "1.0.49" tokio = { version = "1.33.0", features = ["rt"] } tracing-log = "0.1.3" -typed-builder = "0.16.2" +typed-builder = "0.17.0" diff --git a/crates/kitsune-email/Cargo.toml b/crates/kitsune-email/Cargo.toml index 54d4a5951..87f907ca9 100644 --- a/crates/kitsune-email/Cargo.toml +++ b/crates/kitsune-email/Cargo.toml @@ -9,7 +9,7 @@ ignored = ["askama_axum"] # See reason below. [dependencies] askama = "0.12.1" askama_axum = "0.3.0" # Damn it, cargo. Because "kitsune" uses "askama" with the axum feature, we have to have the crate available here as well.. -lettre = { version = "0.10.4", default-features = false, features = [ +lettre = { version = "0.11.0", default-features = false, features = [ "builder", "hostname", "pool", @@ -24,4 +24,4 @@ mrml = { version = "2.0.0-rc4", default-features = false, features = [ "render", ] } thiserror = "1.0.49" -typed-builder = "0.16.2" +typed-builder = "0.17.0" diff --git a/crates/kitsune-embed/Cargo.toml b/crates/kitsune-embed/Cargo.toml index 0c8de133c..18c8bf173 100644 --- a/crates/kitsune-embed/Cargo.toml +++ b/crates/kitsune-embed/Cargo.toml @@ -15,4 +15,4 @@ once_cell = "1.18.0" scraper = { version = "0.17.1", default-features = false } smol_str = "0.2.0" thiserror = "1.0.49" -typed-builder = "0.16.2" +typed-builder = "0.17.0" diff --git a/crates/kitsune-http-signatures/Cargo.toml b/crates/kitsune-http-signatures/Cargo.toml index 5ac56bef8..943b99839 100644 --- a/crates/kitsune-http-signatures/Cargo.toml +++ b/crates/kitsune-http-signatures/Cargo.toml @@ -8,7 +8,7 @@ base64-simd = "0.8.0" derive_builder = "0.12.0" http = "0.2.9" rayon = "1.8.0" -ring = { version = "0.17.3", features = ["std"] } +ring = { version = "0.17.4", features = ["std"] } time = { version = "0.3.30", default-features = false, features = [ "formatting", "parsing", diff --git a/crates/kitsune-messaging/Cargo.toml b/crates/kitsune-messaging/Cargo.toml index c41fc8726..2ab50482a 100644 --- a/crates/kitsune-messaging/Cargo.toml +++ b/crates/kitsune-messaging/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true [dependencies] ahash = "0.8.3" -async-trait = "0.1.73" +async-trait = "0.1.74" futures-util = "0.3.28" kitsune-retry-policies = { path = "../kitsune-retry-policies" } pin-project-lite = "0.2.13" diff --git a/crates/kitsune-search/Cargo.toml b/crates/kitsune-search/Cargo.toml index d0808fb73..7ee143136 100644 --- a/crates/kitsune-search/Cargo.toml +++ b/crates/kitsune-search/Cargo.toml @@ -4,7 +4,7 @@ edition.workspace = true version.workspace = true [dependencies] -async-trait = "0.1.73" +async-trait = "0.1.74" diesel = "2.1.3" diesel-async = "0.4.1" diesel_full_text_search = { version = "2.1.0", default-features = false } diff --git a/crates/kitsune-storage/Cargo.toml b/crates/kitsune-storage/Cargo.toml index 750101fe7..3e4d45157 100644 --- a/crates/kitsune-storage/Cargo.toml +++ b/crates/kitsune-storage/Cargo.toml @@ -4,7 +4,7 @@ version.workspace = true edition.workspace = true [dependencies] -async-trait = "0.1.73" +async-trait = "0.1.74" bytes = "1.5.0" enum_dispatch = "0.3.12" futures-util = "0.3.28" diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml index 627f38226..b2eeabdd8 100644 --- a/kitsune/Cargo.toml +++ b/kitsune/Cargo.toml @@ -13,7 +13,7 @@ askama = { version = "0.12.1", features = [ "with-axum", ], default-features = false } askama_axum = "0.3.0" -async-trait = "0.1.73" +async-trait = "0.1.74" axum = { version = "0.6.20", features = ["headers", "macros", "multipart"] } axum-extra = { version = "0.8.0", features = [ "cookie", @@ -76,7 +76,7 @@ tower-http = { version = "0.4.4", features = [ tracing = "0.1.39" tracing-error = "0.2.0" tracing-subscriber = "0.3.17" -typed-builder = "0.16.2" +typed-builder = "0.17.0" url = "2.4.1" utoipa = { version = "4.0.0", features = ["axum_extras", "uuid"] } utoipa-swagger-ui = { version = "4.0.0", features = ["axum"] } diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml index 141a2bafe..26b79e7d3 100644 --- a/lib/athena/Cargo.toml +++ b/lib/athena/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" [dependencies] ahash = "0.8.3" -async-trait = "0.1.73" +async-trait = "0.1.74" deadpool-redis = "0.13.0" either = { version = "1.9.0", default-features = false } futures-util = { version = "0.3.28", default-features = false } @@ -29,7 +29,7 @@ speedy-uuid = { path = "../speedy-uuid", features = ["redis", "serde"] } thiserror = "1.0.49" tokio = { version = "1.33.0", features = ["macros", "rt", "sync"] } tracing = "0.1.39" -typed-builder = "0.16.2" +typed-builder = "0.17.0" [dev-dependencies] tracing-subscriber = "0.3.17" diff --git a/lib/speedy-uuid/Cargo.toml b/lib/speedy-uuid/Cargo.toml index ceec43cd5..193edacd6 100644 --- a/lib/speedy-uuid/Cargo.toml +++ b/lib/speedy-uuid/Cargo.toml @@ -12,5 +12,5 @@ diesel = { version = "2.1.3", features = [ redis = { version = "0.23.3", default-features = false, optional = true } serde = { version = "1.0.189", optional = true } thiserror = "1.0.49" -uuid = { version = "1.4.1", features = ["fast-rng", "v7"] } +uuid = { version = "1.5.0", features = ["fast-rng", "v7"] } uuid-simd = { version = "0.8.0", features = ["uuid"] }