refactor: move server config loading out of forgejo module

Delete empty modules left over

src/server/actors/repo/config.rs

@@ -1,30 +1,16 @@
 use actix::prelude::*;
 use tracing::error;
 
-use crate::server::{
+use crate::server::{config::RepoDetails, gitforge};
-    config::{ForgeType, RepoDetails},
-    forge, gitforge,
-};
 
 use super::{LoadedConfig, RepoActor};
 
-pub async fn load(details: RepoDetails, addr: Addr<RepoActor>, forge: gitforge::Forge) {
+pub async fn load(repo_details: RepoDetails, addr: Addr<RepoActor>, forge: gitforge::Forge) {
-    let config = match details.config {
+    let config = match crate::server::config::load::load(&repo_details, &forge).await {
-        Some(config) => config,
+        Ok(config) => config,
-        None => {
+        Err(err) => {
-            let config = match details.forge.forge_type {
+            error!(?err, "Failed to load config");
-                #[cfg(feature = "forgejo")]
+            return;
-                ForgeType::ForgeJo => forge::forgejo::config::load(&details, &forge).await,
-                #[cfg(test)]
-                ForgeType::MockForge => forge::mock::config::load(&details, &forge).await,
-            };
-            match config {
-                Ok(config) => config,
-                Err(err) => {
-                    error!(?err, "Failed to load config");
-                    return;
-                }
-            }
         }
     };
     addr.do_send(LoadedConfig(config));

src/server/config/mod.rs

@@ -1,3 +1,5 @@
+pub mod load;
+
 use std::{
     collections::HashMap,
     fmt::{Display, Formatter},

src/server/forge/forgejo/mod.rs

@@ -1 +0,0 @@
-pub mod config;

src/server/forge/mock/config.rs

@@ -1,14 +0,0 @@
-use terrors::OneOf;
-
-use crate::server::{
-    config::RepoConfig,
-    forge::forgejo::config::RepoConfigValidationErrors,
-    gitforge::{self, ForgeFileError},
-};
-
-pub async fn load(
-    _details: &crate::server::config::RepoDetails,
-    _forge: &gitforge::Forge,
-) -> Result<RepoConfig, OneOf<(ForgeFileError, toml::de::Error, RepoConfigValidationErrors)>> {
-    todo!()
-}

src/server/forge/mock/mod.rs

@@ -1 +0,0 @@
-pub mod config;

src/server/forge/mod.rs

@@ -1,7 +0,0 @@
-#[cfg(feature = "forgejo")]
-pub mod forgejo;
-
-#[cfg(test)]
-pub mod mock;
-#[cfg(test)]
-mod tests;

src/server/forge/tests.rs

@@ -1,10 +0,0 @@
-use kxio::network;
-
-use crate::server::gitforge;
-
-#[test]
-const fn test_is_send() {
-    const fn assert_send<T: Send>() {}
-    assert_send::<gitforge::CommitHistories>();
-    assert_send::<network::NetworkError>();
-}

src/server/mod.rs

@@ -1,6 +1,5 @@
 mod actors;
 mod config;
-pub mod forge;
 pub mod gitforge;
 pub mod types;