From 3eb6aab10fe71fcd3b2f16ea415faa2a607865ab Mon Sep 17 00:00:00 2001 From: Julia Lange Date: Wed, 11 Jun 2025 14:09:02 -0700 Subject: [PATCH] Cargo, moving async-trait and tokio (DB, Ingestor) Move async-trait from ingestor to workspace so DB can share. Update the reference to tokio in DB from version to workspace --- Cargo.lock | 1 + Cargo.toml | 1 + db/Cargo.toml | 3 ++- ingestor/Cargo.toml | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dbe12ef..00ea69c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -563,6 +563,7 @@ dependencies = [ name = "db" version = "0.1.0" dependencies = [ + "async-trait", "sqlx", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 908c860..9129ba7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ resolver = "3" members = [ "api", "atproto","db", "ingestor"] [workspace.dependencies] +async-trait = "0.1.88" atproto = { path = "./atproto" } serde = "1.0.219" serde_json = "1.0.140" diff --git a/db/Cargo.toml b/db/Cargo.toml index ded38de..d555eb9 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -4,5 +4,6 @@ version = "0.1.0" edition = "2024" [dependencies] +async-trait.workspace = true sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio"] } -tokio = "1.45.0" +tokio.workspace = true diff --git a/ingestor/Cargo.toml b/ingestor/Cargo.toml index a177581..7da302c 100644 --- a/ingestor/Cargo.toml +++ b/ingestor/Cargo.toml @@ -5,7 +5,7 @@ edition = "2024" [dependencies] anyhow = "1.0.98" -async-trait = "0.1.88" +async-trait.workspace = true atproto.workspace = true rocketman = "0.2.0" serde.workspace = true