fix diesel features, deduplicate tokio

kitsune-soc · Dec 1, 2024 · 06d5457 · 06d5457
1 parent 856ed52
commit 06d5457
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 24 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -90,6 +90,7 @@ asynk-strim = "0.1.2"
 clap = { version = "4.5.21", features = ["derive", "wrap_help"] }
 diesel = { version = "2.2.5", default-features = false, features = [
     "32-column-tables",
+    "postgres_backend",
     "uuid",
     "with-deprecated",
 ] }
@@ -135,7 +136,7 @@ serde = { version = "1.0.215", features = ["derive"] }
 simdutf8 = { version = "0.1.5", features = ["aarch64_neon"] }
 sonic-rs = "=0.3.14"
 thiserror = "2.0.3"
-tokio = "1.41.1"
+tokio = { version = "1.41.1", features = ["full"] }
 tracing = "0.1.41"
 triomphe = { version = "0.1.14", default-features = false, features = [
     "arc-swap",

diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml
@@ -50,7 +50,7 @@ kitsune-config.workspace = true
 kitsune-test.workspace = true
 kitsune-webfinger.workspace = true
 pretty_assertions = "1.4.1"
-tokio = { workspace = true, features = ["macros"] }
+tokio.workspace = true
 tower = { version = "0.5.1", default-features = false, features = ["util"] }
 
 [lints]

diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml
@@ -17,7 +17,7 @@ triomphe.workspace = true
 typed-builder.workspace = true
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["macros", "rt"] }
+tokio.workspace = true
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-config/Cargo.toml b/crates/kitsune-config/Cargo.toml
@@ -11,7 +11,7 @@ human-size = { version = "0.4.3", features = ["serde"] }
 isolang = { version = "2.4.0", features = ["serde"] }
 serde.workspace = true
 smol_str = { version = "0.3.2", features = ["serde"] }
-tokio = { workspace = true, features = ["fs"] }
+tokio.workspace = true
 toml = { version = "0.8.19", default-features = false, features = ["parse"] }
 
 [lints]

diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml
@@ -30,7 +30,7 @@ rustls-native-certs = "0.8.1"
 serde.workspace = true
 sonic-rs.workspace = true
 speedy-uuid = { workspace = true, features = ["diesel"] }
-tokio = { workspace = true, features = ["rt"] }
+tokio.workspace = true
 tokio-postgres = "0.7.12"
 tokio-postgres-rustls = "0.13.0"
 tracing.workspace = true
@@ -40,7 +40,7 @@ typed-builder.workspace = true
 
 [dev-dependencies]
 kitsune-test.workspace = true
-tokio = { workspace = true, features = ["macros"] }
+tokio.workspace = true
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-http-client/Cargo.toml b/crates/kitsune-http-client/Cargo.toml
@@ -49,7 +49,7 @@ tower-http = { version = "0.6.2", features = [
 ] }
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["macros", "rt"] }
+tokio.workspace = true
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-s3/Cargo.toml b/crates/kitsune-s3/Cargo.toml
@@ -18,7 +18,7 @@ typed-builder.workspace = true
 
 [dev-dependencies]
 kitsune-test.workspace = true
-tokio = { workspace = true, features = ["macros", "rt"] }
+tokio.workspace = true
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml
@@ -48,7 +48,7 @@ rusty-s3 = { version = "0.5.0", default-features = false }
 serde.workspace = true
 smol_str = "0.3.2"
 speedy-uuid.workspace = true
-tokio = { workspace = true, features = ["macros", "sync"] }
+tokio.workspace = true
 tracing.workspace = true
 triomphe.workspace = true
 typed-builder.workspace = true

diff --git a/crates/kitsune-storage/Cargo.toml b/crates/kitsune-storage/Cargo.toml
@@ -12,13 +12,13 @@ futures-util.workspace = true
 kitsune-error.workspace = true
 kitsune-s3.workspace = true
 rusty-s3 = { version = "0.5.0", default-features = false }
-tokio = { workspace = true, features = ["fs", "io-util"] }
+tokio.workspace = true
 tokio-util = { version = "0.7.12", features = ["io"] }
 triomphe.workspace = true
 
 [dev-dependencies]
 tempfile = "3.14.0"
-tokio = { workspace = true, features = ["macros", "rt"] }
+tokio.workspace = true
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-test/Cargo.toml b/crates/kitsune-test/Cargo.toml
@@ -18,7 +18,7 @@ kitsune-s3.workspace = true
 pin-project-lite = "0.2.15"
 rand = "0.8.5"
 rusty-s3 = { version = "0.5.0", default-features = false }
-tokio = { workspace = true, features = ["time"] }
+tokio.workspace = true
 triomphe.workspace = true
 url.workspace = true
 uuid = { version = "1.11.0", features = ["fast-rng", "v4"] }

diff --git a/crates/kitsune-util/Cargo.toml b/crates/kitsune-util/Cargo.toml
@@ -15,7 +15,7 @@ pulldown-cmark = { version = "0.12.2", default-features = false, features = [
 ] }
 rand = "0.8.5"
 speedy-uuid.workspace = true
-tokio = { workspace = true, features = ["macros"] }
+tokio.workspace = true
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-wasm-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/Cargo.toml
@@ -26,7 +26,7 @@ redb = { version = "2.2.0", features = ["logging"] }
 slab = "0.4.9"
 smol_str = "0.3.2"
 sonic-rs.workspace = true
-tokio = { workspace = true, features = ["fs"] }
+tokio.workspace = true
 tracing.workspace = true
 triomphe.workspace = true
 walkdir = "2.5.0"
@@ -44,7 +44,7 @@ wasmtime-wasi = { version = "27.0.0", default-features = false }
 [dev-dependencies]
 bytes = "1.9.0"
 tempfile = "3.14.0"
-tokio = { workspace = true, features = ["macros", "rt"] }
+tokio.workspace = true
 tower = "0.5.1"
 tracing-subscriber = "0.3.19"
 wat = "1.221.0"

diff --git a/crates/kitsune-webfinger/Cargo.toml b/crates/kitsune-webfinger/Cargo.toml
@@ -24,7 +24,7 @@ http-body-util = "0.1.2"
 hyper = "1.5.1"
 pretty_assertions = "1.4.1"
 sonic-rs.workspace = true
-tokio = { workspace = true, features = ["macros"] }
+tokio.workspace = true
 tower = { version = "0.5.1", default-features = false, features = ["util"] }
 
 [lints]

diff --git a/kitsune-cli/Cargo.toml b/kitsune-cli/Cargo.toml
@@ -24,7 +24,7 @@ kitsune-db.workspace = true
 kitsune-error.workspace = true
 serde.workspace = true
 speedy-uuid.workspace = true
-tokio = { workspace = true, features = ["full"] }
+tokio.workspace = true
 tracing-subscriber = "0.3.19"
 
 [lints]

diff --git a/kitsune-job-runner/Cargo.toml b/kitsune-job-runner/Cargo.toml
@@ -31,7 +31,7 @@ kitsune-service.workspace = true
 kitsune-url.workspace = true
 kitsune-wasm-mrf.workspace = true
 mimalloc = "0.1.43"
-tokio = { workspace = true, features = ["full"] }
+tokio.workspace = true
 tracing.workspace = true
 triomphe.workspace = true
 typed-builder.workspace = true

diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
@@ -85,7 +85,7 @@ speedy-uuid.workspace = true
 strum = { version = "0.26.3", features = ["derive"] }
 tempfile = "3.14.0"
 time = "0.3.36"
-tokio = { workspace = true, features = ["full"] }
+tokio.workspace = true
 tokio-util = { version = "0.7.12", features = ["io"] }
 tower = { version = "0.5.1", features = ["util"] }
 tower-stop-using-brave.workspace = true

diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml
@@ -23,7 +23,7 @@ smol_str = "0.3.2"
 sonic-rs = { workspace = true, optional = true }
 speedy-uuid = { workspace = true, features = ["redis"] }
 thiserror.workspace = true
-tokio = { workspace = true, features = ["macros", "rt", "sync"] }
+tokio.workspace = true
 tokio-util = { version = "0.7.12", features = ["rt"] }
 tracing.workspace = true
 triomphe.workspace = true

diff --git a/lib/blowocking/Cargo.toml b/lib/blowocking/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 rayon = "1.10.0"
 thiserror.workspace = true
-tokio = { workspace = true, features = ["sync"] }
+tokio.workspace = true
 tracing.workspace = true
 
 [features]

diff --git a/lib/geomjeungja/Cargo.toml b/lib/geomjeungja/Cargo.toml
@@ -21,7 +21,7 @@ unsize = "1.1.0"
 insta = { version = "1.41.1", features = ["json"] }
 rand_xorshift = "0.3.0"
 sonic-rs.workspace = true
-tokio = { workspace = true, features = ["macros", "rt"] }
+tokio.workspace = true
 
 [lints]
 workspace = true
diff --git a/lib/http-signatures/Cargo.toml b/lib/http-signatures/Cargo.toml
@@ -33,7 +33,7 @@ tracing = { workspace = true, optional = true }
 
 [dev-dependencies]
 divan = "0.1.16"
-tokio = { workspace = true, features = ["macros", "rt"] }
+tokio.workspace = true
 
 [features]
 default = ["easy"]

diff --git a/lib/just-retry/Cargo.toml b/lib/just-retry/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 retry-policies = "0.4.0"
-tokio = { workspace = true, features = ["time"] }
+tokio.workspace = true
 tracing.workspace = true
 
 [lints]