From 491cb3eb34d20140aed80dbb9edc39c4db5335d2 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Sun, 15 Sep 2024 23:50:41 -0400 Subject: Consolidate most repository types into a repo module. Having them contained in the individual endpoint groups conveyed an unintended sense that their intended scope was _only_ that endpoint group. It also made most repo-related import paths _quite_ long. This splits up the repos as follows: * "General applicability" repos - those that are only loosely connected to a single task, and are likely to be shared between tasks - go in crate::repo. * Specialized repos - those tightly connected to a specific task - go in the module for that task, under crate::PATH::repo. In both cases, each repo goes in its own submodule, to make it easier to use the module name as a namespace. Which category a repo goes in is a judgment call. `crate::channel::repo::broadcast` (formerly `channel::repo::messages`) is used outside of `crate::channel`, for example, but its main purpose is to support channel message broadcasts. It could arguably live under `crate::event::repo::channel`, but the resulting namespace is less legible to me. --- src/index/app.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/index/app.rs') diff --git a/src/index/app.rs b/src/index/app.rs index fabf35c..41b12fa 100644 --- a/src/index/app.rs +++ b/src/index/app.rs @@ -1,8 +1,8 @@ use sqlx::sqlite::SqlitePool; use crate::{ - channel::repo::channels::{Channel, Id as ChannelId, Provider as _}, error::BoxedError, + repo::channel::{self, Channel, Provider as _}, }; pub struct Index<'a> { @@ -14,7 +14,7 @@ impl<'a> Index<'a> { Self { db } } - pub async fn channel(&self, channel: ChannelId) -> Result { + pub async fn channel(&self, channel: channel::Id) -> Result { let mut tx = self.db.begin().await?; let channel = tx.channels().by_id(channel).await?; tx.commit().await?; -- cgit v1.2.3