diff --git a/Cargo.toml b/Cargo.toml index dbf3cf652..74c8a0c73 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -721,7 +721,6 @@ option_if_let_else = { level = "allow", priority = 1 } # TODO redundant_pub_crate = { level = "allow", priority = 1 } # TODO significant_drop_in_scrutinee = { level = "allow", priority = 1 } # TODO significant_drop_tightening = { level = "allow", priority = 1 } # TODO -use_self = { level = "allow", priority = 1 } # TODO useless_let_if_seq = { level = "allow", priority = 1 } # TODO ################### diff --git a/src/api/ruma_wrapper/mod.rs b/src/api/ruma_wrapper/mod.rs index fb633b912..09c07cef9 100644 --- a/src/api/ruma_wrapper/mod.rs +++ b/src/api/ruma_wrapper/mod.rs @@ -55,7 +55,7 @@ async fn from_request(request: hyper::Request, _: &S) -> Result(&request.body).ok(); let auth = auth::auth(&mut request, &json_body, &T::METADATA).await?; - Ok(Ruma { + Ok(Self { body: make_body::(&mut request, &mut json_body, &auth)?, origin: auth.origin, sender_user: auth.sender_user, diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs index ae9902e11..dadb000b8 100644 --- a/src/core/config/mod.rs +++ b/src/core/config/mod.rs @@ -409,7 +409,7 @@ pub fn new(path: Option) -> Result { .merge(Env::prefixed("CONDUWUIT_").global().split("__")) }; - let config = match raw_config.extract::() { + let config = match raw_config.extract::() { Err(e) => return Err(Error::BadConfig(format!("{e}"))), Ok(config) => config, }; diff --git a/src/core/config/proxy.rs b/src/core/config/proxy.rs index f41a92f60..a2d64fa61 100644 --- a/src/core/config/proxy.rs +++ b/src/core/config/proxy.rs @@ -42,11 +42,11 @@ pub enum ProxyConfig { impl ProxyConfig { pub fn to_proxy(&self) -> Result> { Ok(match self.clone() { - ProxyConfig::None => None, - ProxyConfig::Global { + Self::None => None, + Self::Global { url, } => Some(Proxy::all(url)?), - ProxyConfig::ByDomain(proxies) => Some(Proxy::custom(move |url| { + Self::ByDomain(proxies) => Some(Proxy::custom(move |url| { proxies.iter().find_map(|proxy| proxy.for_url(url)).cloned() // first matching // proxy })), @@ -108,18 +108,18 @@ enum WildCardedDomain { impl WildCardedDomain { fn matches(&self, domain: &str) -> bool { match self { - WildCardedDomain::WildCard => true, - WildCardedDomain::WildCarded(d) => domain.ends_with(d), - WildCardedDomain::Exact(d) => domain == d, + Self::WildCard => true, + Self::WildCarded(d) => domain.ends_with(d), + Self::Exact(d) => domain == d, } } fn more_specific_than(&self, other: &Self) -> bool { match (self, other) { - (WildCardedDomain::WildCard, WildCardedDomain::WildCard) => false, - (_, WildCardedDomain::WildCard) => true, - (WildCardedDomain::Exact(a), WildCardedDomain::WildCarded(_)) => other.matches(a), - (WildCardedDomain::WildCarded(a), WildCardedDomain::WildCarded(b)) => a != b && a.ends_with(b), + (Self::WildCard, Self::WildCard) => false, + (_, Self::WildCard) => true, + (Self::Exact(a), Self::WildCarded(_)) => other.matches(a), + (Self::WildCarded(a), Self::WildCarded(b)) => a != b && a.ends_with(b), _ => false, } } @@ -130,11 +130,11 @@ impl std::str::FromStr for WildCardedDomain { fn from_str(s: &str) -> Result { // maybe do some domain validation? Ok(if s.starts_with("*.") { - WildCardedDomain::WildCarded(s[1..].to_owned()) + Self::WildCarded(s[1..].to_owned()) } else if s == "*" { - WildCardedDomain::WildCarded(String::new()) + Self::WildCarded(String::new()) } else { - WildCardedDomain::Exact(s.to_owned()) + Self::Exact(s.to_owned()) }) } } diff --git a/src/core/log.rs b/src/core/log.rs index d31ca194e..eae25eb08 100644 --- a/src/core/log.rs +++ b/src/core/log.rs @@ -21,7 +21,7 @@ pub trait ReloadHandle { } impl ReloadHandle for reload::Handle { - fn reload(&self, new_value: L) -> Result<(), reload::Error> { reload::Handle::reload(self, new_value) } + fn reload(&self, new_value: L) -> Result<(), reload::Error> { Self::reload(self, new_value) } } struct LogLevelReloadHandlesInner { @@ -37,8 +37,8 @@ pub struct LogLevelReloadHandles { impl LogLevelReloadHandles { #[must_use] - pub fn new(handles: Vec + Send + Sync>>) -> LogLevelReloadHandles { - LogLevelReloadHandles { + pub fn new(handles: Vec + Send + Sync>>) -> Self { + Self { inner: Arc::new(LogLevelReloadHandlesInner { handles, }), diff --git a/src/core/pducount.rs b/src/core/pducount.rs index 8adb4ca5d..094988b69 100644 --- a/src/core/pducount.rs +++ b/src/core/pducount.rs @@ -29,8 +29,8 @@ pub fn try_from_string(token: &str) -> Result { #[must_use] pub fn stringify(&self) -> String { match self { - PduCount::Backfilled(x) => format!("-{x}"), - PduCount::Normal(x) => x.to_string(), + Self::Backfilled(x) => format!("-{x}"), + Self::Normal(x) => x.to_string(), } } } @@ -42,10 +42,10 @@ fn partial_cmp(&self, other: &Self) -> Option { Some(self.cmp(other)) impl Ord for PduCount { fn cmp(&self, other: &Self) -> Ordering { match (self, other) { - (PduCount::Normal(s), PduCount::Normal(o)) => s.cmp(o), - (PduCount::Backfilled(s), PduCount::Backfilled(o)) => o.cmp(s), - (PduCount::Normal(_), PduCount::Backfilled(_)) => Ordering::Greater, - (PduCount::Backfilled(_), PduCount::Normal(_)) => Ordering::Less, + (Self::Normal(s), Self::Normal(o)) => s.cmp(o), + (Self::Backfilled(s), Self::Backfilled(o)) => o.cmp(s), + (Self::Normal(_), Self::Backfilled(_)) => Ordering::Greater, + (Self::Backfilled(_), Self::Normal(_)) => Ordering::Less, } } } diff --git a/src/database/cork.rs b/src/database/cork.rs index 752260a6b..dcabd7072 100644 --- a/src/database/cork.rs +++ b/src/database/cork.rs @@ -11,7 +11,7 @@ pub struct Cork { impl Cork { pub fn new(db: &Arc, flush: bool, sync: bool) -> Self { db.cork().unwrap(); - Cork { + Self { db: db.clone(), flush, sync, diff --git a/src/database/kvdatabase.rs b/src/database/kvdatabase.rs index 906712dc3..ce3bf30f9 100644 --- a/src/database/kvdatabase.rs +++ b/src/database/kvdatabase.rs @@ -157,7 +157,7 @@ pub struct KeyValueDatabase { impl KeyValueDatabase { /// Load an existing database or create a new one. #[allow(clippy::too_many_lines)] - pub async fn load_or_create(server: &Arc) -> Result { + pub async fn load_or_create(server: &Arc) -> Result { let config = &server.config; check_db_setup(config)?; let builder = build(config)?; diff --git a/src/database/rocksdb/mod.rs b/src/database/rocksdb/mod.rs index f0c3882f0..c9493cab1 100644 --- a/src/database/rocksdb/mod.rs +++ b/src/database/rocksdb/mod.rs @@ -84,7 +84,7 @@ fn open(config: &Config) -> Result { db.latest_sequence_number(), load_time.elapsed() ); - Ok(Arc::new(Engine { + Ok(Self::new(Engine { config: config.clone(), row_cache, col_cache, @@ -110,7 +110,7 @@ fn open_tree(&self, name: &'static str) -> Result> { Ok(Arc::new(RocksDbEngineTree { name, - db: Arc::clone(self), + db: Self::clone(self), watchers: Watchers::default(), })) } diff --git a/src/database/sqlite/mod.rs b/src/database/sqlite/mod.rs index 745c6aa78..562d2a10b 100644 --- a/src/database/sqlite/mod.rs +++ b/src/database/sqlite/mod.rs @@ -113,7 +113,7 @@ fn open(config: &Config) -> Result { let writer = Mutex::new(Engine::prepare_conn(&path, cache_size_per_thread)?); - let arc = Arc::new(Engine { + let arc = Self::new(Engine { writer, read_conn_tls: ThreadLocal::new(), read_iterator_conn_tls: ThreadLocal::new(), @@ -131,7 +131,7 @@ fn open_tree(&self, name: &str) -> Result> { )?; Ok(Arc::new(SqliteTable { - engine: Arc::clone(self), + engine: Self::clone(self), name: name.to_owned(), watchers: Watchers::default(), })) diff --git a/src/main/server.rs b/src/main/server.rs index cd5b1cdb3..b1bccfe94 100644 --- a/src/main/server.rs +++ b/src/main/server.rs @@ -29,7 +29,7 @@ pub(crate) struct Server { } impl Server { - pub(crate) fn build(args: Args, runtime: Option<&runtime::Handle>) -> Result, Error> { + pub(crate) fn build(args: Args, runtime: Option<&runtime::Handle>) -> Result, Error> { let config = Config::new(args.config)?; #[cfg(feature = "sentry_telemetry")] @@ -49,7 +49,7 @@ pub(crate) fn build(args: Args, runtime: Option<&runtime::Handle>) -> Result) -> Result { } } - Ok(NamespaceRegex { + Ok(Self { exclusive: if exclusive.is_empty() { None } else { @@ -102,8 +102,8 @@ pub struct RegistrationInfo { impl TryFrom for RegistrationInfo { type Error = regex::Error; - fn try_from(value: Registration) -> Result { - Ok(RegistrationInfo { + fn try_from(value: Registration) -> Result { + Ok(Self { users: value.namespaces.users.clone().try_into()?, aliases: value.namespaces.aliases.clone().try_into()?, rooms: value.namespaces.rooms.clone().try_into()?, diff --git a/src/service/globals/client.rs b/src/service/globals/client.rs index 33f6d85f7..5e1b129da 100644 --- a/src/service/globals/client.rs +++ b/src/service/globals/client.rs @@ -15,8 +15,8 @@ pub struct Client { } impl Client { - pub fn new(config: &Config, resolver: &Arc) -> Client { - Client { + pub fn new(config: &Config, resolver: &Arc) -> Self { + Self { default: Self::base(config) .unwrap() .dns_resolver(resolver.clone()) diff --git a/src/service/globals/resolver.rs b/src/service/globals/resolver.rs index e90201ede..39e4cfb0e 100644 --- a/src/service/globals/resolver.rs +++ b/src/service/globals/resolver.rs @@ -83,7 +83,7 @@ pub fn new(config: &Config) -> Self { let resolver = Arc::new(TokioAsyncResolver::tokio(conf, opts)); let overrides = Arc::new(StdRwLock::new(TlsNameMap::new())); - Resolver { + Self { destinations: Arc::new(RwLock::new(WellKnownMap::new())), overrides: overrides.clone(), resolver: resolver.clone(), diff --git a/src/service/pdu.rs b/src/service/pdu.rs index f608200b2..6274d6350 100644 --- a/src/service/pdu.rs +++ b/src/service/pdu.rs @@ -56,7 +56,7 @@ pub struct PduEvent { impl PduEvent { #[tracing::instrument(skip(self))] - pub fn redact(&mut self, room_version_id: RoomVersionId, reason: &PduEvent) -> crate::Result<()> { + pub fn redact(&mut self, room_version_id: RoomVersionId, reason: &Self) -> crate::Result<()> { self.unsigned = None; let mut content = serde_json::from_str(self.content.get()) diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces/mod.rs index 18b9258e9..6fcaccb9c 100644 --- a/src/service/rooms/spaces/mod.rs +++ b/src/service/rooms/spaces/mod.rs @@ -211,7 +211,7 @@ fn push(&mut self, parent: NodeId, mut children: Vec<(OwnedRoomId, Vec Self { let zero_depth = max_depth == 0; - Arena { + Self { nodes: vec![Node { parent: None, next_sibling: None, @@ -248,7 +248,7 @@ fn from_str(value: &str) -> Result { let mut values = value.split('_'); let mut pag_tok = || { - Some(PagnationToken { + Some(Self { skip: UInt::from_str(values.next()?).ok()?, limit: UInt::from_str(values.next()?).ok()?, max_depth: UInt::from_str(values.next()?).ok()?, @@ -316,7 +316,7 @@ fn from(value: CachedSpaceHierarchySummary) -> Self { .. } = value.summary; - SpaceHierarchyRoomsChunk { + Self { canonical_alias, name, num_joined_members, diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs index ab813489b..225d37c7e 100644 --- a/src/service/sending/mod.rs +++ b/src/service/sending/mod.rs @@ -259,19 +259,19 @@ impl Destination { #[tracing::instrument(skip(self))] pub fn get_prefix(&self) -> Vec { let mut prefix = match self { - Destination::Appservice(server) => { + Self::Appservice(server) => { let mut p = b"+".to_vec(); p.extend_from_slice(server.as_bytes()); p }, - Destination::Push(user, pushkey) => { + Self::Push(user, pushkey) => { let mut p = b"$".to_vec(); p.extend_from_slice(user.as_bytes()); p.push(0xFF); p.extend_from_slice(pushkey.as_bytes()); p }, - Destination::Normal(server) => { + Self::Normal(server) => { let mut p = Vec::new(); p.extend_from_slice(server.as_bytes()); p diff --git a/src/service/sending/resolve.rs b/src/service/sending/resolve.rs index b79f18c88..1d043d8bf 100644 --- a/src/service/sending/resolve.rs +++ b/src/service/sending/resolve.rs @@ -421,8 +421,8 @@ fn port(&self) -> Option { impl fmt::Display for FedDest { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - FedDest::Named(host, port) => write!(f, "{host}{port}"), - FedDest::Literal(addr) => write!(f, "{addr}"), + Self::Named(host, port) => write!(f, "{host}{port}"), + Self::Literal(addr) => write!(f, "{addr}"), } } }