magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

run cargo fix for rust 2024 changes and rustfmt

Browse source 
Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>
This commit is contained in:
June Clementine Strawberry 2025-02-23 01:17:45 -05:00
parent e97952b7f6
commit a1e1f40ded
No known key found for this signature in database
320 changed files with 2212 additions and 2039 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/config/check.rs
View file

@ -4,7 +4,7 @@ use either::Either;
use figment::Figment;
use super::DEPRECATED_KEYS;
use crate::{debug, debug_info, debug_warn, error, warn, Config, Err, Result, Server};
use crate::{Config, Err, Result, Server, debug, debug_info, debug_warn, error, warn};
/// Performs check() with additional checks specific to reloading old config
/// with new config.

4
src/core/config/manager.rs
View file

@ -4,13 +4,13 @@ use std::{
ptr,
ptr::null_mut,
sync::{
atomic::{AtomicPtr, Ordering},
Arc,
atomic::{AtomicPtr, Ordering},
},
};
use super::Config;
use crate::{implement, Result};
use crate::{Result, implement};
/// The configuration manager is an indirection to reload the configuration for
/// the server while it is running. In order to not burden or clutter the many

10
src/core/config/mod.rs
View file

@ -14,18 +14,18 @@ use either::{
Either::{Left, Right},
};
use figment::providers::{Env, Format, Toml};
pub use figment::{value::Value as FigmentValue, Figment};
pub use figment::{Figment, value::Value as FigmentValue};
use regex::RegexSet;
use ruma::{
api::client::discovery::discover_support::ContactRole, OwnedRoomOrAliasId, OwnedServerName,
OwnedUserId, RoomVersionId,
OwnedRoomOrAliasId, OwnedServerName, OwnedUserId, RoomVersionId,
api::client::discovery::discover_support::ContactRole,
};
use serde::{de::IgnoredAny, Deserialize};
use serde::{Deserialize, de::IgnoredAny};
use url::Url;
use self::proxy::ProxyConfig;
pub use self::{check::check, manager::Manager};
use crate::{err, error::Error, utils::sys, Result};
use crate::{Result, err, error::Error, utils::sys};
/// All the config options for conduwuit.
#[allow(clippy::struct_excessive_bools)]