Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

chore: enforce mod.rs declaration only (#5855)

teo5d6366f8cab9
diff --git a/crates/agent_runtime_protocol/src/domain/connection/mod.rs b/crates/agent_runtime_protocol/src/domain/connection.rs
similarity index 100%
rename from crates/agent_runtime_protocol/src/domain/connection/mod.rs
rename to crates/agent_runtime_protocol/src/domain/connection.rs
diff --git a/crates/agent_runtime_protocol/src/domain/schema/v0/mod.rs b/crates/agent_runtime_protocol/src/domain/schema/v0.rs
similarity index 100%
rename from crates/agent_runtime_protocol/src/domain/schema/v0/mod.rs
rename to crates/agent_runtime_protocol/src/domain/schema/v0.rs
diff --git a/crates/agent_runtime_protocol/src/outbound/websocket/mod.rs b/crates/agent_runtime_protocol/src/outbound/websocket.rs
similarity index 100%
rename from crates/agent_runtime_protocol/src/outbound/websocket/mod.rs
rename to crates/agent_runtime_protocol/src/outbound/websocket.rs
diff --git a/crates/agent_runtime_protocol/src/testing/mod.rs b/crates/agent_runtime_protocol/src/testing.rs
similarity index 100%
rename from crates/agent_runtime_protocol/src/testing/mod.rs
rename to crates/agent_runtime_protocol/src/testing.rs
diff --git a/crates/agent_session/src/domain/connection/mod.rs b/crates/agent_session/src/domain/connection.rs
similarity index 100%
rename from crates/agent_session/src/domain/connection/mod.rs
rename to crates/agent_session/src/domain/connection.rs
diff --git a/crates/agent_session/src/outbound/postgres/mod.rs b/crates/agent_session/src/outbound/postgres.rs
similarity index 100%
rename from crates/agent_session/src/outbound/postgres/mod.rs
rename to crates/agent_session/src/outbound/postgres.rs
diff --git a/crates/ai_projections/src/inbound/axum_router/mod.rs b/crates/ai_projections/src/inbound/axum_router.rs
similarity index 100%
rename from crates/ai_projections/src/inbound/axum_router/mod.rs
rename to crates/ai_projections/src/inbound/axum_router.rs
diff --git a/crates/ai_tools/src/search/mod.rs b/crates/ai_tools/src/search.rs
similarity index 100%
rename from crates/ai_tools/src/search/mod.rs
rename to crates/ai_tools/src/search.rs
diff --git a/crates/ai_toolset/src/schema/validate/mod.rs b/crates/ai_toolset/src/schema/validate.rs
similarity index 100%
rename from crates/ai_toolset/src/schema/validate/mod.rs
rename to crates/ai_toolset/src/schema/validate.rs
diff --git a/crates/anthropic/src/client/mod.rs b/crates/anthropic/src/client.rs
similarity index 100%
rename from crates/anthropic/src/client/mod.rs
rename to crates/anthropic/src/client.rs
diff --git a/crates/anthropic/src/toolset/mod.rs b/crates/anthropic/src/toolset.rs
similarity index 100%
rename from crates/anthropic/src/toolset/mod.rs
rename to crates/anthropic/src/toolset.rs
diff --git a/crates/attachment/src/image/mod.rs b/crates/attachment/src/image.rs
similarity index 100%
rename from crates/attachment/src/image/mod.rs
rename to crates/attachment/src/image.rs
diff --git a/crates/bots/src/inbound/toolset/mod.rs b/crates/bots/src/inbound/toolset.rs
similarity index 100%
rename from crates/bots/src/inbound/toolset/mod.rs
rename to crates/bots/src/inbound/toolset.rs
diff --git a/crates/cal/src/inbound/cal_webhook_router/mod.rs b/crates/cal/src/inbound/cal_webhook_router.rs
similarity index 100%
rename from crates/cal/src/inbound/cal_webhook_router/mod.rs
rename to crates/cal/src/inbound/cal_webhook_router.rs
diff --git a/crates/calendar_events/src/inbound/toolset/mod.rs b/crates/calendar_events/src/inbound/toolset.rs
similarity index 100%
rename from crates/calendar_events/src/inbound/toolset/mod.rs
rename to crates/calendar_events/src/inbound/toolset.rs
diff --git a/crates/call/src/inbound/toolset/mod.rs b/crates/call/src/inbound/toolset.rs
similarity index 100%
rename from crates/call/src/inbound/toolset/mod.rs
rename to crates/call/src/inbound/toolset.rs
diff --git a/crates/channel_bots/src/domain/mod.rs b/crates/channel_bots/src/domain.rs
similarity index 100%
rename from crates/channel_bots/src/domain/mod.rs
rename to crates/channel_bots/src/domain.rs
diff --git a/crates/channels/src/inbound/toolset/mod.rs b/crates/channels/src/inbound/toolset.rs
similarity index 100%
rename from crates/channels/src/inbound/toolset/mod.rs
rename to crates/channels/src/inbound/toolset.rs
diff --git a/crates/chat/src/inbound/toolset/mod.rs b/crates/chat/src/inbound/toolset.rs
similarity index 100%
rename from crates/chat/src/inbound/toolset/mod.rs
rename to crates/chat/src/inbound/toolset.rs
diff --git a/crates/chat/src/outbound/postgres/mod.rs b/crates/chat/src/outbound/postgres.rs
similarity index 100%
rename from crates/chat/src/outbound/postgres/mod.rs
rename to crates/chat/src/outbound/postgres.rs
diff --git a/crates/comms_db_client/src/model/mod.rs b/crates/comms_db_client/src/model.rs
similarity index 100%
rename from crates/comms_db_client/src/model/mod.rs
rename to crates/comms_db_client/src/model.rs
diff --git a/crates/connection_gateway_client/src/client/mod.rs b/crates/connection_gateway_client/src/client.rs
similarity index 100%
rename from crates/connection_gateway_client/src/client/mod.rs
rename to crates/connection_gateway_client/src/client.rs
diff --git a/crates/crm/src/inbound/axum_router/mod.rs b/crates/crm/src/inbound/axum_router.rs
similarity index 100%
rename from crates/crm/src/inbound/axum_router/mod.rs
rename to crates/crm/src/inbound/axum_router.rs
diff --git a/crates/crm/src/inbound/toolset/mod.rs b/crates/crm/src/inbound/toolset.rs
similarity index 100%
rename from crates/crm/src/inbound/toolset/mod.rs
rename to crates/crm/src/inbound/toolset.rs
diff --git a/crates/documents/src/domain/create/mod.rs b/crates/documents/src/domain/create.rs
similarity index 100%
rename from crates/documents/src/domain/create/mod.rs
rename to crates/documents/src/domain/create.rs
diff --git a/crates/documents/src/domain/ports/mod.rs b/crates/documents/src/domain/ports.rs
similarity index 100%
rename from crates/documents/src/domain/ports/mod.rs
rename to crates/documents/src/domain/ports.rs
diff --git a/crates/documents/src/domain/ports/create/mod.rs b/crates/documents/src/domain/ports/create.rs
similarity index 100%
rename from crates/documents/src/domain/ports/create/mod.rs
rename to crates/documents/src/domain/ports/create.rs
diff --git a/crates/documents/src/inbound/toolset/mod.rs b/crates/documents/src/inbound/toolset.rs
similarity index 100%
rename from crates/documents/src/inbound/toolset/mod.rs
rename to crates/documents/src/inbound/toolset.rs
diff --git a/crates/email/src/domain/service/mod.rs b/crates/email/src/domain/service.rs
similarity index 100%
rename from crates/email/src/domain/service/mod.rs
rename to crates/email/src/domain/service.rs
diff --git a/crates/email/src/inbound/toolset/mod.rs b/crates/email/src/inbound/toolset.rs
similarity index 100%
rename from crates/email/src/inbound/toolset/mod.rs
rename to crates/email/src/inbound/toolset.rs
diff --git a/crates/email/src/outbound/email_pg_repo/mod.rs b/crates/email/src/outbound/email_pg_repo.rs
similarity index 100%
rename from crates/email/src/outbound/email_pg_repo/mod.rs
rename to crates/email/src/outbound/email_pg_repo.rs
diff --git a/crates/email/src/outbound/email_pg_repo/dynamic/mod.rs b/crates/email/src/outbound/email_pg_repo/dynamic.rs
similarity index 100%
rename from crates/email/src/outbound/email_pg_repo/dynamic/mod.rs
rename to crates/email/src/outbound/email_pg_repo/dynamic.rs
diff --git a/crates/email/src/outbound/email_pg_repo/test/mod.rs b/crates/email/src/outbound/email_pg_repo/test.rs
similarity index 100%
rename from crates/email/src/outbound/email_pg_repo/test/mod.rs
rename to crates/email/src/outbound/email_pg_repo/test.rs
diff --git a/crates/email_api_client/src/domain/service/mod.rs b/crates/email_api_client/src/domain/service.rs
similarity index 100%
rename from crates/email_api_client/src/domain/service/mod.rs
rename to crates/email_api_client/src/domain/service.rs
diff --git a/crates/email_api_client/src/outbound/gmail/mod.rs b/crates/email_api_client/src/outbound/gmail.rs
similarity index 100%
rename from crates/email_api_client/src/outbound/gmail/mod.rs
rename to crates/email_api_client/src/outbound/gmail.rs
diff --git a/crates/email_api_client/src/outbound/gmail/test/mod.rs b/crates/email_api_client/src/outbound/gmail/test.rs
similarity index 100%
rename from crates/email_api_client/src/outbound/gmail/test/mod.rs
rename to crates/email_api_client/src/outbound/gmail/test.rs
diff --git a/crates/email_db_client/src/attachments/draft/mod.rs b/crates/email_db_client/src/attachments/draft.rs
similarity index 100%
rename from crates/email_db_client/src/attachments/draft/mod.rs
rename to crates/email_db_client/src/attachments/draft.rs
diff --git a/crates/email_db_client/src/attachments/forwarded/mod.rs b/crates/email_db_client/src/attachments/forwarded.rs
similarity index 100%
rename from crates/email_db_client/src/attachments/forwarded/mod.rs
rename to crates/email_db_client/src/attachments/forwarded.rs
diff --git a/crates/email_db_client/src/attachments/provider/mod.rs b/crates/email_db_client/src/attachments/provider.rs
similarity index 100%
rename from crates/email_db_client/src/attachments/provider/mod.rs
rename to crates/email_db_client/src/attachments/provider.rs
diff --git a/crates/email_db_client/src/attachments/sfs/mod.rs b/crates/email_db_client/src/attachments/sfs.rs
similarity index 100%
rename from crates/email_db_client/src/attachments/sfs/mod.rs
rename to crates/email_db_client/src/attachments/sfs.rs
diff --git a/crates/email_db_client/src/histories/mod.rs b/crates/email_db_client/src/histories.rs
similarity index 100%
rename from crates/email_db_client/src/histories/mod.rs
rename to crates/email_db_client/src/histories.rs
diff --git a/crates/email_db_client/src/settings/mod.rs b/crates/email_db_client/src/settings.rs
similarity index 100%
rename from crates/email_db_client/src/settings/mod.rs
rename to crates/email_db_client/src/settings.rs
diff --git a/crates/email_db_client/src/sfs_mappings/mod.rs b/crates/email_db_client/src/sfs_mappings.rs
similarity index 100%
rename from crates/email_db_client/src/sfs_mappings/mod.rs
rename to crates/email_db_client/src/sfs_mappings.rs
diff --git a/crates/email_db_client/src/user_history/mod.rs b/crates/email_db_client/src/user_history.rs
similarity index 100%
rename from crates/email_db_client/src/user_history/mod.rs
rename to crates/email_db_client/src/user_history.rs
diff --git a/crates/email_service_client/src/external/mod.rs b/crates/email_service_client/src/external.rs
similarity index 100%
rename from crates/email_service_client/src/external/mod.rs
rename to crates/email_service_client/src/external.rs
diff --git a/crates/email_utils/src/body_replyless/mod.rs b/crates/email_utils/src/body_replyless.rs
similarity index 100%
rename from crates/email_utils/src/body_replyless/mod.rs
rename to crates/email_utils/src/body_replyless.rs
diff --git a/crates/email_utils/src/generic_email/mod.rs b/crates/email_utils/src/generic_email.rs
similarity index 100%
rename from crates/email_utils/src/generic_email/mod.rs
rename to crates/email_utils/src/generic_email.rs
diff --git a/crates/email_utils/src/normalize_contact/mod.rs b/crates/email_utils/src/normalize_contact.rs
similarity index 100%
rename from crates/email_utils/src/normalize_contact/mod.rs
rename to crates/email_utils/src/normalize_contact.rs
diff --git a/crates/entity_access/src/inbound/axum_extractors/mod.rs b/crates/entity_access/src/inbound/axum_extractors.rs
similarity index 100%
rename from crates/entity_access/src/inbound/axum_extractors/mod.rs
rename to crates/entity_access/src/inbound/axum_extractors.rs
diff --git a/crates/entity_access/src/outbound/pg_access_repo/mod.rs b/crates/entity_access/src/outbound/pg_access_repo.rs
similarity index 100%
rename from crates/entity_access/src/outbound/pg_access_repo/mod.rs
rename to crates/entity_access/src/outbound/pg_access_repo.rs
diff --git a/crates/entity_access/src/outbound/pg_access_repo/queries/mod.rs b/crates/entity_access/src/outbound/pg_access_repo/queries.rs
similarity index 100%
rename from crates/entity_access/src/outbound/pg_access_repo/queries/mod.rs
rename to crates/entity_access/src/outbound/pg_access_repo/queries.rs
diff --git a/crates/entity_access/src/outbound/pg_access_repo/queries/call_access/mod.rs b/crates/entity_access/src/outbound/pg_access_repo/queries/call_access.rs
similarity index 100%
rename from crates/entity_access/src/outbound/pg_access_repo/queries/call_access/mod.rs
rename to crates/entity_access/src/outbound/pg_access_repo/queries/call_access.rs
diff --git a/crates/fusionauth/src/google/mod.rs b/crates/fusionauth/src/google.rs
similarity index 100%
rename from crates/fusionauth/src/google/mod.rs
rename to crates/fusionauth/src/google.rs
diff --git a/crates/fusionauth/src/identity_provider/mod.rs b/crates/fusionauth/src/identity_provider.rs
similarity index 100%
rename from crates/fusionauth/src/identity_provider/mod.rs
rename to crates/fusionauth/src/identity_provider.rs
diff --git a/crates/fusionauth/src/jwt/mod.rs b/crates/fusionauth/src/jwt.rs
similarity index 100%
rename from crates/fusionauth/src/jwt/mod.rs
rename to crates/fusionauth/src/jwt.rs
diff --git a/crates/fusionauth/src/microsoft/mod.rs b/crates/fusionauth/src/microsoft.rs
similarity index 100%
rename from crates/fusionauth/src/microsoft/mod.rs
rename to crates/fusionauth/src/microsoft.rs
diff --git a/crates/fusionauth/src/oauth/mod.rs b/crates/fusionauth/src/oauth.rs
similarity index 100%
rename from crates/fusionauth/src/oauth/mod.rs
rename to crates/fusionauth/src/oauth.rs
diff --git a/crates/fusionauth/src/passwordless/mod.rs b/crates/fusionauth/src/passwordless.rs
similarity index 100%
rename from crates/fusionauth/src/passwordless/mod.rs
rename to crates/fusionauth/src/passwordless.rs
diff --git a/crates/fusionauth/src/user/mod.rs b/crates/fusionauth/src/user.rs
similarity index 100%
rename from crates/fusionauth/src/user/mod.rs
rename to crates/fusionauth/src/user.rs
diff --git a/crates/github/src/domain/models/mod.rs b/crates/github/src/domain/models.rs
similarity index 100%
rename from crates/github/src/domain/models/mod.rs
rename to crates/github/src/domain/models.rs
diff --git a/crates/github/src/domain/service/sync/mod.rs b/crates/github/src/domain/service/sync.rs
similarity index 100%
rename from crates/github/src/domain/service/sync/mod.rs
rename to crates/github/src/domain/service/sync.rs
diff --git a/crates/github/src/inbound/github_sync_router/mod.rs b/crates/github/src/inbound/github_sync_router.rs
similarity index 100%
rename from crates/github/src/inbound/github_sync_router/mod.rs
rename to crates/github/src/inbound/github_sync_router.rs
diff --git a/crates/macro_db_client/src/advisory_lock/mod.rs b/crates/macro_db_client/src/advisory_lock.rs
similarity index 100%
rename from crates/macro_db_client/src/advisory_lock/mod.rs
rename to crates/macro_db_client/src/advisory_lock.rs
diff --git a/crates/macro_db_client/src/annotations/mod.rs b/crates/macro_db_client/src/annotations.rs
similarity index 100%
rename from crates/macro_db_client/src/annotations/mod.rs
rename to crates/macro_db_client/src/annotations.rs
diff --git a/crates/macro_db_client/src/chat/mod.rs b/crates/macro_db_client/src/chat.rs
similarity index 100%
rename from crates/macro_db_client/src/chat/mod.rs
rename to crates/macro_db_client/src/chat.rs
diff --git a/crates/macro_db_client/src/chat_history/mod.rs b/crates/macro_db_client/src/chat_history.rs
similarity index 100%
rename from crates/macro_db_client/src/chat_history/mod.rs
rename to crates/macro_db_client/src/chat_history.rs
diff --git a/crates/macro_db_client/src/convert/mod.rs b/crates/macro_db_client/src/convert.rs
similarity index 100%
rename from crates/macro_db_client/src/convert/mod.rs
rename to crates/macro_db_client/src/convert.rs
diff --git a/crates/macro_db_client/src/document_text/mod.rs b/crates/macro_db_client/src/document_text.rs
similarity index 86%
rename from crates/macro_db_client/src/document_text/mod.rs
rename to crates/macro_db_client/src/document_text.rs
index aa2fd5a55e..cf9aa77cc7 100644
--- a/crates/macro_db_client/src/document_text/mod.rs
+++ b/crates/macro_db_client/src/document_text.rs
@@ -23,14 +23,14 @@ pub async fn get_document_text(
mod tests {
use super::*;
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("document_text")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("document_text")))]
async fn test_get_document_text(pool: Pool<Postgres>) -> anyhow::Result<()> {
let document_text = get_document_text(&pool, "document-one").await?;
assert_eq!(document_text, "test document text");
Ok(())
}
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("document_text")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("document_text")))]
async fn test_get_document_text_no_exist(pool: Pool<Postgres>) -> anyhow::Result<()> {
let error = get_document_text(&pool, "document-two").await.unwrap_err();
assert_eq!(error.to_string(), sqlx::Error::RowNotFound.to_string());
diff --git a/crates/macro_db_client/src/docx_unzip/mod.rs b/crates/macro_db_client/src/docx_unzip.rs
similarity index 94%
rename from crates/macro_db_client/src/docx_unzip/mod.rs
rename to crates/macro_db_client/src/docx_unzip.rs
index 73800e1f0e..ee520d44f2 100644
--- a/crates/macro_db_client/src/docx_unzip/mod.rs
+++ b/crates/macro_db_client/src/docx_unzip.rs
@@ -91,7 +91,7 @@ mod tests {
use super::*;
use sqlx::{Pool, Postgres};
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("basic_user_with_document.sql")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("basic_user_with_document.sql")))]
async fn test_save_bom_parts_to_db(pool: Pool<Postgres>) {
let result = save_bom_parts_to_db(
&pool,
@@ -136,7 +136,7 @@ mod tests {
assert_eq!(result.len(), 3);
}
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("basic_user_with_document.sql")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("basic_user_with_document.sql")))]
async fn test_update_uploaded_status(pool: Pool<Postgres>) -> anyhow::Result<()> {
update_uploaded_status(&pool, "document-one").await?;
@@ -158,7 +158,7 @@ mod tests {
Ok(())
}
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("basic_user_with_document.sql")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("basic_user_with_document.sql")))]
async fn test_get_job_id_for_docx_upload(pool: Pool<Postgres>) {
let result = get_job_for_docx_upload(&pool, "document-one").await;
diff --git a/crates/macro_db_client/src/experiment/mod.rs b/crates/macro_db_client/src/experiment.rs
similarity index 100%
rename from crates/macro_db_client/src/experiment/mod.rs
rename to crates/macro_db_client/src/experiment.rs
diff --git a/crates/macro_db_client/src/experiment_log/mod.rs b/crates/macro_db_client/src/experiment_log.rs
similarity index 100%
rename from crates/macro_db_client/src/experiment_log/mod.rs
rename to crates/macro_db_client/src/experiment_log.rs
diff --git a/crates/macro_db_client/src/history/mod.rs b/crates/macro_db_client/src/history.rs
similarity index 98%
rename from crates/macro_db_client/src/history/mod.rs
rename to crates/macro_db_client/src/history.rs
index 3d69e56824..3bfdc8b721 100644
--- a/crates/macro_db_client/src/history/mod.rs
+++ b/crates/macro_db_client/src/history.rs
@@ -195,7 +195,7 @@ mod tests {
use super::*;
use sqlx::{Pool, Postgres};
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("simple_history")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("simple_history")))]
async fn test_get_user_history_simple(pool: Pool<Postgres>) -> anyhow::Result<()> {
let recent = get_user_history(&pool, "macro|[email protected]").await?;
assert_eq!(recent.len(), 3);
diff --git a/crates/macro_db_client/src/in_progress_email_link/mod.rs b/crates/macro_db_client/src/in_progress_email_link.rs
similarity index 100%
rename from crates/macro_db_client/src/in_progress_email_link/mod.rs
rename to crates/macro_db_client/src/in_progress_email_link.rs
diff --git a/crates/macro_db_client/src/macro_user/mod.rs b/crates/macro_db_client/src/macro_user.rs
similarity index 100%
rename from crates/macro_db_client/src/macro_user/mod.rs
rename to crates/macro_db_client/src/macro_user.rs
diff --git a/crates/macro_db_client/src/macro_user_email_verification/mod.rs b/crates/macro_db_client/src/macro_user_email_verification.rs
similarity index 100%
rename from crates/macro_db_client/src/macro_user_email_verification/mod.rs
rename to crates/macro_db_client/src/macro_user_email_verification.rs
diff --git a/crates/macro_db_client/src/notification/mod.rs b/crates/macro_db_client/src/notification.rs
similarity index 100%
rename from crates/macro_db_client/src/notification/mod.rs
rename to crates/macro_db_client/src/notification.rs
diff --git a/crates/macro_db_client/src/organization/mod.rs b/crates/macro_db_client/src/organization.rs
similarity index 100%
rename from crates/macro_db_client/src/organization/mod.rs
rename to crates/macro_db_client/src/organization.rs
diff --git a/crates/macro_db_client/src/organization/create/organization_retention_policy/mod.rs b/crates/macro_db_client/src/organization/create/organization_retention_policy.rs
similarity index 100%
rename from crates/macro_db_client/src/organization/create/organization_retention_policy/mod.rs
rename to crates/macro_db_client/src/organization/create/organization_retention_policy.rs
diff --git a/crates/macro_db_client/src/organization/patch/organization_retention_policy/mod.rs b/crates/macro_db_client/src/organization/patch/organization_retention_policy.rs
similarity index 100%
rename from crates/macro_db_client/src/organization/patch/organization_retention_policy/mod.rs
rename to crates/macro_db_client/src/organization/patch/organization_retention_policy.rs
diff --git a/crates/macro_db_client/src/organization/remove/organization_default_share_permission/mod.rs b/crates/macro_db_client/src/organization/remove/organization_default_share_permission.rs
similarity index 100%
rename from crates/macro_db_client/src/organization/remove/organization_default_share_permission/mod.rs
rename to crates/macro_db_client/src/organization/remove/organization_default_share_permission.rs
diff --git a/crates/macro_db_client/src/organization/remove/organization_retention_policy/mod.rs b/crates/macro_db_client/src/organization/remove/organization_retention_policy.rs
similarity index 100%
rename from crates/macro_db_client/src/organization/remove/organization_retention_policy/mod.rs
rename to crates/macro_db_client/src/organization/remove/organization_retention_policy.rs
diff --git a/crates/macro_db_client/src/pins/mod.rs b/crates/macro_db_client/src/pins.rs
similarity index 96%
rename from crates/macro_db_client/src/pins/mod.rs
rename to crates/macro_db_client/src/pins.rs
index 3a8c624d13..b3e3c80a7d 100644
--- a/crates/macro_db_client/src/pins/mod.rs
+++ b/crates/macro_db_client/src/pins.rs
@@ -343,7 +343,7 @@ mod tests {
use super::*;
use sqlx::{Pool, Postgres};
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("basic_pinned_document")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("basic_pinned_document")))]
async fn test_upsert_pin(pool: Pool<Postgres>) {
upsert_pin(
pool.clone(),
@@ -391,7 +391,7 @@ mod tests {
assert_eq!(time.createdAt, time.updatedAt);
}
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("basic_user_with_lots_of_documents")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("basic_user_with_lots_of_documents")))]
async fn test_get_pins(pool: Pool<Postgres>) {
let pins = get_pins(pool.clone(), "macro|[email protected]").await.unwrap();
@@ -419,7 +419,7 @@ mod tests {
);
}
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("basic_user_with_lots_of_documents")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("basic_user_with_lots_of_documents")))]
async fn test_get_pins_no_pins(pool: Pool<Postgres>) {
// document doesn't exist
let documents = get_pins(pool.clone(), "bad_user").await.unwrap();
@@ -428,7 +428,7 @@ mod tests {
assert_eq!(documents, vec![]);
}
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("basic_pinned_document")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("basic_pinned_document")))]
async fn test_remove_pin(pool: Pool<Postgres>) {
// document doesn't exist
remove_pin(
@@ -467,7 +467,7 @@ mod tests {
.unwrap();
}
- #[sqlx::test(fixtures(path = "../../fixtures", scripts("basic_user_with_lots_of_documents")))]
+ #[sqlx::test(fixtures(path = "../fixtures", scripts("basic_user_with_lots_of_documents")))]
async fn test_reorder_pins(pool: Pool<Postgres>) {
reorder_pins(
pool.clone(),
diff --git a/crates/macro_db_client/src/share_on_mention/mod.rs b/crates/macro_db_client/src/share_on_mention.rs
similarity index 100%
rename from crates/macro_db_client/src/share_on_mention/mod.rs
rename to crates/macro_db_client/src/share_on_mention.rs
diff --git a/crates/macro_db_client/src/share_permission/channel_permission/mod.rs b/crates/macro_db_client/src/share_permission/channel_permission.rs
similarity index 100%
rename from crates/macro_db_client/src/share_permission/channel_permission/mod.rs
rename to crates/macro_db_client/src/share_permission/channel_permission.rs
diff --git a/crates/macro_db_client/src/user/get/mod.rs b/crates/macro_db_client/src/user/get.rs
similarity index 100%
rename from crates/macro_db_client/src/user/get/mod.rs
rename to crates/macro_db_client/src/user/get.rs
diff --git a/crates/macro_db_client/src/user/patch/mod.rs b/crates/macro_db_client/src/user/patch.rs
similarity index 100%
rename from crates/macro_db_client/src/user/patch/mod.rs
rename to crates/macro_db_client/src/user/patch.rs
diff --git a/crates/mcp_client/src/domain/provider_registry/mod.rs b/crates/mcp_client/src/domain/provider_registry.rs
similarity index 96%
rename from crates/mcp_client/src/domain/provider_registry/mod.rs
rename to crates/mcp_client/src/domain/provider_registry.rs
index 84829e5bd3..c23e11199f 100644
--- a/crates/mcp_client/src/domain/provider_registry/mod.rs
+++ b/crates/mcp_client/src/domain/provider_registry.rs
@@ -24,7 +24,8 @@ macro_env_var::env_var! {
fn slack_scopes() -> Vec<String> {
let manifest: serde_json::Value =
- serde_json::from_str(include_str!("slack/manifest.json")).expect("valid slack manifest");
+ serde_json::from_str(include_str!("provider_registry/slack/manifest.json"))
+ .expect("valid slack manifest");
manifest["oauth_config"]["scopes"]["user"]
.as_array()
.expect("manifest missing oauth_config.scopes.user")
diff --git a/crates/model/src/annotations/mod.rs b/crates/model/src/annotations.rs
similarity index 100%
rename from crates/model/src/annotations/mod.rs
rename to crates/model/src/annotations.rs
diff --git a/crates/model/src/authentication/webhooks/mod.rs b/crates/model/src/authentication/webhooks.rs
similarity index 100%
rename from crates/model/src/authentication/webhooks/mod.rs
rename to crates/model/src/authentication/webhooks.rs
diff --git a/crates/model/src/channel/mod.rs b/crates/model/src/channel.rs
similarity index 100%
rename from crates/model/src/channel/mod.rs
rename to crates/model/src/channel.rs
diff --git a/crates/model/src/chat/mod.rs b/crates/model/src/chat.rs
similarity index 100%
rename from crates/model/src/chat/mod.rs
rename to crates/model/src/chat.rs
diff --git a/crates/model/src/citations/mod.rs b/crates/model/src/citations.rs
similarity index 100%
rename from crates/model/src/citations/mod.rs
rename to crates/model/src/citations.rs
diff --git a/crates/model/src/convert/mod.rs b/crates/model/src/convert.rs
similarity index 100%
rename from crates/model/src/convert/mod.rs
rename to crates/model/src/convert.rs
diff --git a/crates/model/src/document/mod.rs b/crates/model/src/document.rs
similarity index 100%
rename from crates/model/src/document/mod.rs
rename to crates/model/src/document.rs
diff --git a/crates/model/src/document/docx/mod.rs b/crates/model/src/document/docx.rs
similarity index 100%
rename from crates/model/src/document/docx/mod.rs
rename to crates/model/src/document/docx.rs
diff --git a/crates/model/src/document/file_type/mod.rs b/crates/model/src/document/file_type.rs
similarity index 100%
rename from crates/model/src/document/file_type/mod.rs
rename to crates/model/src/document/file_type.rs
diff --git a/crates/model/src/document/response/mod.rs b/crates/model/src/document/response.rs
similarity index 100%
rename from crates/model/src/document/response/mod.rs
rename to crates/model/src/document/response.rs
diff --git a/crates/model/src/experiment/mod.rs b/crates/model/src/experiment.rs
similarity index 100%
rename from crates/model/src/experiment/mod.rs
rename to crates/model/src/experiment.rs
diff --git a/crates/model/src/item/mod.rs b/crates/model/src/item.rs
similarity index 100%
rename from crates/model/src/item/mod.rs
rename to crates/model/src/item.rs
diff --git a/crates/model/src/organization/mod.rs b/crates/model/src/organization.rs
similarity index 100%
rename from crates/model/src/organization/mod.rs
rename to crates/model/src/organization.rs
diff --git a/crates/model/src/pin/mod.rs b/crates/model/src/pin.rs
similarity index 100%
rename from crates/model/src/pin/mod.rs
rename to crates/model/src/pin.rs
diff --git a/crates/model/src/project/mod.rs b/crates/model/src/project.rs
similarity index 100%
rename from crates/model/src/project/mod.rs
rename to crates/model/src/project.rs
diff --git a/crates/model/src/response/mod.rs b/crates/model/src/response.rs
similarity index 100%
rename from crates/model/src/response/mod.rs
rename to crates/model/src/response.rs
diff --git a/crates/model/src/sync_service/mod.rs b/crates/model/src/sync_service.rs
similarity index 100%
rename from crates/model/src/sync_service/mod.rs
rename to crates/model/src/sync_service.rs
diff --git a/crates/model/src/thread/mod.rs b/crates/model/src/thread.rs
similarity index 100%
rename from crates/model/src/thread/mod.rs
rename to crates/model/src/thread.rs
diff --git a/crates/model/src/user_document_view_location/mod.rs b/crates/model/src/user_document_view_location.rs
similarity index 100%
rename from crates/model/src/user_document_view_location/mod.rs
rename to crates/model/src/user_document_view_location.rs
diff --git a/crates/models_email/src/gmail/mod.rs b/crates/models_email/src/gmail.rs
similarity index 100%
rename from crates/models_email/src/gmail/mod.rs
rename to crates/models_email/src/gmail.rs
diff --git a/crates/models_permissions/src/share_permission/mod.rs b/crates/models_permissions/src/share_permission.rs
similarity index 100%
rename from crates/models_permissions/src/share_permission/mod.rs
rename to crates/models_permissions/src/share_permission.rs
diff --git a/crates/notification/src/domain/service/push_notification_event/mod.rs b/crates/notification/src/domain/service/push_notification_event.rs
similarity index 100%
rename from crates/notification/src/domain/service/push_notification_event/mod.rs
rename to crates/notification/src/domain/service/push_notification_event.rs
diff --git a/crates/notification/src/inbound/ai_tool/mod.rs b/crates/notification/src/inbound/ai_tool.rs
similarity index 100%
rename from crates/notification/src/inbound/ai_tool/mod.rs
rename to crates/notification/src/inbound/ai_tool.rs
diff --git a/crates/notification/src/inbound/http/mod.rs b/crates/notification/src/inbound/http.rs
similarity index 100%
rename from crates/notification/src/inbound/http/mod.rs
rename to crates/notification/src/inbound/http.rs
diff --git a/crates/notification_db_client/src/channel_notification_email_sent/mod.rs b/crates/notification_db_client/src/channel_notification_email_sent.rs
similarity index 100%
rename from crates/notification_db_client/src/channel_notification_email_sent/mod.rs
rename to crates/notification_db_client/src/channel_notification_email_sent.rs
diff --git a/crates/notification_db_client/src/device/mod.rs b/crates/notification_db_client/src/device.rs
similarity index 98%
rename from crates/notification_db_client/src/device/mod.rs
rename to crates/notification_db_client/src/device.rs
index 979b0863b2..5637758695 100644
--- a/crates/notification_db_client/src/device/mod.rs
+++ b/crates/notification_db_client/src/device.rs
@@ -190,7 +190,7 @@ mod tests {
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
- fixtures(path = "../../fixtures", scripts("user_devices"))
+ fixtures(path = "../fixtures", scripts("user_devices"))
)]
async fn test_upsert_existing_user_device(pool: Pool<Postgres>) -> anyhow::Result<()> {
let new_token = "new_token_123";
@@ -236,7 +236,7 @@ mod tests {
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
- fixtures(path = "../../fixtures", scripts("user_devices"))
+ fixtures(path = "../fixtures", scripts("user_devices"))
)]
async fn test_delete_user_device(pool: Pool<Postgres>) -> anyhow::Result<()> {
let result = sqlx::query!(
diff --git a/crates/opensearch_client/src/search/model/mod.rs b/crates/opensearch_client/src/search/model.rs
similarity index 100%
rename from crates/opensearch_client/src/search/model/mod.rs
rename to crates/opensearch_client/src/search/model.rs
diff --git a/crates/opensearch_client/src/upsert/mod.rs b/crates/opensearch_client/src/upsert.rs
similarity index 100%
rename from crates/opensearch_client/src/upsert/mod.rs
rename to crates/opensearch_client/src/upsert.rs
diff --git a/crates/projects/src/inbound/toolset/mod.rs b/crates/projects/src/inbound/toolset.rs
similarity index 100%
rename from crates/projects/src/inbound/toolset/mod.rs
rename to crates/projects/src/inbound/toolset.rs
diff --git a/crates/properties/src/domain/service_impl/mod.rs b/crates/properties/src/domain/service_impl.rs
similarity index 100%
rename from crates/properties/src/domain/service_impl/mod.rs
rename to crates/properties/src/domain/service_impl.rs
diff --git a/crates/properties/src/inbound/toolset/mod.rs b/crates/properties/src/inbound/toolset.rs
similarity index 100%
rename from crates/properties/src/inbound/toolset/mod.rs
rename to crates/properties/src/inbound/toolset.rs
diff --git a/crates/properties_service/src/api/mod.rs b/crates/properties_service/src/api.rs
similarity index 100%
rename from crates/properties_service/src/api/mod.rs
rename to crates/properties_service/src/api.rs
diff --git a/crates/reminders/src/inbound/toolset/mod.rs b/crates/reminders/src/inbound/toolset.rs
similarity index 100%
rename from crates/reminders/src/inbound/toolset/mod.rs
rename to crates/reminders/src/inbound/toolset.rs
diff --git a/crates/search_service/src/api/mod.rs b/crates/search_service/src/api.rs
similarity index 100%
rename from crates/search_service/src/api/mod.rs
rename to crates/search_service/src/api.rs
diff --git a/crates/search_service/src/api/search/mod.rs b/crates/search_service/src/api/search.rs
similarity index 100%
rename from crates/search_service/src/api/search/mod.rs
rename to crates/search_service/src/api/search.rs
diff --git a/crates/search_service/src/api/search/simple/mod.rs b/crates/search_service/src/api/search/simple.rs
similarity index 100%
rename from crates/search_service/src/api/search/simple/mod.rs
rename to crates/search_service/src/api/search/simple.rs
diff --git a/crates/skills/src/inbound/toolset/mod.rs b/crates/skills/src/inbound/toolset.rs
similarity index 100%
rename from crates/skills/src/inbound/toolset/mod.rs
rename to crates/skills/src/inbound/toolset.rs
diff --git a/crates/soup/src/inbound/toolset/mod.rs b/crates/soup/src/inbound/toolset.rs
similarity index 100%
rename from crates/soup/src/inbound/toolset/mod.rs
rename to crates/soup/src/inbound/toolset.rs
diff --git a/crates/sqs_client/src/ai_projection/mod.rs b/crates/sqs_client/src/ai_projection.rs
similarity index 100%
rename from crates/sqs_client/src/ai_projection/mod.rs
rename to crates/sqs_client/src/ai_projection.rs
diff --git a/crates/sqs_client/src/chat/mod.rs b/crates/sqs_client/src/chat.rs
similarity index 100%
rename from crates/sqs_client/src/chat/mod.rs
rename to crates/sqs_client/src/chat.rs
diff --git a/crates/sqs_client/src/document/mod.rs b/crates/sqs_client/src/document.rs
similarity index 100%
rename from crates/sqs_client/src/document/mod.rs
rename to crates/sqs_client/src/document.rs
diff --git a/crates/sqs_client/src/document_text_extractor/mod.rs b/crates/sqs_client/src/document_text_extractor.rs
similarity index 100%
rename from crates/sqs_client/src/document_text_extractor/mod.rs
rename to crates/sqs_client/src/document_text_extractor.rs
diff --git a/crates/sqs_client/src/organization_retention/mod.rs b/crates/sqs_client/src/organization_retention.rs
similarity index 100%
rename from crates/sqs_client/src/organization_retention/mod.rs
rename to crates/sqs_client/src/organization_retention.rs
diff --git a/crates/sqs_client/src/search/mod.rs b/crates/sqs_client/src/search.rs
similarity index 100%
rename from crates/sqs_client/src/search/mod.rs
rename to crates/sqs_client/src/search.rs
diff --git a/crates/stream/src/outbound/redis_pg/queries/mod.rs b/crates/stream/src/outbound/redis_pg/queries.rs
similarity index 100%
rename from crates/stream/src/outbound/redis_pg/queries/mod.rs
rename to crates/stream/src/outbound/redis_pg/queries.rs
diff --git a/crates/system_properties/src/outbound/pgpool/mod.rs b/crates/system_properties/src/outbound/pgpool.rs
similarity index 100%
rename from crates/system_properties/src/outbound/pgpool/mod.rs
rename to crates/system_properties/src/outbound/pgpool.rs
diff --git a/crates/teams/src/inbound/axum_router/mod.rs b/crates/teams/src/inbound/axum_router.rs
similarity index 100%
rename from crates/teams/src/inbound/axum_router/mod.rs
rename to crates/teams/src/inbound/axum_router.rs
diff --git a/crates/teams/src/inbound/toolset/mod.rs b/crates/teams/src/inbound/toolset.rs
similarity index 100%
rename from crates/teams/src/inbound/toolset/mod.rs
rename to crates/teams/src/inbound/toolset.rs
diff --git a/crates/worker-rs-otel/src/exporter/mod.rs b/crates/worker-rs-otel/src/exporter.rs
similarity index 100%
rename from crates/worker-rs-otel/src/exporter/mod.rs
rename to crates/worker-rs-otel/src/exporter.rs
diff --git a/crates/worker-rs-otel/src/layer/mod.rs b/crates/worker-rs-otel/src/layer.rs
similarity index 100%
rename from crates/worker-rs-otel/src/layer/mod.rs
rename to crates/worker-rs-otel/src/layer.rs
diff --git a/crates/worker-rs-otel/src/proto/mod.rs b/crates/worker-rs-otel/src/proto.rs
similarity index 100%
rename from crates/worker-rs-otel/src/proto/mod.rs
rename to crates/worker-rs-otel/src/proto.rs
diff --git a/crates/worker-rs-otel/src/trace_context/mod.rs b/crates/worker-rs-otel/src/trace_context.rs
similarity index 100%
rename from crates/worker-rs-otel/src/trace_context/mod.rs
rename to crates/worker-rs-otel/src/trace_context.rs
diff --git a/docs/STYLE_GUIDE.md b/docs/STYLE_GUIDE.md
index 9282740fa1..c32027255d 100644
--- a/docs/STYLE_GUIDE.md
+++ b/docs/STYLE_GUIDE.md
@@ -84,9 +84,9 @@ TypeScript · `[ui]` UI / UX conventions
the catch-all crates must shrink, not accumulate. (#4380)
- **CS-24** `[arch]` Keep source files under ~1000 lines — split before a reviewer has
to ask. (#4364)
-- **CS-25** `[arch]` `mod.rs` declares submodules; it doesn't host logic — move real
- code into its own module file. (#4175 · enforced: ast-grep
- `rust-mod-rs-declarations-only`, hint)
+- **CS-25** `[arch]` `mod.rs` declares submodules; it doesn't host logic — prefer the
+ `foo.rs` + `foo/` file-and-directory style for modules with logic. (#4175 · enforced:
+ ast-grep `rust-mod-rs-declarations-only`, error)
- **CS-26** `[arch]` Reuse before reimplementing — if the logic plausibly exists
(service clients, permission checks, oauth utils, the `agent` crate), find it and
reuse/extract it instead of writing a second copy. (#3692, #4020, #4380, #4485)
diff --git a/rules/ast-grep/rust-mod-rs-declarations-only.yml b/rules/ast-grep/rust-mod-rs-declarations-only.yml
index 3ea1a0fc54..9cbf3456a2 100644
--- a/rules/ast-grep/rust-mod-rs-declarations-only.yml
+++ b/rules/ast-grep/rust-mod-rs-declarations-only.yml
@@ -1,14 +1,14 @@
id: rust-mod-rs-declarations-only
language: rust
-severity: hint
+severity: error
message: mod.rs should only declare submodules and re-exports; move logic into its own module file.
note: |-
Rule CS-25 in docs/STYLE_GUIDE.md, mined from PR #4175.
- Define functions, types, and impls in a named module file and re-export
- from mod.rs if needed. lib.rs is deliberately exempt: a small crate
- living entirely in lib.rs is fine.
- Aspirational: ~246 existing mod.rs files violate this; apply it to new
- modules and to mod.rs files you are already refactoring.
+ Prefer the file-and-directory module style: put logic and submodule
+ declarations in `foo.rs` with submodules under `foo/` (Rust supports both
+ coexisting) — that is how all legacy violations were resolved. If you keep
+ a mod.rs, it may only declare submodules and re-exports. lib.rs is
+ deliberately exempt: a small crate living entirely in lib.rs is fine.
files:
- crates/**/mod.rs
- services/**/mod.rs
diff --git a/services/authentication_service/src/api/mod.rs b/services/authentication_service/src/api.rs
similarity index 100%
rename from services/authentication_service/src/api/mod.rs
rename to services/authentication_service/src/api.rs
diff --git a/services/authentication_service/src/api/email/mod.rs b/services/authentication_service/src/api/email.rs
similarity index 100%
rename from services/authentication_service/src/api/email/mod.rs
rename to services/authentication_service/src/api/email.rs
diff --git a/services/authentication_service/src/api/internal/mod.rs b/services/authentication_service/src/api/internal.rs
similarity index 100%
rename from services/authentication_service/src/api/internal/mod.rs
rename to services/authentication_service/src/api/internal.rs
diff --git a/services/authentication_service/src/api/jwt/mod.rs b/services/authentication_service/src/api/jwt.rs
similarity index 100%
rename from services/authentication_service/src/api/jwt/mod.rs
rename to services/authentication_service/src/api/jwt.rs
diff --git a/services/authentication_service/src/api/link/mod.rs b/services/authentication_service/src/api/link.rs
similarity index 100%
rename from services/authentication_service/src/api/link/mod.rs
rename to services/authentication_service/src/api/link.rs
diff --git a/services/authentication_service/src/api/login/mod.rs b/services/authentication_service/src/api/login.rs
similarity index 100%
rename from services/authentication_service/src/api/login/mod.rs
rename to services/authentication_service/src/api/login.rs
diff --git a/services/authentication_service/src/api/merge/mod.rs b/services/authentication_service/src/api/merge.rs
similarity index 100%
rename from services/authentication_service/src/api/merge/mod.rs
rename to services/authentication_service/src/api/merge.rs
diff --git a/services/authentication_service/src/api/mobile_welcome_email/mod.rs b/services/authentication_service/src/api/mobile_welcome_email.rs
similarity index 100%
rename from services/authentication_service/src/api/mobile_welcome_email/mod.rs
rename to services/authentication_service/src/api/mobile_welcome_email.rs
diff --git a/services/authentication_service/src/api/oauth/mod.rs b/services/authentication_service/src/api/oauth.rs
similarity index 100%
rename from services/authentication_service/src/api/oauth/mod.rs
rename to services/authentication_service/src/api/oauth.rs
diff --git a/services/authentication_service/src/api/oauth2/mod.rs b/services/authentication_service/src/api/oauth2.rs
similarity index 100%
rename from services/authentication_service/src/api/oauth2/mod.rs
rename to services/authentication_service/src/api/oauth2.rs
diff --git a/services/authentication_service/src/api/permissions/mod.rs b/services/authentication_service/src/api/permissions.rs
similarity index 100%
rename from services/authentication_service/src/api/permissions/mod.rs
rename to services/authentication_service/src/api/permissions.rs
diff --git a/services/authentication_service/src/api/session/mod.rs b/services/authentication_service/src/api/session.rs
similarity index 100%
rename from services/authentication_service/src/api/session/mod.rs
rename to services/authentication_service/src/api/session.rs
diff --git a/services/authentication_service/src/api/user/mod.rs b/services/authentication_service/src/api/user.rs
similarity index 100%
rename from services/authentication_service/src/api/user/mod.rs
rename to services/authentication_service/src/api/user.rs
diff --git a/services/authentication_service/src/api/webhooks/mod.rs b/services/authentication_service/src/api/webhooks.rs
similarity index 100%
rename from services/authentication_service/src/api/webhooks/mod.rs
rename to services/authentication_service/src/api/webhooks.rs
diff --git a/services/authentication_service/src/api/webhooks/user/mod.rs b/services/authentication_service/src/api/webhooks/user.rs
similarity index 100%
rename from services/authentication_service/src/api/webhooks/user/mod.rs
rename to services/authentication_service/src/api/webhooks/user.rs
diff --git a/services/connection_gateway/src/api/mod.rs b/services/connection_gateway/src/api.rs
similarity index 100%
rename from services/connection_gateway/src/api/mod.rs
rename to services/connection_gateway/src/api.rs
diff --git a/services/connection_gateway/src/api/connection/mod.rs b/services/connection_gateway/src/api/connection.rs
similarity index 100%
rename from services/connection_gateway/src/api/connection/mod.rs
rename to services/connection_gateway/src/api/connection.rs
diff --git a/services/connection_gateway/src/api/entities/mod.rs b/services/connection_gateway/src/api/entities.rs
similarity index 100%
rename from services/connection_gateway/src/api/entities/mod.rs
rename to services/connection_gateway/src/api/entities.rs
diff --git a/services/connection_gateway/src/api/health/mod.rs b/services/connection_gateway/src/api/health.rs
similarity index 100%
rename from services/connection_gateway/src/api/health/mod.rs
rename to services/connection_gateway/src/api/health.rs
diff --git a/services/connection_gateway/src/api/message/mod.rs b/services/connection_gateway/src/api/message.rs
similarity index 100%
rename from services/connection_gateway/src/api/message/mod.rs
rename to services/connection_gateway/src/api/message.rs
diff --git a/services/convert_service/src/api/mod.rs b/services/convert_service/src/api.rs
similarity index 100%
rename from services/convert_service/src/api/mod.rs
rename to services/convert_service/src/api.rs
diff --git a/services/convert_service/src/api/backfill/mod.rs b/services/convert_service/src/api/backfill.rs
similarity index 100%
rename from services/convert_service/src/api/backfill/mod.rs
rename to services/convert_service/src/api/backfill.rs
diff --git a/services/convert_service/src/utils/mod.rs b/services/convert_service/src/utils.rs
similarity index 100%
rename from services/convert_service/src/utils/mod.rs
rename to services/convert_service/src/utils.rs
diff --git a/services/delete_chat_handler/src/service/db/mod.rs b/services/delete_chat_handler/src/service/db.rs
similarity index 100%
rename from services/delete_chat_handler/src/service/db/mod.rs
rename to services/delete_chat_handler/src/service/db.rs
diff --git a/services/document_cognition_service/src/api/mod.rs b/services/document_cognition_service/src/api.rs
similarity index 100%
rename from services/document_cognition_service/src/api/mod.rs
rename to services/document_cognition_service/src/api.rs
diff --git a/services/document_cognition_service/src/api/attachments/mod.rs b/services/document_cognition_service/src/api/attachments.rs
similarity index 100%
rename from services/document_cognition_service/src/api/attachments/mod.rs
rename to services/document_cognition_service/src/api/attachments.rs
diff --git a/services/document_cognition_service/src/api/chats/mod.rs b/services/document_cognition_service/src/api/chats.rs
similarity index 100%
rename from services/document_cognition_service/src/api/chats/mod.rs
rename to services/document_cognition_service/src/api/chats.rs
diff --git a/services/document_cognition_service/src/api/citations/mod.rs b/services/document_cognition_service/src/api/citations.rs
similarity index 100%
rename from services/document_cognition_service/src/api/citations/mod.rs
rename to services/document_cognition_service/src/api/citations.rs
diff --git a/services/document_cognition_service/src/api/context/mod.rs b/services/document_cognition_service/src/api/context.rs
similarity index 100%
rename from services/document_cognition_service/src/api/context/mod.rs
rename to services/document_cognition_service/src/api/context.rs
diff --git a/services/document_cognition_service/src/api/health/mod.rs b/services/document_cognition_service/src/api/health.rs
similarity index 100%
rename from services/document_cognition_service/src/api/health/mod.rs
rename to services/document_cognition_service/src/api/health.rs
diff --git a/services/document_cognition_service/src/api/id_mapping/mod.rs b/services/document_cognition_service/src/api/id_mapping.rs
similarity index 100%
rename from services/document_cognition_service/src/api/id_mapping/mod.rs
rename to services/document_cognition_service/src/api/id_mapping.rs
diff --git a/services/document_cognition_service/src/api/preview/mod.rs b/services/document_cognition_service/src/api/preview.rs
similarity index 100%
rename from services/document_cognition_service/src/api/preview/mod.rs
rename to services/document_cognition_service/src/api/preview.rs
diff --git a/services/document_cognition_service/src/api/stream/mod.rs b/services/document_cognition_service/src/api/stream.rs
similarity index 100%
rename from services/document_cognition_service/src/api/stream/mod.rs
rename to services/document_cognition_service/src/api/stream.rs
diff --git a/services/document_cognition_service/src/api/stream/chat_message/mod.rs b/services/document_cognition_service/src/api/stream/chat_message.rs
similarity index 100%
rename from services/document_cognition_service/src/api/stream/chat_message/mod.rs
rename to services/document_cognition_service/src/api/stream/chat_message.rs
diff --git a/services/document_cognition_service/src/api/stream/util/chat_message/mod.rs b/services/document_cognition_service/src/api/stream/util/chat_message.rs
similarity index 100%
rename from services/document_cognition_service/src/api/stream/util/chat_message/mod.rs
rename to services/document_cognition_service/src/api/stream/util/chat_message.rs
diff --git a/services/document_storage_service/src/api/mod.rs b/services/document_storage_service/src/api.rs
similarity index 100%
rename from services/document_storage_service/src/api/mod.rs
rename to services/document_storage_service/src/api.rs
diff --git a/services/document_storage_service/src/api/annotations/mod.rs b/services/document_storage_service/src/api/annotations.rs
similarity index 100%
rename from services/document_storage_service/src/api/annotations/mod.rs
rename to services/document_storage_service/src/api/annotations.rs
diff --git a/services/document_storage_service/src/api/documents/mod.rs b/services/document_storage_service/src/api/documents.rs
similarity index 100%
rename from services/document_storage_service/src/api/documents/mod.rs
rename to services/document_storage_service/src/api/documents.rs
diff --git a/services/document_storage_service/src/api/documents/permissions_token/mod.rs b/services/document_storage_service/src/api/documents/permissions_token.rs
similarity index 100%
rename from services/document_storage_service/src/api/documents/permissions_token/mod.rs
rename to services/document_storage_service/src/api/documents/permissions_token.rs
diff --git a/services/document_storage_service/src/api/documents/utils/mod.rs b/services/document_storage_service/src/api/documents/utils.rs
similarity index 100%
rename from services/document_storage_service/src/api/documents/utils/mod.rs
rename to services/document_storage_service/src/api/documents/utils.rs
diff --git a/services/document_storage_service/src/api/entity/mod.rs b/services/document_storage_service/src/api/entity.rs
similarity index 100%
rename from services/document_storage_service/src/api/entity/mod.rs
rename to services/document_storage_service/src/api/entity.rs
diff --git a/services/document_storage_service/src/api/health/mod.rs b/services/document_storage_service/src/api/health.rs
similarity index 100%
rename from services/document_storage_service/src/api/health/mod.rs
rename to services/document_storage_service/src/api/health.rs
diff --git a/services/document_storage_service/src/api/history/mod.rs b/services/document_storage_service/src/api/history.rs
similarity index 100%
rename from services/document_storage_service/src/api/history/mod.rs
rename to services/document_storage_service/src/api/history.rs
diff --git a/services/document_storage_service/src/api/instructions/mod.rs b/services/document_storage_service/src/api/instructions.rs
similarity index 100%
rename from services/document_storage_service/src/api/instructions/mod.rs
rename to services/document_storage_service/src/api/instructions.rs
diff --git a/services/document_storage_service/src/api/internal/mod.rs b/services/document_storage_service/src/api/internal.rs
similarity index 100%
rename from services/document_storage_service/src/api/internal/mod.rs
rename to services/document_storage_service/src/api/internal.rs
diff --git a/services/document_storage_service/src/api/notification/mod.rs b/services/document_storage_service/src/api/notification.rs
similarity index 100%
rename from services/document_storage_service/src/api/notification/mod.rs
rename to services/document_storage_service/src/api/notification.rs
diff --git a/services/document_storage_service/src/api/pins/mod.rs b/services/document_storage_service/src/api/pins.rs
similarity index 100%
rename from services/document_storage_service/src/api/pins/mod.rs
rename to services/document_storage_service/src/api/pins.rs
diff --git a/services/document_storage_service/src/api/recents/mod.rs b/services/document_storage_service/src/api/recents.rs
similarity index 100%
rename from services/document_storage_service/src/api/recents/mod.rs
rename to services/document_storage_service/src/api/recents.rs
diff --git a/services/document_storage_service/src/api/threads/mod.rs b/services/document_storage_service/src/api/threads.rs
similarity index 100%
rename from services/document_storage_service/src/api/threads/mod.rs
rename to services/document_storage_service/src/api/threads.rs
diff --git a/services/document_storage_service/src/api/user_document_view_location/mod.rs b/services/document_storage_service/src/api/user_document_view_location.rs
similarity index 100%
rename from services/document_storage_service/src/api/user_document_view_location/mod.rs
rename to services/document_storage_service/src/api/user_document_view_location.rs
diff --git a/services/document_storage_service/src/model/request/pins/mod.rs b/services/document_storage_service/src/model/request/pins.rs
similarity index 100%
rename from services/document_storage_service/src/model/request/pins/mod.rs
rename to services/document_storage_service/src/model/request/pins.rs
diff --git a/services/document_storage_service/src/model/response/annotations/mod.rs b/services/document_storage_service/src/model/response/annotations.rs
similarity index 100%
rename from services/document_storage_service/src/model/response/annotations/mod.rs
rename to services/document_storage_service/src/model/response/annotations.rs
diff --git a/services/document_storage_service/src/model/response/history/mod.rs b/services/document_storage_service/src/model/response/history.rs
similarity index 100%
rename from services/document_storage_service/src/model/response/history/mod.rs
rename to services/document_storage_service/src/model/response/history.rs
diff --git a/services/document_storage_service/src/model/response/instructions/mod.rs b/services/document_storage_service/src/model/response/instructions.rs
similarity index 100%
rename from services/document_storage_service/src/model/response/instructions/mod.rs
rename to services/document_storage_service/src/model/response/instructions.rs
diff --git a/services/document_storage_service/src/model/response/pin/mod.rs b/services/document_storage_service/src/model/response/pin.rs
similarity index 100%
rename from services/document_storage_service/src/model/response/pin/mod.rs
rename to services/document_storage_service/src/model/response/pin.rs
diff --git a/services/document_storage_service/src/service/conn_gateway/mod.rs b/services/document_storage_service/src/service/conn_gateway.rs
similarity index 100%
rename from services/document_storage_service/src/service/conn_gateway/mod.rs
rename to services/document_storage_service/src/service/conn_gateway.rs
diff --git a/services/document_storage_service/src/service/delete_document_worker/mod.rs b/services/document_storage_service/src/service/delete_document_worker.rs
similarity index 100%
rename from services/document_storage_service/src/service/delete_document_worker/mod.rs
rename to services/document_storage_service/src/service/delete_document_worker.rs
diff --git a/services/document_storage_service/src/service/s3/mod.rs b/services/document_storage_service/src/service/s3.rs
similarity index 100%
rename from services/document_storage_service/src/service/s3/mod.rs
rename to services/document_storage_service/src/service/s3.rs
diff --git a/services/document_text_extractor/src/handler/mod.rs b/services/document_text_extractor/src/handler.rs
similarity index 100%
rename from services/document_text_extractor/src/handler/mod.rs
rename to services/document_text_extractor/src/handler.rs
diff --git a/services/document_text_extractor/src/model/mod.rs b/services/document_text_extractor/src/model.rs
similarity index 100%
rename from services/document_text_extractor/src/model/mod.rs
rename to services/document_text_extractor/src/model.rs
diff --git a/services/document_text_extractor/src/service/db/mod.rs b/services/document_text_extractor/src/service/db.rs
similarity index 100%
rename from services/document_text_extractor/src/service/db/mod.rs
rename to services/document_text_extractor/src/service/db.rs
diff --git a/services/document_text_extractor/src/service/s3/mod.rs b/services/document_text_extractor/src/service/s3.rs
similarity index 100%
rename from services/document_text_extractor/src/service/s3/mod.rs
rename to services/document_text_extractor/src/service/s3.rs
diff --git a/services/docx_unzip_handler/src/service/document/mod.rs b/services/docx_unzip_handler/src/service/document.rs
similarity index 100%
rename from services/docx_unzip_handler/src/service/document/mod.rs
rename to services/docx_unzip_handler/src/service/document.rs
diff --git a/services/email_scheduled_handler/src/test/mod.rs b/services/email_scheduled_handler/src/test.rs
similarity index 89%
rename from services/email_scheduled_handler/src/test/mod.rs
rename to services/email_scheduled_handler/src/test.rs
index 405da9b545..e6aba1e190 100644
--- a/services/email_scheduled_handler/src/test/mod.rs
+++ b/services/email_scheduled_handler/src/test.rs
@@ -6,7 +6,7 @@ use sqlx::{Pool, Postgres};
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
- fixtures(path = "fixtures", scripts("fetch_pending_scheduled_messages"))
+ fixtures(path = "test/fixtures", scripts("fetch_pending_scheduled_messages"))
)]
async fn fetch_pending_returns_only_eligible_messages(pool: Pool<Postgres>) -> Result<()> {
const _: &sqlx::migrate::Migrator = &MACRO_DB_MIGRATIONS;
@@ -28,7 +28,7 @@ async fn fetch_pending_returns_only_eligible_messages(pool: Pool<Postgres>) -> R
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
- fixtures(path = "fixtures", scripts("fetch_pending_scheduled_messages"))
+ fixtures(path = "test/fixtures", scripts("fetch_pending_scheduled_messages"))
)]
async fn fetch_pending_excludes_future_send_time(pool: Pool<Postgres>) -> Result<()> {
let results = fetch_pending_scheduled_messages(&pool).await?;
@@ -43,7 +43,7 @@ async fn fetch_pending_excludes_future_send_time(pool: Pool<Postgres>) -> Result
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
- fixtures(path = "fixtures", scripts("fetch_pending_scheduled_messages"))
+ fixtures(path = "test/fixtures", scripts("fetch_pending_scheduled_messages"))
)]
async fn fetch_pending_excludes_already_sent(pool: Pool<Postgres>) -> Result<()> {
let results = fetch_pending_scheduled_messages(&pool).await?;
@@ -58,7 +58,7 @@ async fn fetch_pending_excludes_already_sent(pool: Pool<Postgres>) -> Result<()>
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
- fixtures(path = "fixtures", scripts("fetch_pending_scheduled_messages"))
+ fixtures(path = "test/fixtures", scripts("fetch_pending_scheduled_messages"))
)]
async fn fetch_pending_excludes_non_drafts(pool: Pool<Postgres>) -> Result<()> {
let results = fetch_pending_scheduled_messages(&pool).await?;
@@ -73,7 +73,7 @@ async fn fetch_pending_excludes_non_drafts(pool: Pool<Postgres>) -> Result<()> {
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
- fixtures(path = "fixtures", scripts("fetch_pending_scheduled_messages"))
+ fixtures(path = "test/fixtures", scripts("fetch_pending_scheduled_messages"))
)]
async fn fetch_pending_returns_correct_link_ids(pool: Pool<Postgres>) -> Result<()> {
let results = fetch_pending_scheduled_messages(&pool).await?;
diff --git a/services/email_service/src/api/mod.rs b/services/email_service/src/api.rs
similarity index 100%
rename from services/email_service/src/api/mod.rs
rename to services/email_service/src/api.rs
diff --git a/services/email_service/src/api/email/mod.rs b/services/email_service/src/api/email.rs
similarity index 100%
rename from services/email_service/src/api/email/mod.rs
rename to services/email_service/src/api/email.rs
diff --git a/services/email_service/src/api/email/attachments/mod.rs b/services/email_service/src/api/email/attachments.rs
similarity index 100%
rename from services/email_service/src/api/email/attachments/mod.rs
rename to services/email_service/src/api/email/attachments.rs
diff --git a/services/email_service/src/api/email/backfill/mod.rs b/services/email_service/src/api/email/backfill.rs
similarity index 100%
rename from services/email_service/src/api/email/backfill/mod.rs
rename to services/email_service/src/api/email/backfill.rs
diff --git a/services/email_service/src/api/email/contacts/mod.rs b/services/email_service/src/api/email/contacts.rs
similarity index 100%
rename from services/email_service/src/api/email/contacts/mod.rs
rename to services/email_service/src/api/email/contacts.rs
diff --git a/services/email_service/src/api/email/drafts/mod.rs b/services/email_service/src/api/email/drafts.rs
similarity index 100%
rename from services/email_service/src/api/email/drafts/mod.rs
rename to services/email_service/src/api/email/drafts.rs
diff --git a/services/email_service/src/api/email/drafts/scheduled/mod.rs b/services/email_service/src/api/email/drafts/scheduled.rs
similarity index 100%
rename from services/email_service/src/api/email/drafts/scheduled/mod.rs
rename to services/email_service/src/api/email/drafts/scheduled.rs
diff --git a/services/email_service/src/api/email/filters/mod.rs b/services/email_service/src/api/email/filters.rs
similarity index 100%
rename from services/email_service/src/api/email/filters/mod.rs
rename to services/email_service/src/api/email/filters.rs
diff --git a/services/email_service/src/api/email/labels/mod.rs b/services/email_service/src/api/email/labels.rs
similarity index 100%
rename from services/email_service/src/api/email/labels/mod.rs
rename to services/email_service/src/api/email/labels.rs
diff --git a/services/email_service/src/api/email/links/mod.rs b/services/email_service/src/api/email/links.rs
similarity index 100%
rename from services/email_service/src/api/email/links/mod.rs
rename to services/email_service/src/api/email/links.rs
diff --git a/services/email_service/src/api/email/messages/mod.rs b/services/email_service/src/api/email/messages.rs
similarity index 100%
rename from services/email_service/src/api/email/messages/mod.rs
rename to services/email_service/src/api/email/messages.rs
diff --git a/services/email_service/src/api/email/settings/mod.rs b/services/email_service/src/api/email/settings.rs
similarity index 100%
rename from services/email_service/src/api/email/settings/mod.rs
rename to services/email_service/src/api/email/settings.rs
diff --git a/services/email_service/src/api/email/sync/mod.rs b/services/email_service/src/api/email/sync.rs
similarity index 100%
rename from services/email_service/src/api/email/sync/mod.rs
rename to services/email_service/src/api/email/sync.rs
diff --git a/services/email_service/src/api/email/threads/mod.rs b/services/email_service/src/api/email/threads.rs
similarity index 100%
rename from services/email_service/src/api/email/threads/mod.rs
rename to services/email_service/src/api/email/threads.rs
diff --git a/services/email_service/src/api/gmail/mod.rs b/services/email_service/src/api/gmail.rs
similarity index 100%
rename from services/email_service/src/api/gmail/mod.rs
rename to services/email_service/src/api/gmail.rs
diff --git a/services/email_service/src/api/internal/mod.rs b/services/email_service/src/api/internal.rs
similarity index 100%
rename from services/email_service/src/api/internal/mod.rs
rename to services/email_service/src/api/internal.rs
diff --git a/services/email_service/src/util/process_pre_insert/mod.rs b/services/email_service/src/util/process_pre_insert.rs
similarity index 100%
rename from services/email_service/src/util/process_pre_insert/mod.rs
rename to services/email_service/src/util/process_pre_insert.rs
diff --git a/services/email_service/src/util/process_pre_insert/clean_message/mod.rs b/services/email_service/src/util/process_pre_insert/clean_message.rs
similarity index 100%
rename from services/email_service/src/util/process_pre_insert/clean_message/mod.rs
rename to services/email_service/src/util/process_pre_insert/clean_message.rs
diff --git a/services/email_service/src/util/redis/mod.rs b/services/email_service/src/util/redis.rs
similarity index 100%
rename from services/email_service/src/util/redis/mod.rs
rename to services/email_service/src/util/redis.rs
diff --git a/services/image_proxy_service/src/api/mod.rs b/services/image_proxy_service/src/api.rs
similarity index 100%
rename from services/image_proxy_service/src/api/mod.rs
rename to services/image_proxy_service/src/api.rs
diff --git a/services/image_proxy_service/src/api/health/mod.rs b/services/image_proxy_service/src/api/health.rs
similarity index 100%
rename from services/image_proxy_service/src/api/health/mod.rs
rename to services/image_proxy_service/src/api/health.rs
diff --git a/services/image_proxy_service/src/api/proxy/mod.rs b/services/image_proxy_service/src/api/proxy.rs
similarity index 100%
rename from services/image_proxy_service/src/api/proxy/mod.rs
rename to services/image_proxy_service/src/api/proxy.rs
diff --git a/services/notification_service/src/api/mod.rs b/services/notification_service/src/api.rs
similarity index 100%
rename from services/notification_service/src/api/mod.rs
rename to services/notification_service/src/api.rs
diff --git a/services/notification_service/src/api/unsubscribe/mod.rs b/services/notification_service/src/api/unsubscribe.rs
similarity index 100%
rename from services/notification_service/src/api/unsubscribe/mod.rs
rename to services/notification_service/src/api/unsubscribe.rs
diff --git a/services/notification_service/src/notification/send/push/mod.rs b/services/notification_service/src/notification/send/push.rs
similarity index 100%
rename from services/notification_service/src/notification/send/push/mod.rs
rename to services/notification_service/src/notification/send/push.rs
diff --git a/services/organization_retention_handler/src/handler/mod.rs b/services/organization_retention_handler/src/handler.rs
similarity index 100%
rename from services/organization_retention_handler/src/handler/mod.rs
rename to services/organization_retention_handler/src/handler.rs
diff --git a/services/organization_retention_handler/src/service/db/mod.rs b/services/organization_retention_handler/src/service/db.rs
similarity index 100%
rename from services/organization_retention_handler/src/service/db/mod.rs
rename to services/organization_retention_handler/src/service/db.rs
diff --git a/services/organization_retention_trigger/src/service/db/mod.rs b/services/organization_retention_trigger/src/service/db.rs
similarity index 100%
rename from services/organization_retention_trigger/src/service/db/mod.rs
rename to services/organization_retention_trigger/src/service/db.rs
diff --git a/services/scheduled_action/src/outbound/inprocess_executor/mod.rs b/services/scheduled_action/src/outbound/inprocess_executor.rs
similarity index 100%
rename from services/scheduled_action/src/outbound/inprocess_executor/mod.rs
rename to services/scheduled_action/src/outbound/inprocess_executor.rs
diff --git a/services/search_processing_service/src/api/mod.rs b/services/search_processing_service/src/api.rs
similarity index 100%
rename from services/search_processing_service/src/api/mod.rs
rename to services/search_processing_service/src/api.rs
diff --git a/services/search_processing_service/src/api/internal/mod.rs b/services/search_processing_service/src/api/internal.rs
similarity index 100%
rename from services/search_processing_service/src/api/internal/mod.rs
rename to services/search_processing_service/src/api/internal.rs
diff --git a/services/search_processing_service/src/process/mod.rs b/services/search_processing_service/src/process.rs
similarity index 100%
rename from services/search_processing_service/src/process/mod.rs
rename to services/search_processing_service/src/process.rs
diff --git a/services/search_processing_service/src/process/document/mod.rs b/services/search_processing_service/src/process/document.rs
similarity index 100%
rename from services/search_processing_service/src/process/document/mod.rs
rename to services/search_processing_service/src/process/document.rs
diff --git a/services/sha_cleanup_worker/src/service/db/mod.rs b/services/sha_cleanup_worker/src/service/db.rs
similarity index 100%
rename from services/sha_cleanup_worker/src/service/db/mod.rs
rename to services/sha_cleanup_worker/src/service/db.rs
diff --git a/services/sha_cleanup_worker/src/service/redis/mod.rs b/services/sha_cleanup_worker/src/service/redis.rs
similarity index 100%
rename from services/sha_cleanup_worker/src/service/redis/mod.rs
rename to services/sha_cleanup_worker/src/service/redis.rs
diff --git a/services/sha_cleanup_worker/src/service/s3/mod.rs b/services/sha_cleanup_worker/src/service/s3.rs
similarity index 100%
rename from services/sha_cleanup_worker/src/service/s3/mod.rs
rename to services/sha_cleanup_worker/src/service/s3.rs
diff --git a/services/static_file_service/src/api/mod.rs b/services/static_file_service/src/api.rs
similarity index 100%
rename from services/static_file_service/src/api/mod.rs
rename to services/static_file_service/src/api.rs
diff --git a/services/static_file_service/src/api/file/mod.rs b/services/static_file_service/src/api/file.rs
similarity index 100%
rename from services/static_file_service/src/api/file/mod.rs
rename to services/static_file_service/src/api/file.rs
diff --git a/services/sync-service/src/storage/mod.rs b/services/sync-service/src/storage.rs
similarity index 100%
rename from services/sync-service/src/storage/mod.rs
rename to services/sync-service/src/storage.rs
diff --git a/services/unfurl_service/src/api/mod.rs b/services/unfurl_service/src/api.rs
similarity index 100%
rename from services/unfurl_service/src/api/mod.rs
rename to services/unfurl_service/src/api.rs
diff --git a/services/unfurl_service/src/api/health/mod.rs b/services/unfurl_service/src/api/health.rs
similarity index 100%
rename from services/unfurl_service/src/api/health/mod.rs
rename to services/unfurl_service/src/api/health.rs
diff --git a/services/unfurl_service/src/api/proxy/mod.rs b/services/unfurl_service/src/api/proxy.rs
similarity index 100%
rename from services/unfurl_service/src/api/proxy/mod.rs
rename to services/unfurl_service/src/api/proxy.rs
diff --git a/services/unfurl_service/src/api/unfurl/mod.rs b/services/unfurl_service/src/api/unfurl.rs
similarity index 100%
rename from services/unfurl_service/src/api/unfurl/mod.rs
rename to services/unfurl_service/src/api/unfurl.rs
diff --git a/services/unfurl_service/src/http_safety/mod.rs b/services/unfurl_service/src/http_safety.rs
similarity index 100%
rename from services/unfurl_service/src/http_safety/mod.rs
rename to services/unfurl_service/src/http_safety.rs
diff --git a/services/unfurl_service/src/unfurl/mod.rs b/services/unfurl_service/src/unfurl.rs
similarity index 100%
rename from services/unfurl_service/src/unfurl/mod.rs
rename to services/unfurl_service/src/unfurl.rs
diff --git a/services/worker_trigger/src/service/ecs/mod.rs b/services/worker_trigger/src/service/ecs.rs
similarity index 100%
rename from services/worker_trigger/src/service/ecs/mod.rs
rename to services/worker_trigger/src/service/ecs.rs
diff --git a/tooling/seed_cli/src/entity/mod.rs b/tooling/seed_cli/src/entity.rs
similarity index 100%
rename from tooling/seed_cli/src/entity/mod.rs
rename to tooling/seed_cli/src/entity.rs
diff --git a/tooling/seed_cli/src/entity/channel/mod.rs b/tooling/seed_cli/src/entity/channel.rs
similarity index 100%
rename from tooling/seed_cli/src/entity/channel/mod.rs
rename to tooling/seed_cli/src/entity/channel.rs
diff --git a/tooling/seed_cli/src/entity/channel_message/mod.rs b/tooling/seed_cli/src/entity/channel_message.rs
similarity index 100%
rename from tooling/seed_cli/src/entity/channel_message/mod.rs
rename to tooling/seed_cli/src/entity/channel_message.rs
diff --git a/tooling/seed_cli/src/entity/document/mod.rs b/tooling/seed_cli/src/entity/document.rs
similarity index 100%
rename from tooling/seed_cli/src/entity/document/mod.rs
rename to tooling/seed_cli/src/entity/document.rs
diff --git a/tooling/seed_cli/src/entity/email/mod.rs b/tooling/seed_cli/src/entity/email.rs
similarity index 100%
rename from tooling/seed_cli/src/entity/email/mod.rs
rename to tooling/seed_cli/src/entity/email.rs
diff --git a/tooling/seed_cli/src/entity/gmail/mod.rs b/tooling/seed_cli/src/entity/gmail.rs
similarity index 100%
rename from tooling/seed_cli/src/entity/gmail/mod.rs
rename to tooling/seed_cli/src/entity/gmail.rs
diff --git a/tooling/seed_cli/src/entity/scenario/mod.rs b/tooling/seed_cli/src/entity/scenario.rs
similarity index 98%
rename from tooling/seed_cli/src/entity/scenario/mod.rs
rename to tooling/seed_cli/src/entity/scenario.rs
index 144e73c256..437b565361 100644
--- a/tooling/seed_cli/src/entity/scenario/mod.rs
+++ b/tooling/seed_cli/src/entity/scenario.rs
@@ -15,11 +15,11 @@ use serde::Deserialize;
use crate::config::{EnvVars, SeedCliContext};
use crate::entity::{channel, channel_message, document};
-const LOCAL_E2E_MANIFEST_JSON: &str = include_str!("../../../seed/local_e2e/manifest.json");
-const LOCAL_E2E_RESET_SQL: &str = include_str!("../../../seed/local_e2e/reset.sql");
-const LOCAL_E2E_USERS_JSON: &str = include_str!("../../../seed/local_e2e/users.json");
+const LOCAL_E2E_MANIFEST_JSON: &str = include_str!("../../seed/local_e2e/manifest.json");
+const LOCAL_E2E_RESET_SQL: &str = include_str!("../../seed/local_e2e/reset.sql");
+const LOCAL_E2E_USERS_JSON: &str = include_str!("../../seed/local_e2e/users.json");
const LOCAL_E2E_CHANNEL_MESSAGES_SQL: &str =
- include_str!("../../../seed/local_e2e/channel_messages.sql");
+ include_str!("../../seed/local_e2e/channel_messages.sql");
#[derive(Debug, Deserialize)]
struct LocalE2eManifest {
diff --git a/tooling/seed_cli/src/entity/user/mod.rs b/tooling/seed_cli/src/entity/user.rs
similarity index 100%
rename from tooling/seed_cli/src/entity/user/mod.rs
rename to tooling/seed_cli/src/entity/user.rs
diff --git a/tooling/seed_cli/src/service/auth/mod.rs b/tooling/seed_cli/src/service/auth.rs
similarity index 100%
rename from tooling/seed_cli/src/service/auth/mod.rs
rename to tooling/seed_cli/src/service/auth.rs
diff --git a/tooling/seed_cli/src/service/db/mod.rs b/tooling/seed_cli/src/service/db.rs
similarity index 100%
rename from tooling/seed_cli/src/service/db/mod.rs
rename to tooling/seed_cli/src/service/db.rs
diff --git a/tooling/xtask/crates/xtask_local/src/local/mod.rs b/tooling/xtask/crates/xtask_local/src/local.rs
similarity index 100%
rename from tooling/xtask/crates/xtask_local/src/local/mod.rs
rename to tooling/xtask/crates/xtask_local/src/local.rs
diff --git a/tooling/xtask/crates/xtask_workflows/src/workflows/mod.rs b/tooling/xtask/crates/xtask_workflows/src/workflows.rs
similarity index 100%
rename from tooling/xtask/crates/xtask_workflows/src/workflows/mod.rs
rename to tooling/xtask/crates/xtask_workflows/src/workflows.rs