Cleanup

Cargo.toml

@@ -82,7 +82,7 @@ askama = { version = "0.12.1", default-features = false, features = [
     "with-axum",
 ] }
 clap = { version = "4.5.16", features = ["derive", "wrap_help"] }
-diesel = { version = "2.2.2", default-features = false, features = [
+diesel = { version = "2.2.3", default-features = false, features = [
     "32-column-tables",
     "with-deprecated",
 ] }
@@ -93,7 +93,7 @@ diesel-async = { version = "0.5.0", features = [
     "tokio",
 ] }
 diesel_full_text_search = { version = "2.2.0", default-features = false }
-fred = { version = "9.1.1", features = [
+fred = { version = "9.1.2", features = [
     "enable-rustls-ring",
     "full-tracing",
     "i-scripts",

crates/kitsune-activitypub/Cargo.toml

@@ -31,7 +31,7 @@ kitsune-util = { workspace = true }
 kitsune-wasm-mrf = { workspace = true }
 mime = "0.3.17"
 mime_guess = { version = "2.0.5", default-features = false }
-serde = "1.0.208"
+serde = "1.0.209"
 sha2 = "0.10.8"
 sonic-rs = { workspace = true }
 speedy-uuid = { workspace = true }

crates/kitsune-cache/Cargo.toml

@@ -10,7 +10,7 @@ enum_dispatch = "0.3.13"
 fred = { workspace = true }
 kitsune-error = { workspace = true }
 moka = { workspace = true }
-serde = "1.0.208"
+serde = "1.0.209"
 sonic-rs = { workspace = true }
 tracing = "0.1.40"
 triomphe = { workspace = true }

crates/kitsune-cache/src/redis.rs

@@ -54,7 +54,7 @@ where
         let key = self.compute_key(key);
 
         debug!(%key, "Deleting cache entry");
-        self.redis_conn.del(key).await?;
+        let () = self.redis_conn.del(key).await?;
 
         Ok(())
     }
@@ -78,7 +78,8 @@ where
         let serialised = sonic_rs::to_string(value)?;
 
         debug!(%key, ttl = ?self.ttl, "Setting cache entry");
-        self.redis_conn
+        let () = self
+            .redis_conn
             .set(
                 key,
                 serialised,

crates/kitsune-captcha/Cargo.toml

@@ -10,7 +10,7 @@ enum_dispatch = "0.3.13"
 http = "1.1.0"
 kitsune-error = { workspace = true }
 kitsune-http-client = { workspace = true }
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 serde_urlencoded = "0.7.1"
 sonic-rs = { workspace = true }
 strum = { version = "0.26.3", features = ["derive"] }

crates/kitsune-config/Cargo.toml

@@ -9,7 +9,7 @@ license.workspace = true
 eyre = "0.6.12"
 human-size = { version = "0.4.3", features = ["serde"] }
 isolang = { version = "2.4.0", features = ["serde"] }
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 smol_str = { version = "0.2.2", features = ["serde"] }
 tokio = { version = "1.39.3", features = ["fs"] }
 toml = { version = "0.8.19", default-features = false, features = ["parse"] }

crates/kitsune-core/Cargo.toml

@@ -12,7 +12,7 @@ const_format = "0.2.32"
 kitsune-db = { workspace = true }
 kitsune-error = { workspace = true }
 paste = "1.0.15"
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 triomphe = { workspace = true }
 typed-builder = "0.20.0"
 unsize = "1.1.0"

crates/kitsune-db/Cargo.toml

@@ -29,7 +29,7 @@ rustls = { version = "0.23.12", default-features = false, features = [
     "tls12",
 ] }
 rustls-native-certs = "0.7.2"
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 sonic-rs = { workspace = true }
 speedy-uuid = { workspace = true, features = ["diesel"] }
 tokio = { version = "1.39.3", features = ["rt"] }

crates/kitsune-derive/impl/Cargo.toml

@@ -10,8 +10,8 @@ proc-macro = true
 
 [dependencies]
 proc-macro2 = "1.0.86"
-quote = "1.0.36"
-syn = { version = "2.0.75", features = ["full"] }
+quote = "1.0.37"
+syn = { version = "2.0.76", features = ["full"] }
 
 [lints]
 workspace = true

crates/kitsune-derive/impl/src/lib.rs

@@ -1,11 +1,11 @@
-mod expand;
+mod service;
 
 #[proc_macro_attribute]
 pub fn kitsune_service(
     attrs: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
-    match self::expand::expand(attrs.into(), input.into()) {
+    match self::service::expand(attrs.into(), input.into()) {
         Ok(out) => out.into(),
         Err(error) => error.to_compile_error().into(),
     }

crates/kitsune-http-client/Cargo.toml

@@ -31,7 +31,7 @@ hyper-rustls = { version = "0.27.2", default-features = false, features = [
 ] }
 kitsune-type = { workspace = true }
 pin-project = "1.1.5"
-serde = "1.0.208"
+serde = "1.0.209"
 simdutf8 = { workspace = true }
 sonic-rs = { workspace = true }
 tower = { version = "0.5.0", features = ["util"] }

crates/kitsune-jobs/Cargo.toml

@@ -15,7 +15,7 @@ kitsune-core = { workspace = true }
 kitsune-db = { workspace = true }
 kitsune-email = { workspace = true }
 kitsune-error = { workspace = true }
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 speedy-uuid = { workspace = true }
 tracing = "0.1.40"
 typed-builder = "0.20.0"

crates/kitsune-mastodon/Cargo.toml

@@ -19,7 +19,7 @@ kitsune-type = { workspace = true }
 kitsune-url = { workspace = true }
 kitsune-util = { workspace = true }
 mime = "0.3.17"
-serde = "1.0.208"
+serde = "1.0.209"
 smol_str = "0.2.2"
 sonic-rs = { workspace = true }
 speedy-uuid = { workspace = true }

crates/kitsune-oidc/Cargo.toml

@@ -21,7 +21,7 @@ openidconnect = { version = "4.0.0-alpha.2", default-features = false, features
     "accept-rfc3339-timestamps",
     "accept-string-booleans",
 ] }
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 sonic-rs = { workspace = true }
 speedy-uuid = { workspace = true }
 url = "2.5.2"

crates/kitsune-oidc/src/state/store/redis.rs

@@ -29,7 +29,8 @@
 
     async fn set(&self, key: &str, value: LoginState) -> Result<()> {
         let raw_value = sonic_rs::to_string(&value)?;
-        self.pool
+        let () = self
+            .pool
             .set(Self::format_key(key), raw_value, None, None, false)
             .await?;
 

crates/kitsune-s3/Cargo.toml

@@ -13,7 +13,7 @@ kitsune-error = { workspace = true }
 kitsune-http-client = { workspace = true }
 quick-xml = { version = "0.36.1", features = ["serialize"] }
 rusty-s3 = "0.5.0"
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 typed-builder = "0.20.0"
 
 [dev-dependencies]

crates/kitsune-search/Cargo.toml

@@ -23,7 +23,7 @@ kitsune-http-client = { workspace = true }
 kitsune-language = { workspace = true }
 meilisearch-sdk = { version = "0.27.1", default-features = false }
 pin-project-lite = "0.2.14"
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 serde_urlencoded = "0.7.1"
 speedy-uuid = { workspace = true }
 strum = { version = "0.26.3", features = ["derive"] }

crates/kitsune-service/Cargo.toml

@@ -45,7 +45,7 @@ post-process = { workspace = true }
 rand = "0.8.5"
 rsa = "0.9.6"
 rusty-s3 = { version = "0.5.0", default-features = false }
-serde = "1.0.208"
+serde = "1.0.209"
 smol_str = "0.2.2"
 speedy-uuid = { workspace = true }
 tokio = { version = "1.39.3", features = ["macros", "sync"] }

crates/kitsune-type/Cargo.toml

@@ -7,7 +7,7 @@ license.workspace = true
 
 [dependencies]
 iso8601-timestamp = "0.2.17"
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 serde_with = "3.9.0"
 smol_str = { version = "0.2.2", features = ["serde"] }
 sonic-rs = { workspace = true }

crates/kitsune-wasm-mrf/Cargo.toml

@@ -21,7 +21,7 @@ kitsune-derive = { workspace = true }
 kitsune-error = { workspace = true }
 kitsune-type = { workspace = true }
 mrf-manifest = { workspace = true, features = ["decode"] }
-redb = { version = "2.1.1", features = ["logging"] }
+redb = { version = "2.1.2", features = ["logging"] }
 slab = "0.4.9"
 smol_str = "0.2.2"
 sonic-rs = { workspace = true }

kitsune-cli/Cargo.toml

@@ -22,7 +22,7 @@ kitsune-config = { workspace = true }
 kitsune-core = { workspace = true }
 kitsune-db = { workspace = true }
 kitsune-error = { workspace = true }
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 speedy-uuid = { workspace = true }
 tokio = { version = "1.39.3", features = ["full"] }
 tracing-subscriber = "0.3.18"

kitsune/Cargo.toml

@@ -75,7 +75,7 @@ oxide-auth-async = "0.2.1"
 oxide-auth-axum = "0.5.0"
 rust-embed = { version = "8.5.0", features = ["include-exclude"] }
 scoped-futures = "0.1.3"
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 serde_urlencoded = "0.7.1"
 sonic-rs = { workspace = true }
 simdutf8 = { workspace = true }

lib/athena/Cargo.toml

@@ -18,7 +18,7 @@ iso8601-timestamp = "0.2.17"
 fred = { workspace = true, optional = true }
 just-retry = { workspace = true }
 rand = { version = "0.8.5", optional = true }
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 smol_str = "0.2.2"
 sonic-rs = { workspace = true, optional = true }
 speedy-uuid = { workspace = true, features = ["redis"] }

lib/athena/src/redis/mod.rs

@@ -105,7 +105,7 @@
                 .duration_since(Timestamp::UNIX_EPOCH)
                 .as_seconds_f64();
 
-            client
+            let () = client
                 .zadd(
                     self.scheduled_queue_name.as_str(),
                     None,
@@ -116,7 +116,7 @@
                 )
                 .await?;
         } else {
-            client
+            let () = client
                 .xadd(
                     self.queue_name.as_str(),
                     false,
@@ -241,14 +241,14 @@
         let client = self.redis_pool.next();
         let pipeline = client.pipeline();
 
-        pipeline
+        let () = pipeline
             .xack(
                 self.queue_name.as_str(),
                 self.consumer_group.as_str(),
                 stream_id.as_str(),
             )
             .await?;
-        pipeline
+        let () = pipeline
             .xdel(self.queue_name.as_str(), &[stream_id])
             .await?;
 
@@ -279,7 +279,7 @@
             Outcome::Success => true, // Execution succeeded, we don't need the context anymore
         };
 
-        pipeline.last().await?;
+        let () = pipeline.last().await?;
 
         if remove_context {
             self.context_repository
@@ -297,7 +297,8 @@
             .get::<String>()
             .expect("[Bug] Not a string in the context");
 
-        self.redis_pool
+        let () = self
+            .redis_pool
             .xclaim(
                 self.queue_name.as_str(),
                 self.consumer_group.as_str(),

lib/athena/src/redis/scheduled.rs

@@ -22,7 +22,7 @@ pub struct ScheduledJobActor {
 impl ScheduledJobActor {
     async fn run(&mut self) -> Result<()> {
         let client = self.redis_pool.next();
-        SCHEDULE_SCRIPT
+        let () = SCHEDULE_SCRIPT
             .evalsha_with_reload(
                 client,
                 (self.queue_name.as_str(), self.scheduled_queue_name.as_str()),

lib/fast-cjson/Cargo.toml

@@ -12,7 +12,7 @@ harness = false
 [dependencies]
 icu_normalizer = "1.5.0"
 memchr = "2.7.4"
-serde = "1.0.208"
+serde = "1.0.209"
 sonic-rs = { workspace = true }
 
 [dev-dependencies]
@@ -21,8 +21,8 @@ mimalloc = "0.1.43"
 olpc-cjson = "0.1.3"
 proptest = { version = "1.5.0", default-features = false, features = ["std"] }
 proptest-derive = "0.5.0"
-serde = { version = "1.0.208", features = ["derive"] }
-serde_json = "1.0.125"
+serde = { version = "1.0.209", features = ["derive"] }
+serde_json = "1.0.127"
 
 [lints]
 workspace = true

lib/fast-cjson/src/lib.rs

@@ -15,12 +15,6 @@ use std::{
 
 mod util;
 
-#[derive(Debug, Default)]
-struct Object {
-    obj: BTreeMap<Vec<u8>, Vec<u8>>,
-    state: Collecting,
-}
-
 #[derive(Debug)]
 enum Collecting {
     Key(Vec<u8>),
@@ -33,6 +27,12 @@ impl Default for Collecting {
     }
 }
 
+#[derive(Debug, Default)]
+struct Object {
+    obj: BTreeMap<Vec<u8>, Vec<u8>>,
+    state: Collecting,
+}
+
 /// A [`Formatter`](sonic_rs::format::Formatter) that produces canonical JSON.
 #[derive(Debug, Default)]
 pub struct CanonicalFormatter {

lib/fast-cjson/tests/test.rs

@@ -1,12 +1,12 @@
 use fast_cjson::CanonicalFormatter;
 use serde::Serialize;
 use sonic_rs::Serializer;
-use std::io::Result;
+use std::io;
 
 /// Small wrapper around the `sonic_rs` json! macro to encode the value as canonical JSON.
 macro_rules! encode {
     ($($tt:tt)+) => {
-        (|v: sonic_rs::Value| -> Result<Vec<u8>> {
+        (|v: sonic_rs::Value| -> io::Result<Vec<u8>> {
             let mut buf = Vec::new();
             let mut ser = Serializer::with_formatter(&mut buf, CanonicalFormatter::new());
             v.serialize(&mut ser)?;
@@ -20,7 +20,7 @@ macro_rules! encode {
 ///
 /// `<https://github.com/secure-systems-lab/securesystemslib/blob/f466266014aff529510216b8c2f8c8f39de279ec/tests/test_formats.py#L354-L389>`
 #[test]
-fn securesystemslib_asserts() -> Result<()> {
+fn securesystemslib_asserts() -> io::Result<()> {
     assert_eq!(encode!([1, 2, 3])?, b"[1,2,3]");
     assert_eq!(encode!([1, 2, 3])?, b"[1,2,3]");
     assert_eq!(encode!([])?, b"[]");
@@ -61,7 +61,7 @@ fn securesystemslib_asserts() -> Result<()> {
 /// True
 /// ```
 #[test]
-fn ascii_control_characters() -> Result<()> {
+fn ascii_control_characters() -> io::Result<()> {
     assert_eq!(encode!("\x00")?, b"\"\x00\"");
     assert_eq!(encode!("\x01")?, b"\"\x01\"");
     assert_eq!(encode!("\x02")?, b"\"\x02\"");
@@ -105,7 +105,7 @@ fn ascii_control_characters() -> Result<()> {
 /// A more involved test than any of the above for olpc-cjson's core competency: ordering
 /// things.
 #[test]
-fn ordered_nested_object() -> Result<()> {
+fn ordered_nested_object() -> io::Result<()> {
     assert_eq!(
             encode!({
                 "nested": {