git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-12 15:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

use qualified crate names from within workspace

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-03-27 03:34:33 +00:00
commit 7f448d88a4
9 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/server.rs
View file

@ -1,6 +1,6 @@
use std::{path::PathBuf, sync::Arc};
use conduwuit::{
use conduwuit_core::{
Error, Result,
config::Config,
info,
@ -14,7 +14,7 @@ use crate::{clap::Args, logging::TracingFlameGuard};
/// Server runtime state; complete
pub(crate) struct Server {
/// Server runtime state; public portion
pub(crate) server: Arc<conduwuit::Server>,
pub(crate) server: Arc<conduwuit_core::Server>,
pub(crate) services: Mutex<Option<Arc<conduwuit_service::Services>>>,
@ -25,7 +25,7 @@ pub(crate) struct Server {
#[cfg(all(conduwuit_mods, feature = "conduwuit_mods"))]
// Module instances; TODO: move to mods::loaded mgmt vector
pub(crate) mods: tokio::sync::RwLock<Vec<conduwuit::mods::Module>>,
pub(crate) mods: tokio::sync::RwLock<Vec<conduwuit_core::mods::Module>>,
}
impl Server {
@ -66,11 +66,11 @@ impl Server {
database_path = ?config.database_path,
log_levels = %config.log,
"{}",
conduwuit::version(),
conduwuit_core::version(),
);
Ok(Arc::new(Self {
server: Arc::new(conduwuit::Server::new(config, runtime.cloned(), Log {
server: Arc::new(conduwuit_core::Server::new(config, runtime.cloned(), Log {
reload: tracing_reload_handle,
capture,
})),