From e28a5b6a4bdd62b62c763c8a0cc1af811d1a7f33 Mon Sep 17 00:00:00 2001
From: Aumetra Weisman <aumetra@cryptolab.net>
Date: Wed, 22 May 2024 22:14:42 +0200
Subject: [PATCH] automatically enable some features

---
 Cargo.toml                         | 8 +++++---
 crates/kitsune-mastodon/Cargo.toml | 2 +-
 crates/kitsune-oidc/Cargo.toml     | 2 +-
 kitsune-job-runner/Cargo.toml      | 2 +-
 kitsune/Cargo.toml                 | 2 +-
 lib/athena/Cargo.toml              | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3d202bd62..418492ccb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -111,7 +111,7 @@ triomphe = { version = "0.1.11", default-features = false, features = [
     "unsize",
 ] }
 
-# Local workspace dependencies (so we don't have to specify the path in every crate)
+# Local workspace dependencies (crate directory)
 kitsune-activitypub = { path = "crates/kitsune-activitypub" }
 kitsune-cache = { path = "crates/kitsune-cache" }
 kitsune-captcha = { path = "crates/kitsune-captcha" }
@@ -143,7 +143,9 @@ kitsune-wasm-mrf = { path = "crates/kitsune-wasm-mrf" }
 kitsune-webfinger = { path = "crates/kitsune-webfinger" }
 kitsune = { path = "kitsune" }
 kitsune-job-runner = { path = "kitsune-job-runner" }
-athena = { path = "lib/athena" }
+
+# Local workspace dependences (lib directory)
+athena = { path = "lib/athena", features = ["redis"] }
 blowocking = { path = "lib/blowocking" }
 cursiv = { path = "lib/cursiv" }
 geomjeungja = { path = "lib/geomjeungja" }
@@ -152,7 +154,7 @@ just-retry = { path = "lib/just-retry" }
 masto-id-convert = { path = "lib/masto-id-convert" }
 mrf-manifest = { path = "lib/mrf-manifest" }
 post-process = { path = "lib/post-process" }
-speedy-uuid = { path = "lib/speedy-uuid" }
+speedy-uuid = { path = "lib/speedy-uuid", features = ["serde"] }
 tick-tock-mock = { path = "lib/tick-tock-mock" }
 tower-http-digest = { path = "lib/tower-http-digest" }
 tower-stop-using-brave = { path = "lib/tower-stop-using-brave" }
diff --git a/crates/kitsune-mastodon/Cargo.toml b/crates/kitsune-mastodon/Cargo.toml
index 2b1dbaa8d..205570880 100644
--- a/crates/kitsune-mastodon/Cargo.toml
+++ b/crates/kitsune-mastodon/Cargo.toml
@@ -22,7 +22,7 @@ mime = "0.3.17"
 serde = "1.0.202"
 simd-json = { workspace = true }
 smol_str = "0.2.2"
-speedy-uuid = { workspace = true, features = ["serde"] }
+speedy-uuid = { workspace = true }
 tracing = "0.1.40"
 typed-builder = "0.18.2"
 
diff --git a/crates/kitsune-oidc/Cargo.toml b/crates/kitsune-oidc/Cargo.toml
index 1cd78bde8..0f42dc7fa 100644
--- a/crates/kitsune-oidc/Cargo.toml
+++ b/crates/kitsune-oidc/Cargo.toml
@@ -24,7 +24,7 @@ openidconnect = { version = "4.0.0-alpha.1", default-features = false, features
 ] }
 serde = { version = "1.0.202", features = ["derive"] }
 simd-json = { workspace = true }
-speedy-uuid = { workspace = true, features = ["serde"] }
+speedy-uuid = { workspace = true }
 url = "2.5.0"
 
 [lints]
diff --git a/kitsune-job-runner/Cargo.toml b/kitsune-job-runner/Cargo.toml
index b39d66254..9a17502bc 100644
--- a/kitsune-job-runner/Cargo.toml
+++ b/kitsune-job-runner/Cargo.toml
@@ -12,7 +12,7 @@ license = false
 eula = false
 
 [dependencies]
-athena = { workspace = true, features = ["redis"] }
+athena = { workspace = true }
 clap = { workspace = true }
 color-eyre = "0.6.3"
 fred = { workspace = true }
diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
index fc03e835a..03bc9b74e 100644
--- a/kitsune/Cargo.toml
+++ b/kitsune/Cargo.toml
@@ -15,7 +15,7 @@ license = false
 eula = false
 
 [dependencies]
-athena = { workspace = true, features = ["redis"] }
+athena = { workspace = true }
 argon2 = { version = "0.5.3", features = ["std"] }
 askama = { workspace = true }
 askama_axum = "0.4.0"
diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml
index 7f8436a00..ae558353b 100644
--- a/lib/athena/Cargo.toml
+++ b/lib/athena/Cargo.toml
@@ -22,7 +22,7 @@ rand = { version = "0.8.5", optional = true }
 serde = { version = "1.0.202", features = ["derive"] }
 simd-json = { workspace = true, optional = true }
 smol_str = "0.2.2"
-speedy-uuid = { workspace = true, features = ["redis", "serde"] }
+speedy-uuid = { workspace = true, features = ["redis"] }
 thiserror = "1.0.61"
 tokio = { version = "1.37.0", features = ["macros", "rt", "sync"] }
 tokio-util = { version = "0.7.11", features = ["rt"] }