Use more typed-builder

Cargo.toml

@@ -42,3 +42,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" }

crates/kitsune-cache/Cargo.toml

@@ -4,16 +4,16 @@ 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"
 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"] }

crates/kitsune-cache/src/redis.rs

@@ -1,27 +1,26 @@
 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<K, V>
 where
     K: ?Sized,
 {
-    #[builder(default = "\"DEFAULT-REDIS-CACHER\".into()")]
+    #[builder(default = "DEFAULT-REDIS-CACHER".into())]
     namespace: String,
     #[builder(setter(into))]
     prefix: String,
     redis_conn: deadpool_redis::Pool,
     ttl: Duration,
 
     // Type phantom data
-    #[builder(setter(skip))]
+    #[builder(default, setter(skip))]
     _key: PhantomData<K>,
-    #[builder(setter(skip))]
+    #[builder(default, setter(skip))]
     _value: PhantomData<V>,
 }
 
@@ -39,12 +38,6 @@ where
             .prefix(prefix)
             .ttl(ttl)
             .build()
-            .unwrap()
-    }
-
-    #[must_use]
-    pub fn builder() -> RedisBuilder<K, V> {
-        RedisBuilder::default()
     }
 
     fn compute_key(&self, key: impl Display) -> String {

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"

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 }
 

crates/kitsune-core/src/activitypub/deliverer.rs

@@ -61,8 +61,7 @@ impl Deliverer {
         let private_key = PrivateKey::builder()
             .key_id(&account.public_key_id)
             .key(RsaKeyPair::from_pkcs8(pkcs8_document.as_bytes())?)
-            .build()
-            .unwrap();
+            .build();
 
         let response = self.client.execute_signed(request, private_key).await?;
         debug!(status_code = %response.status(), "successfully executed http request");

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()
         }
     };

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"

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"

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"

crates/kitsune-http-client/src/lib.rs

@@ -287,7 +287,6 @@ impl Client {
             .include_creation_timestamp(true)
             .expires_in(Duration::from_secs(30)) // Make the signature expire in 30 seconds
             .build()
-            .unwrap()
             .sign(
                 &parts,
                 vec![

crates/kitsune-http-signatures/Cargo.toml

@@ -8,10 +8,14 @@ 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"] }
-time = { version = "0.3.30", features = ["formatting", "parsing"] }
+ring = { version = "0.17.4", features = ["std"] }
+time = { version = "0.3.30", default-features = false, features = [
+    "formatting",
+    "parsing",
+] }
 thiserror = "1.0.49"
 tokio = { version = "1.33.0", features = ["sync"] }
+typed-builder = "0.17.0"
 
 [dev-dependencies]
 pem = "3.0.2"

crates/kitsune-http-signatures/src/lib.rs

@@ -8,7 +8,6 @@
 #![deny(missing_docs)]
 
 use crate::{header::SignatureHeader, util::UnixTimestampExt};
-use derive_builder::Builder;
 use http::{
     header::{HeaderName, InvalidHeaderName},
     request::Parts,
@@ -24,6 +23,7 @@ use std::{
     time::{Duration, SystemTime},
 };
 use tokio::sync::oneshot;
+use typed_builder::TypedBuilder;
 
 pub use crate::error::Error;
 pub use ring;
@@ -109,8 +109,7 @@ impl SigningKey for RsaKeyPair {
 /// Cryptographic key
 ///
 /// Depending on the context its used in, it either represents a private or a public key
-#[derive(Builder, Clone)]
-#[builder(pattern = "owned")]
+#[derive(Clone, TypedBuilder)]
 pub struct PrivateKey<'a, K>
 where
     K: SigningKey,
@@ -122,16 +121,6 @@ where
     key: K,
 }
 
-impl<'a, K> PrivateKey<'a, K>
-where
-    K: SigningKey,
-{
-    /// Return a builder of the private key
-    pub fn builder() -> PrivateKeyBuilder<'a, K> {
-        PrivateKeyBuilder::default()
-    }
-}
-
 struct SignatureString<'a> {
     pub algorithm: &'a str,
     pub components: &'a [SignatureComponent<'a>],
@@ -204,7 +193,7 @@ impl<'a> TryFrom<SignatureString<'a>> for String {
 }
 
 /// HTTP signer
-#[derive(Builder, Clone)]
+#[derive(Clone, TypedBuilder)]
 pub struct HttpSigner {
     /// Include the creation timestamp into the signing header
     #[builder(default)]
@@ -216,11 +205,6 @@ pub struct HttpSigner {
 }
 
 impl HttpSigner {
-    /// Return a builder for the HTTP signer
-    pub fn builder() -> HttpSignerBuilder {
-        HttpSignerBuilder::default()
-    }
-
     /// Sign an HTTP request
     pub async fn sign<K>(
         &self,
@@ -272,18 +256,18 @@ impl HttpSigner {
 
 impl Default for HttpSigner {
     fn default() -> Self {
-        Self::builder().build().unwrap()
+        Self::builder().build()
     }
 }
 
 /// HTTP verifier
-#[derive(Builder, Clone)]
+#[derive(Clone, TypedBuilder)]
 pub struct HttpVerifier {
     /// Check whether the signature is expired
     ///
     /// This just does a basic check if the `(expires)` header exists.
     /// If you want a more aggressive check, use `enforce_expiration`
-    #[builder(default = "true")]
+    #[builder(default = true)]
     check_expiration: bool,
 
     /// Enforce the signature not being older than this specified duration
@@ -292,16 +276,11 @@ pub struct HttpVerifier {
     /// - If the signature contains an `(expires)` header, we enforce the shorter one
     ///
     /// Defaults to 5 minutes
-    #[builder(default = "Some(Duration::from_secs(5 * 60))")]
+    #[builder(default = Some(Duration::from_secs(5 * 60)))]
     enforce_expiration: Option<Duration>,
 }
 
 impl HttpVerifier {
-    /// Return a builder for the HTTP verifier
-    pub fn builder() -> HttpVerifierBuilder {
-        HttpVerifierBuilder::default()
-    }
-
     /// Verify an HTTP signature
     ///
     /// `key_fn` is a function that obtains a public key (in its DER representation) based in its key ID
@@ -359,6 +338,6 @@ impl HttpVerifier {
 
 impl Default for HttpVerifier {
     fn default() -> Self {
-        Self::builder().build().unwrap()
+        Self::builder().build()
     }
 }

crates/kitsune-http-signatures/tests/all_headers.rs

@@ -16,10 +16,7 @@ async fn all_headers() {
         ),
     );
     let public_key = self::data::get_public_key();
-    let signer = HttpVerifier::builder()
-        .check_expiration(false)
-        .build()
-        .unwrap();
+    let signer = HttpVerifier::builder().check_expiration(false).build();
 
     signer
         .verify(&parts, move |key_id| async move {

crates/kitsune-http-signatures/tests/basic.rs

@@ -13,10 +13,7 @@ async fn basic_signature() {
         ),
     );
     let public_key = self::data::get_public_key();
-    let signer = HttpVerifier::builder()
-        .enforce_expiration(None)
-        .build()
-        .unwrap();
+    let signer = HttpVerifier::builder().enforce_expiration(None).build();
 
     signer
         .verify(&parts, move |key_id| async move {

crates/kitsune-http-signatures/tests/sign.rs

@@ -14,11 +14,10 @@ async fn sign_some() {
     let private_key = PrivateKey::builder()
         .key_id("Test")
         .key(private_key)
-        .build()
-        .unwrap();
+        .build();
 
     let mut parts = get_parts();
-    let signer = HttpSigner::builder().build().unwrap();
+    let signer = HttpSigner::default();
     let (name, value) = signer
         .sign(
             &parts,
@@ -39,10 +38,7 @@ async fn sign_some() {
 
     parts.headers.insert(name, value);
 
-    let verifier = HttpVerifier::builder()
-        .enforce_expiration(None)
-        .build()
-        .unwrap();
+    let verifier = HttpVerifier::builder().enforce_expiration(None).build();
     verifier
         .verify(&parts, |key_id| async move {
             assert_eq!(key_id, "Test");

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"

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 }

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"

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"] }