Update and roundtrip test (#550)

aumetra · web-flow · commit 4e7936f40b22 · 2024-06-17T08:46:40.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -78,8 +78,8 @@ resolver = "2"
 askama = { version = "0.12.1", default-features = false, features = [
     "with-axum",
 ] }
-clap = { version = "4.5.6", features = ["derive", "wrap_help"] }
-diesel = { version = "2.2.0", default-features = false, features = [
+clap = { version = "4.5.7", features = ["derive", "wrap_help"] }
+diesel = { version = "2.2.1", default-features = false, features = [
     "32-column-tables",
     "with-deprecated",
 ] }
@@ -96,7 +96,7 @@ fred = { version = "9.0.3", features = [
     "i-scripts",
     "sha-1",
 ] }
-garde = { version = "0.19.0", features = [
+garde = { version = "0.19.1", features = [
     "derive",
     "email",
     "email-idna",
@@ -106,7 +106,7 @@ garde = { version = "0.19.0", features = [
 itertools = { version = "0.13.0", default-features = false }
 moka = { version = "0.12.7", features = ["sync"] }
 simdutf8 = { version = "0.1.4", features = ["aarch64_neon"] }
-sonic-rs = "0.3.6"
+sonic-rs = "0.3.7"
 triomphe = { version = "0.1.12", default-features = false, features = [
     "unsize",
 ] }
@@ -213,7 +213,7 @@ scraper = { git = "https://github.com/causal-agent/scraper.git", rev = "d67111f5
 tokio-postgres-rustls = { git = "https://github.com/jbg/tokio-postgres-rustls.git", rev = "b16c1bc0f5d4f91324174fd1bd839d743a70f86a" }
 
 # SIMD runtime detection
-sonic-rs = { git = "https://github.com/aumetra/sonic-rs.git", rev = "a5ac253f8389a34257dae2da79db3f535311ed65" }
+sonic-rs = { git = "https://github.com/aumetra/sonic-rs.git", rev = "317ff37a8ab88e653ee01bbc00a974d41f3b151a" }
 
 # TCP nodelay for `axum::serve`
 axum = { git = "https://github.com/tokio-rs/axum.git", rev = "8d0c5c05eb75eb779591c8000705e785123868a0" }
diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml
@@ -38,13 +38,13 @@ speedy-uuid = { workspace = true }
 tracing = "0.1.40"
 triomphe = { workspace = true }
 typed-builder = "0.18.2"
-url = "2.5.0"
+url = "2.5.1"
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 sha2 = { version = "0.10.8", features = ["asm"] }
 
 [dev-dependencies]
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 hyper = "1.3.1"
 kitsune-config = { workspace = true }
 kitsune-test = { workspace = true }
diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml
@@ -22,7 +22,7 @@ kitsune-language = { workspace = true }
 kitsune-type = { workspace = true }
 num-derive = "0.4.2"
 num-traits = "0.2.19"
-rustls = { version = "0.23.9", default-features = false, features = [
+rustls = { version = "0.23.10", default-features = false, features = [
     "logging",
     "ring",
     "std",
diff --git a/crates/kitsune-email/Cargo.toml b/crates/kitsune-email/Cargo.toml
@@ -26,8 +26,7 @@ lettre = { version = "0.11.7", default-features = false, features = [
     "tokio1-rustls-tls",
     "tracing",
 ] }
-mrml = { version = "3.1.5", default-features = false, features = [
-    "orderedmap",
+mrml = { version = "4.0.0", default-features = false, features = [
     "parse",
     "render",
 ] }
diff --git a/crates/kitsune-federation-filter/Cargo.toml b/crates/kitsune-federation-filter/Cargo.toml
@@ -11,7 +11,7 @@ kitsune-config = { workspace = true }
 kitsune-derive = { workspace = true }
 kitsune-error = { workspace = true }
 kitsune-type = { workspace = true }
-url = "2.5.0"
+url = "2.5.1"
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-http-client/Cargo.toml b/crates/kitsune-http-client/Cargo.toml
@@ -12,7 +12,7 @@ futures-util = { version = "0.3.30", default-features = false, features = [
     "alloc",
 ] }
 http-body = "1.0.0"
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 http-signatures = { workspace = true }
 hyper = "1.3.1"
 hyper-util = { version = "0.1.5", features = [
diff --git a/crates/kitsune-observability/Cargo.toml b/crates/kitsune-observability/Cargo.toml
@@ -8,7 +8,7 @@ license.workspace = true
 [dependencies]
 async-trait = "0.1.80"
 eyre = "0.6.12"
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 hyper = { version = "1.3.1", default-features = false }
 kitsune-config = { workspace = true }
 kitsune-http-client = { workspace = true }
diff --git a/crates/kitsune-oidc/Cargo.toml b/crates/kitsune-oidc/Cargo.toml
@@ -9,7 +9,7 @@ license.workspace = true
 enum_dispatch = "0.3.13"
 fred = { workspace = true }
 http = "1.1.0"
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 kitsune-config = { workspace = true }
 kitsune-derive = { workspace = true }
 kitsune-error = { workspace = true }
@@ -25,7 +25,7 @@ openidconnect = { version = "4.0.0-alpha.2", default-features = false, features
 serde = { version = "1.0.203", features = ["derive"] }
 sonic-rs = { workspace = true }
 speedy-uuid = { workspace = true }
-url = "2.5.0"
+url = "2.5.1"
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-s3/Cargo.toml b/crates/kitsune-s3/Cargo.toml
@@ -11,7 +11,7 @@ futures-util = { version = "0.3.30", default-features = false }
 http = "1.1.0"
 kitsune-error = { workspace = true }
 kitsune-http-client = { workspace = true }
-quick-xml = { version = "0.31.0", features = ["serialize"] }
+quick-xml = { version = "0.32.0", features = ["serialize"] }
 rusty-s3 = "0.5.0"
 serde = { version = "1.0.203", features = ["derive"] }
 typed-builder = "0.18.2"
diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml
@@ -52,12 +52,12 @@ tokio = { version = "1.38.0", features = ["macros", "sync"] }
 tracing = "0.1.40"
 triomphe = { workspace = true }
 typed-builder = "0.18.2"
-url = "2.5.0"
+url = "2.5.1"
 zxcvbn = { version = "3.0.1", default-features = false }
 
 [dev-dependencies]
 hex-simd = "0.8.0"
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 hyper = "1.3.1"
 kitsune-activitypub = { workspace = true }
 kitsune-config = { workspace = true }
diff --git a/crates/kitsune-test/Cargo.toml b/crates/kitsune-test/Cargo.toml
@@ -11,7 +11,7 @@ diesel-async = { workspace = true }
 fred = { workspace = true }
 futures-util = "0.3.30"
 http = "1.1.0"
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 isolang = "2.4.0"
 kitsune-config = { workspace = true }
 kitsune-db = { workspace = true }
@@ -21,7 +21,7 @@ rand = "0.8.5"
 rusty-s3 = { version = "0.5.0", default-features = false }
 tokio = { version = "1.38.0", features = ["time"] }
 triomphe = { workspace = true }
-url = "2.5.0"
+url = "2.5.1"
 uuid = { version = "1.8.0", features = ["fast-rng", "v4"] }
 
 [lints]
diff --git a/crates/kitsune-wasm-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/Cargo.toml
@@ -44,7 +44,7 @@ wasmtime-wasi = { version = "21.0.1", default-features = false }
 tempfile = "3.10.1"
 tokio = { version = "1.38.0", features = ["macros", "rt"] }
 tracing-subscriber = "0.3.18"
-wat = "1.209.1"
+wat = "1.210.0"
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-webfinger/Cargo.toml b/crates/kitsune-webfinger/Cargo.toml
@@ -21,7 +21,7 @@ triomphe = { workspace = true }
 urlencoding = "2.1.3"
 
 [dev-dependencies]
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 hyper = "1.3.1"
 pretty_assertions = "1.4.0"
 sonic-rs = { workspace = true }
diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
@@ -39,7 +39,7 @@ diesel-async = { workspace = true }
 futures-util = "0.3.30"
 headers = "0.4.0"
 http = "1.1.0"
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 http-signatures = { workspace = true }
 iso8601-timestamp = "0.2.17"
 itertools = { workspace = true }
@@ -101,7 +101,7 @@ tracing = "0.1.40"
 trials = { workspace = true }
 triomphe = { workspace = true }
 typed-builder = "0.18.2"
-url = "2.5.0"
+url = "2.5.1"
 
 # --- Optional dependencies ---
 
diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml
@@ -37,6 +37,7 @@ redis = ["dep:either", "dep:fred", "dep:once_cell", "dep:rand", "dep:sonic-rs"]
 
 [dev-dependencies]
 kitsune-test = { workspace = true }
+postcard = { version = "1.0.8", default-features = false, features = ["alloc"] }
 tracing-subscriber = "0.3.18"
 
 [lints]
diff --git a/lib/athena/src/lib.rs b/lib/athena/src/lib.rs
@@ -53,7 +53,7 @@ pub trait Keepable: Any + Send + Sync + 'static {}
 #[inline]
 fn downcast_to<T>(obj: &dyn Keepable) -> Option<&T>
 where
-    T: 'static,
+    T: Keepable + 'static,
 {
     if obj.type_id() == TypeId::of::<T>() {
         #[allow(unsafe_code)]
@@ -94,7 +94,7 @@ impl KeeperOfTheSecrets {
     #[must_use]
     pub fn get<T>(&self) -> Option<&T>
     where
-        T: 'static,
+        T: Keepable + 'static,
     {
         self.inner
             .as_ref()
diff --git a/lib/athena/tests/keeper.rs b/lib/athena/tests/keeper.rs
@@ -9,6 +9,14 @@ struct CustomStruct {
 #[typetag::serde]
 impl Keepable for CustomStruct {}
 
+#[derive(Deserialize, Serialize)]
+struct OtherCustomStruct {
+    other: u32,
+}
+
+#[typetag::serde]
+impl Keepable for OtherCustomStruct {}
+
 #[test]
 fn roundtrip() {
     let original = CustomStruct { number: 1312 };
@@ -19,14 +27,24 @@ fn roundtrip() {
     assert_eq!(original, *value);
 }
 
+#[test]
+fn serialize_roundtrip() {
+    let original = CustomStruct { number: 1312 };
+
+    let keeper: KeeperOfTheSecrets = {
+        let keeper = KeeperOfTheSecrets::new(original.clone());
+        postcard::from_bytes(&postcard::to_allocvec(&keeper).unwrap()).unwrap()
+    };
+    let value = keeper.get::<CustomStruct>().unwrap();
+
+    assert_eq!(original, *value);
+}
+
 #[test]
 fn downcasting_into_other() {
     let value = CustomStruct { number: 161 };
     let keeper = KeeperOfTheSecrets::new(value.clone());
 
+    assert!(keeper.get::<OtherCustomStruct>().is_none());
     assert_eq!(keeper.get::<CustomStruct>(), Some(&value));
-
-    assert!(keeper.get::<()>().is_none());
-    assert!(keeper.get::<u32>().is_none());
-    assert!(keeper.get::<String>().is_none());
 }
diff --git a/lib/http-signatures/benches/build_cavage_signature_string.rs b/lib/http-signatures/benches/build_cavage_signature_string.rs
@@ -1,6 +1,5 @@
-use divan::Bencher;
+use divan::{black_box, Bencher};
 use http::{Method, Request, Uri};
-use std::hint::black_box;
 
 #[global_allocator]
 static GLOBAL: divan::AllocProfiler = divan::AllocProfiler::system();
diff --git a/lib/masto-id-convert/benches/process.rs b/lib/masto-id-convert/benches/process.rs
@@ -1,18 +1,18 @@
 #![allow(clippy::unreadable_literal)]
 
-use divan::black_box_drop;
+use uuid::Uuid;
 
 #[global_allocator]
 static GLOBAL: divan::AllocProfiler = divan::AllocProfiler::system();
 
 #[divan::bench(name = "process integer", args = [110368129515784116])]
-fn process_u64(id: u64) {
-    black_box_drop(masto_id_convert::process_u64(id));
+fn process_u64(id: u64) -> Uuid {
+    masto_id_convert::process_u64(id)
 }
 
 #[divan::bench(name = "process ASCII", args = ["110368129515784116"])]
-fn process_ascii(id: &str) {
-    black_box_drop(masto_id_convert::process(id));
+fn process_ascii(id: &str) -> Result<Uuid, masto_id_convert::Error> {
+    masto_id_convert::process(id)
 }
 
 fn main() {
diff --git a/lib/mrf-manifest/Cargo.toml b/lib/mrf-manifest/Cargo.toml
@@ -13,13 +13,13 @@ semver = { version = "1.0.23", features = ["serde"] }
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = { version = "1.0.117", optional = true }
 thiserror = { version = "1.0.61", optional = true }
-wasm-encoder = { version = "0.209.1", optional = true }
-wasmparser = { version = "0.209.1", optional = true }
+wasm-encoder = { version = "0.210.0", optional = true }
+wasmparser = { version = "0.210.0", optional = true }
 
 [dev-dependencies]
 serde_json = "1.0.117"
 insta = { version = "1.39.0", default-features = false, features = ["json"] }
-wat = "1.209.1"
+wat = "1.210.0"
 
 [features]
 decode = ["dep:leb128", "dep:serde_json", "dep:thiserror", "dep:wasmparser"]
diff --git a/lib/mrf-tool/Cargo.toml b/lib/mrf-tool/Cargo.toml
@@ -15,11 +15,11 @@ mrf-manifest = { workspace = true, features = [
     "serialise",
 ] }
 serde_json = "1.0.117"
-wasmparser = "0.209.1"
+wasmparser = "0.210.0"
 
 [lints]
 workspace = true
 
 [dev-dependencies]
 serde_json = "1.0.117"
-wat = "1.209.1"
+wat = "1.210.0"
diff --git a/lib/speedy-uuid/Cargo.toml b/lib/speedy-uuid/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 async-graphql = { version = "7.0.6", default-features = false, optional = true }
-diesel = { version = "2.2.0", default-features = false, features = [
+diesel = { version = "2.2.1", default-features = false, features = [
     "postgres_backend",
     "uuid",
 ], optional = true }
diff --git a/lib/tower-http-digest/Cargo.toml b/lib/tower-http-digest/Cargo.toml
@@ -11,7 +11,7 @@ bytes = "1.6.0"
 either = { version = "1.12.0", default-features = false }
 http = "1.1.0"
 http-body = "1.0.0"
-memchr = "2.7.2"
+memchr = "2.7.4"
 pin-project-lite = "0.2.14"
 sha2 = "0.10.8"
 subtle = "2.5.0"
@@ -22,7 +22,7 @@ tracing = { version = "0.1.40", default-features = false }
 [dev-dependencies]
 bytes = "1.6.0"
 futures-test = "0.3.30"
-http-body-util = "0.1.1"
+http-body-util = "0.1.2"
 tower = { version = "0.4.13", default-features = false, features = ["util"] }
 
 [lints]
diff --git a/lib/tower-stop-using-brave/src/lib.rs b/lib/tower-stop-using-brave/src/lib.rs
@@ -1,5 +1,8 @@
 use either::Either;
-use http::{header::USER_AGENT, HeaderValue, Request, Response, StatusCode};
+use http::{
+    header::{LOCATION, USER_AGENT},
+    HeaderValue, Request, Response, StatusCode,
+};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use std::{
@@ -43,8 +46,8 @@ where
             if USER_AGENT_REGEX.is_match(user_agent) {
                 let response = Response::builder()
                     .status(StatusCode::FOUND)
-                    .header("Location", REDIRECT_URL)
-                    .body(Default::default())
+                    .header(LOCATION, REDIRECT_URL)
+                    .body(ResBody::default())
                     .unwrap();
 
                 return Either::Right(future::ready(Ok(response)));
