chore: reorganize rust crates

2026-02-04 04:56:49 +00:00 · 2025-01-02 00:50:36 +00:00 · 2025-01-02 00:50:36 +00:00 · 16ce67e02c
commit 16ce67e02c
parent 357122a892
58 changed files with 6 additions and 13 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,13 +1,6 @@
 [workspace]
 members = [
-    "./lib/libpk",
-    "./services/api",
-    "./services/dispatch",
-    "./services/gateway",
-    "./services/avatars",
-    "./services/scheduled_tasks",
-
-    "./lib/models",
+    "./crates/*"
 ]

 [workspace.dependencies]
--- a/services/api/Cargo.toml
+++ b/services/api/Cargo.toml
@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-pluralkit_models = { path = "../../lib/models" }
-libpk = { path = "../../lib/libpk" }
+pluralkit_models = { path = "../models" }
+libpk = { path = "../libpk" }

 anyhow = { workspace = true } 
 axum = { workspace = true }
--- a/services/api/src/endpoints/mod.rs
+++ b/services/api/src/endpoints/mod.rs
--- a/services/api/src/endpoints/private.rs
+++ b/services/api/src/endpoints/private.rs
--- a/services/api/src/error.rs
+++ b/services/api/src/error.rs
--- a/services/api/src/main.rs
+++ b/services/api/src/main.rs
--- a/services/api/src/middleware/authnz.rs
+++ b/services/api/src/middleware/authnz.rs
--- a/services/api/src/middleware/cors.rs
+++ b/services/api/src/middleware/cors.rs
--- a/services/api/src/middleware/ignore_invalid_routes.rs
+++ b/services/api/src/middleware/ignore_invalid_routes.rs
--- a/services/api/src/middleware/logger.rs
+++ b/services/api/src/middleware/logger.rs
--- a/services/api/src/middleware/mod.rs
+++ b/services/api/src/middleware/mod.rs
--- a/services/api/src/middleware/ratelimit.lua
+++ b/services/api/src/middleware/ratelimit.lua
--- a/services/api/src/middleware/ratelimit.rs
+++ b/services/api/src/middleware/ratelimit.rs
--- a/services/api/src/util.rs
+++ b/services/api/src/util.rs
--- a/services/avatars/Cargo.toml
+++ b/services/avatars/Cargo.toml
@ -8,7 +8,7 @@ name = "avatar_cleanup"
 path = "src/cleanup.rs"

 [dependencies]
-libpk = { path = "../../lib/libpk" }
+libpk = { path = "../libpk" }
 anyhow = { workspace = true }
 axum = { workspace = true }
 futures = { workspace = true }
--- a/services/avatars/src/cleanup.rs
+++ b/services/avatars/src/cleanup.rs
--- a/services/avatars/src/hash.rs
+++ b/services/avatars/src/hash.rs
--- a/services/avatars/src/init.sql
+++ b/services/avatars/src/init.sql
--- a/services/avatars/src/main.rs
+++ b/services/avatars/src/main.rs
--- a/services/avatars/src/migrate.rs
+++ b/services/avatars/src/migrate.rs
--- a/services/avatars/src/process.rs
+++ b/services/avatars/src/process.rs
--- a/services/avatars/src/pull.rs
+++ b/services/avatars/src/pull.rs
--- a/services/avatars/src/store.rs
+++ b/services/avatars/src/store.rs
--- a/services/dispatch/Cargo.toml
+++ b/services/dispatch/Cargo.toml
--- a/services/dispatch/src/logger.rs
+++ b/services/dispatch/src/logger.rs
--- a/services/dispatch/src/main.rs
+++ b/services/dispatch/src/main.rs
--- a/services/gateway/Cargo.toml
+++ b/services/gateway/Cargo.toml
@ -11,7 +11,7 @@ chrono = { workspace = true }
 fred = { workspace = true }
 futures = { workspace = true }
 lazy_static = { workspace = true }
-libpk = { path = "../../lib/libpk" }
+libpk = { path = "../libpk" }
 metrics = { workspace = true }
 serde_json = { workspace = true }
 signal-hook = { workspace = true }
--- a/services/gateway/src/cache_api.rs
+++ b/services/gateway/src/cache_api.rs
--- a/services/gateway/src/discord/cache.rs
+++ b/services/gateway/src/discord/cache.rs
--- a/services/gateway/src/discord/gateway.rs
+++ b/services/gateway/src/discord/gateway.rs
--- a/services/gateway/src/discord/identify_queue.rs
+++ b/services/gateway/src/discord/identify_queue.rs
--- a/services/gateway/src/discord/mod.rs
+++ b/services/gateway/src/discord/mod.rs
--- a/services/gateway/src/discord/shard_state.rs
+++ b/services/gateway/src/discord/shard_state.rs
--- a/services/gateway/src/logger.rs
+++ b/services/gateway/src/logger.rs
--- a/services/gateway/src/main.rs
+++ b/services/gateway/src/main.rs
--- a/crates/libpk/Cargo.toml
+++ b/crates/libpk/Cargo.toml
--- a/crates/libpk/src/_config.rs
+++ b/crates/libpk/src/_config.rs
--- a/crates/libpk/src/db/mod.rs
+++ b/crates/libpk/src/db/mod.rs
--- a/crates/libpk/src/db/repository/auth.rs
+++ b/crates/libpk/src/db/repository/auth.rs
--- a/crates/libpk/src/db/repository/avatars.rs
+++ b/crates/libpk/src/db/repository/avatars.rs
--- a/crates/libpk/src/db/repository/mod.rs
+++ b/crates/libpk/src/db/repository/mod.rs
--- a/crates/libpk/src/db/repository/stats.rs
+++ b/crates/libpk/src/db/repository/stats.rs
--- a/crates/libpk/src/db/types/avatars.rs
+++ b/crates/libpk/src/db/types/avatars.rs
--- a/crates/libpk/src/db/types/mod.rs
+++ b/crates/libpk/src/db/types/mod.rs
--- a/crates/libpk/src/lib.rs
+++ b/crates/libpk/src/lib.rs
--- a/crates/libpk/src/state.rs
+++ b/crates/libpk/src/state.rs
--- a/crates/libpk/src/util/mod.rs
+++ b/crates/libpk/src/util/mod.rs
--- a/crates/libpk/src/util/redis.rs
+++ b/crates/libpk/src/util/redis.rs
--- a/crates/model_macros/Cargo.toml
+++ b/crates/model_macros/Cargo.toml
--- a/crates/model_macros/src/lib.rs
+++ b/crates/model_macros/src/lib.rs
--- a/crates/models/Cargo.toml
+++ b/crates/models/Cargo.toml
--- a/crates/models/src/_util.rs
+++ b/crates/models/src/_util.rs
--- a/crates/models/src/lib.rs
+++ b/crates/models/src/lib.rs
--- a/crates/models/src/system.rs
+++ b/crates/models/src/system.rs
--- a/crates/models/src/system_config.rs
+++ b/crates/models/src/system_config.rs
--- a/services/scheduled_tasks/Cargo.toml
+++ b/services/scheduled_tasks/Cargo.toml
@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-libpk = { path = "../../lib/libpk" }
+libpk = { path = "../libpk" }

 anyhow = { workspace = true }
 chrono = { workspace = true }
--- a/services/scheduled_tasks/src/main.rs
+++ b/services/scheduled_tasks/src/main.rs
--- a/services/scheduled_tasks/src/tasks.rs
+++ b/services/scheduled_tasks/src/tasks.rs