Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Fix nightly-only clippy lints

Browse Source
This commit is contained in:
Jade Ellis
2025-09-10 17:32:28 +01:00
parent baa89586e2
commit 72b78ed6d4
6 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/info/version.rs
+1 -1
View File
@@ -27,5 +27,5 @@ fn init_user_agent() -> String { format!("{}/{}", name(), version()) }
fn init_version() -> String {
conduwuit_build_metadata::version_tag()
.map_or(SEMANTIC.to_owned(), |extra| format!("{SEMANTIC} ({extra})"))
.map_or_else(|| SEMANTIC.to_owned(), |extra| format!("{SEMANTIC} ({extra})"))
}
src/core/matrix/state_res/event_auth.rs
+5 -4
View File
@@ -585,10 +585,11 @@ where
(target_membership == MembershipState::Join).then_some(&power_levels.users_default)
});
let mut join_rules = JoinRule::Invite;
if let Some(jr) = &join_rules_event {
join_rules = from_json_str::<RoomJoinRulesEventContent>(jr.content().get())?.join_rule;
}
let join_rules = if let Some(jr) = &join_rules_event {
from_json_str::<RoomJoinRulesEventContent>(jr.content().get())?.join_rule
} else {
JoinRule::Invite
};
let power_levels_event_id = power_levels_event.as_ref().map(Event::event_id);
let sender_membership_event_id = sender_membership_event.as_ref().map(Event::event_id);
src/core/utils/bool.rs
+2 -2
View File
@@ -65,7 +65,7 @@ impl BoolExt for bool {
fn into_option(self) -> Option<()> { self.then_some(()) }
#[inline]
fn into_result(self) -> Result<(), ()> { self.ok_or(()) }
fn into_result(self) -> Result<(), ()> { BoolExt::ok_or(self, ()) }
#[inline]
fn map<T, F: FnOnce(Self) -> T>(self, f: F) -> T
@@ -77,7 +77,7 @@ impl BoolExt for bool {
#[inline]
fn map_ok_or<T, E, F: FnOnce() -> T>(self, err: E, f: F) -> Result<T, E> {
self.ok_or(err).map(|()| f())
BoolExt::ok_or(self, err).map(|()| f())
}
#[inline]