more

Cargo.toml

@@ -129,10 +129,11 @@ hickory-resolver = { version = "0.25.0-alpha.4", default-features = false, featu
     "tokio-runtime",
 ] }
 http = "1.1.0"
-iso8601-timestamp = "0.3.1"
+iso8601-timestamp = { version = "0.3.1", features = ["diesel-pg"] }
 itertools = { version = "0.13.0", default-features = false }
 minijinja = { version = "2.5.0", features = ["loader"] }
 moka = { version = "=0.12.7", features = ["sync"] }
+pin-project-lite = "0.2.15"
 rand = "0.8.5"
 sailfish = { version = "0.9.0", default-features = false, features = [
     "derive",
@@ -145,6 +146,7 @@ sonic-rs = "=0.3.14"
 strum = { version = "0.26.3", features = ["derive"] }
 thiserror = "2.0.3"
 tokio = { version = "1.41.1", features = ["full"] }
+tower = { version = "0.5.1", default-features = false, features = ["util"] }
 tower-http = { version = "0.6.2", features = [
     "catch-panic",
     "cors",
@@ -160,7 +162,6 @@ tower-http = { version = "0.6.2", features = [
     "map-response-body",
     "request-id",
     "timeout",
-    "timeout",
     "trace",
 ] }
 tracing = "0.1.41"
@@ -207,14 +208,18 @@ kitsune-job-runner = { path = "kitsune-job-runner" }
 
 # Local workspace dependences (lib directory)
 athena = { path = "lib/athena", features = ["redis"] }
-blowocking = { path = "lib/blowocking", default-features = false }
+blowocking = { path = "lib/blowocking" }
 cursiv = { path = "lib/cursiv", features = ["axum"] }
 fast-cjson = { path = "lib/fast-cjson" }
 geomjeungja = { path = "lib/geomjeungja" }
 http-signatures = { path = "lib/http-signatures" }
 just-retry = { path = "lib/just-retry" }
 masto-id-convert = { path = "lib/masto-id-convert" }
-mrf-manifest = { path = "lib/mrf-manifest" }
+mrf-manifest = { path = "lib/mrf-manifest", features = [
+    "decode",
+    "encode",
+    "serialise",
+] }
 post-process = { path = "lib/post-process" }
 schaber = { path = "lib/schaber" }
 speedy-uuid = { path = "lib/speedy-uuid", features = [

crates/kitsune-activitypub/Cargo.toml

@@ -48,7 +48,7 @@ kitsune-test.workspace = true
 kitsune-webfinger.workspace = true
 pretty_assertions = "1.4.1"
 tokio.workspace = true
-tower = { version = "0.5.1", default-features = false, features = ["util"] }
+tower.workspace = true
 
 [lints]
 workspace = true

crates/kitsune-db/Cargo.toml

@@ -7,13 +7,13 @@ license.workspace = true
 build = "build.rs"
 
 [dependencies]
-blowocking = { workspace = true, features = ["io"] }
+blowocking.workspace = true
 diesel.workspace = true
 diesel-async.workspace = true
 diesel_full_text_search.workspace = true
 diesel_migrations = "2.2.0"
 futures-util.workspace = true
-iso8601-timestamp = { workspace = true, features = ["diesel-pg"] }
+iso8601-timestamp.workspace = true
 kitsune-config.workspace = true
 kitsune-error.workspace = true
 kitsune-language.workspace = true

crates/kitsune-http-client/Cargo.toml

@@ -35,7 +35,7 @@ pin-project = "1.1.7"
 serde.workspace = true
 simdutf8.workspace = true
 sonic-rs.workspace = true
-tower = { version = "0.5.1", features = ["util"] }
+tower.workspace = true
 tower-http.workspace = true
 
 [dev-dependencies]

crates/kitsune-oidc/Cargo.toml

@@ -13,7 +13,7 @@ kitsune-config.workspace = true
 kitsune-derive.workspace = true
 kitsune-error.workspace = true
 kitsune-http-client.workspace = true
-moka = { workspace = true, features = ["sync"] }
+moka.workspace = true
 oauth2 = { version = "5.0.0-rc.1", default-features = false }
 openidconnect = { version = "4.0.0-rc.1", default-features = false, features = [
     # Accept these two, per specification invalid, cases to increase compatibility

crates/kitsune-search/Cargo.toml

@@ -21,7 +21,7 @@ kitsune-error.workspace = true
 kitsune-http-client.workspace = true
 kitsune-language.workspace = true
 meilisearch-sdk = { version = "0.27.1", default-features = false }
-pin-project-lite = "0.2.15"
+pin-project-lite.workspace = true
 serde.workspace = true
 serde_urlencoded = "0.7.1"
 speedy-uuid.workspace = true

crates/kitsune-service/Cargo.toml

@@ -67,7 +67,7 @@ kitsune-test.workspace = true
 kitsune-webfinger.workspace = true
 pretty_assertions = "1.4.1"
 tempfile = "3.14.0"
-tower = { version = "0.5.1", default-features = false, features = ["util"] }
+tower.workspace = true
 
 [lints]
 workspace = true

crates/kitsune-test/Cargo.toml

@@ -15,7 +15,7 @@ isolang = "2.4.0"
 kitsune-config.workspace = true
 kitsune-db.workspace = true
 kitsune-s3.workspace = true
-pin-project-lite = "0.2.15"
+pin-project-lite.workspace = true
 rand.workspace = true
 rusty-s3 = { version = "0.5.0", default-features = false }
 tokio.workspace = true

crates/kitsune-wasm-mrf/Cargo.toml

@@ -21,7 +21,7 @@ kitsune-derive.workspace = true
 kitsune-error.workspace = true
 kitsune-http-client.workspace = true
 kitsune-type.workspace = true
-mrf-manifest = { workspace = true, features = ["decode"] }
+mrf-manifest.workspace = true
 redb = { version = "2.2.0", features = ["logging"] }
 slab = "0.4.9"
 smol_str.workspace = true
@@ -45,7 +45,7 @@ wasmtime-wasi = { version = "27.0.0", default-features = false }
 bytes.workspace = true
 tempfile = "3.14.0"
 tokio.workspace = true
-tower = "0.5.1"
+tower.workspace = true
 tracing-subscriber = "0.3.19"
 wat = "1.221.0"
 

crates/kitsune-webfinger/Cargo.toml

@@ -25,7 +25,7 @@ hyper = "1.5.1"
 pretty_assertions = "1.4.1"
 sonic-rs.workspace = true
 tokio.workspace = true
-tower = { version = "0.5.1", default-features = false, features = ["util"] }
+tower.workspace = true
 
 [lints]
 workspace = true

kitsune/Cargo.toml

@@ -87,7 +87,7 @@ tempfile = "3.14.0"
 time = "0.3.36"
 tokio.workspace = true
 tokio-util = { version = "0.7.12", features = ["io"] }
-tower = { version = "0.5.1", features = ["util"] }
+tower.workspace = true
 tower-stop-using-brave.workspace = true
 tower-x-clacks-overhead.workspace = true
 tower-http.workspace = true

lib/cursiv/Cargo.toml

@@ -11,9 +11,9 @@ blake3 = "1.5.5"
 cookie = { version = "0.18.1", features = ["percent-encode"] }
 hex-simd = "0.8.0"
 http.workspace = true
-pin-project-lite = "0.2.15"
+pin-project-lite.workspace = true
 rand.workspace = true
-tower = { version = "0.5.1", default-features = false }
+tower.workspace = true
 triomphe.workspace = true
 zeroize = { version = "1.8.1", features = ["derive"] }
 
@@ -23,7 +23,7 @@ axum-core = { version = "0.4.5", optional = true }
 
 [dev-dependencies]
 futures-test = "0.3.31"
-tower = { version = "0.5.1", default-features = false, features = ["util"] }
+tower.workspace = true
 
 [features]
 axum = ["dep:async-trait", "dep:axum-core"]

lib/mrf-tool/Cargo.toml

@@ -10,11 +10,7 @@ license = "MIT OR Apache-2.0"
 clap.workspace = true
 color-eyre.workspace = true
 colored_json = "5.0.0"
-mrf-manifest = { workspace = true, features = [
-    "decode",
-    "encode",
-    "serialise",
-] }
+mrf-manifest.workspace = true
 sonic-rs.workspace = true
 wasmparser = "0.221.0"
 

lib/tower-http-digest/Cargo.toml

@@ -12,7 +12,7 @@ either = { version = "1.13.0", default-features = false }
 http.workspace = true
 http-body = "1.0.1"
 memchr = "2.7.4"
-pin-project-lite = "0.2.15"
+pin-project-lite.workspace = true
 sha2 = "0.10.8"
 subtle = "2.6.1"
 tower-layer = "0.3.3"
@@ -23,7 +23,7 @@ tracing.workspace = true
 bytes.workspace = true
 futures-test = "0.3.31"
 http-body-util = "0.1.2"
-tower = { version = "0.5.1", default-features = false, features = ["util"] }
+tower.workspace = true
 
 [lints]
 workspace = true

lib/tower-stop-using-brave/Cargo.toml

@@ -14,7 +14,7 @@ tower-service = "0.3.3"
 
 [dev-dependencies]
 futures-test = "0.3.31"
-tower = { version = "0.5.1", default-features = false, features = ["util"] }
+tower.workspace = true
 
 [lints]
 workspace = true

lib/tower-x-clacks-overhead/Cargo.toml

@@ -8,14 +8,14 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 http.workspace = true
 itertools.workspace = true
-pin-project-lite = "0.2.15"
+pin-project-lite.workspace = true
 tower-layer = "0.3.3"
 tower-service = "0.3.3"
 triomphe.workspace = true
 
 [dev-dependencies]
 futures-test = "0.3.31"
-tower = { version = "0.5.1", default-features = false, features = ["util"] }
+tower.workspace = true
 
 [lints]
 workspace = true