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

use BTreeMap again

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-22 23:42:22 -04:00 • committed by June
parent 27d83a51f2
commit 6e0d6c78fb
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/config/mod.rs
View file

@ -1,5 +1,5 @@
use std::{ use std::{
collections::BTreeSet, collections::BTreeMap,
fmt::{self, Write as _}, fmt::{self, Write as _},
net::{IpAddr, Ipv4Addr}, net::{IpAddr, Ipv4Addr},
path::PathBuf, path::PathBuf,
@ -10,7 +10,7 @@ use figment::Figment;
use itertools::Itertools; use itertools::Itertools;
use regex::RegexSet; use regex::RegexSet;
use ruma::{OwnedRoomId, OwnedServerName, RoomVersionId}; use ruma::{OwnedRoomId, OwnedServerName, RoomVersionId};
use serde::Deserialize; use serde::{de::IgnoredAny, Deserialize};
use tracing::{debug, error, warn}; use tracing::{debug, error, warn};
use self::proxy::ProxyConfig; use self::proxy::ProxyConfig;
@ -216,7 +216,8 @@ pub struct Config {
pub block_non_admin_invites: bool, pub block_non_admin_invites: bool,
#[serde(flatten)] #[serde(flatten)]
pub catchall: BTreeSet<String>, #[allow(clippy::zero_sized_map_values)] // this is a catchall, the map shouldn't be zero at runtime
pub catchall: BTreeMap<String, IgnoredAny>,
} }
#[derive(Clone, Debug, Deserialize)] #[derive(Clone, Debug, Deserialize)]
@ -238,7 +239,7 @@ impl Config {
pub fn warn_deprecated(&self) { pub fn warn_deprecated(&self) {
debug!("Checking for deprecated config keys"); debug!("Checking for deprecated config keys");
let mut was_deprecated = false; let mut was_deprecated = false;
for key in self.catchall.iter().filter(|key| DEPRECATED_KEYS.iter().any(|s| s == key)) { for key in self.catchall.keys().filter(|key| DEPRECATED_KEYS.iter().any(|s| s == key)) {
warn!("Config parameter \"{}\" is deprecated, ignoring.", key); warn!("Config parameter \"{}\" is deprecated, ignoring.", key);
was_deprecated = true; was_deprecated = true;
} }
@ -256,7 +257,7 @@ impl Config {
pub fn warn_unknown_key(&self) { pub fn warn_unknown_key(&self) {
debug!("Checking for unknown config keys"); debug!("Checking for unknown config keys");
for key in for key in
self.catchall.iter().filter(|key| "config".to_owned().ne(key.to_owned()) /* "config" is expected */) self.catchall.keys().filter(|key| "config".to_owned().ne(key.to_owned()) /* "config" is expected */)
{ {
warn!("Config parameter \"{}\" is unknown to conduwuit, ignoring.", key); warn!("Config parameter \"{}\" is unknown to conduwuit, ignoring.", key);
} }