diff --git a/sslo_league/src/app_state.rs b/sslo_league/src/app_state.rs index 0e14c8b..e6281c4 100644 --- a/sslo_league/src/app_state.rs +++ b/sslo_league/src/app_state.rs @@ -11,10 +11,11 @@ use sslo_lib::sync::command::Commander; use crate::db2; use crate::db2::DatabaseManagerData; use shutdown_control::ShutdownControl; -use crate::slot_mgr::SlotMgr; +use slot_mgr::SlotMgr; use super::config::Config; pub mod shutdown_control; +pub mod slot_mgr; pub type AppState = SsloAppState; diff --git a/sslo_league/src/slot_mgr.rs b/sslo_league/src/app_state/slot_mgr.rs similarity index 98% rename from sslo_league/src/slot_mgr.rs rename to sslo_league/src/app_state/slot_mgr.rs index 6a0cd5a..1409399 100644 --- a/sslo_league/src/slot_mgr.rs +++ b/sslo_league/src/app_state/slot_mgr.rs @@ -11,7 +11,7 @@ use crate::db2::DatabaseManager; use crate::ndpc::coll_preset::CollPreset; use crate::app_state::shutdown_control::ShutdownStatus; use crate::ShutdownControl; -use crate::slot_mgr::slot_ctrl::SlotCtrl; +use crate::app_state::slot_mgr::slot_ctrl::SlotCtrl; mod slot_ctrl; mod ctrl_interface; diff --git a/sslo_league/src/slot_mgr/ctrl_interface.rs b/sslo_league/src/app_state/slot_mgr/ctrl_interface.rs similarity index 100% rename from sslo_league/src/slot_mgr/ctrl_interface.rs rename to sslo_league/src/app_state/slot_mgr/ctrl_interface.rs diff --git a/sslo_league/src/slot_mgr/slot_ctrl.rs b/sslo_league/src/app_state/slot_mgr/slot_ctrl.rs similarity index 100% rename from sslo_league/src/slot_mgr/slot_ctrl.rs rename to sslo_league/src/app_state/slot_mgr/slot_ctrl.rs diff --git a/sslo_league/src/main.rs b/sslo_league/src/main.rs index 4b8c15b..5429fb3 100644 --- a/sslo_league/src/main.rs +++ b/sslo_league/src/main.rs @@ -3,7 +3,7 @@ use std::net::{Ipv6Addr, SocketAddr}; use app_state::LeagueAppState; use sslo_lib::chrono::{TimeDeltaPrecision, TimeFormat}; use app_state::shutdown_control::ShutdownControl; -use crate::slot_mgr::SlotMgr; +use app_state::slot_mgr::SlotMgr; mod http; mod config; @@ -11,7 +11,6 @@ mod app_state; mod helpers; mod db2; mod thread_lobby; -mod slot_mgr; mod installer; mod user_grade; mod ndpc;