chore: Clippy fixes

This commit is contained in:
Ginger
2026-04-13 18:31:16 -04:00
parent 02f69a7160
commit a8a8e1ea51
25 changed files with 50 additions and 51 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ pub(crate) async fn ban_user_route(
.unwrap_or_else(|_| RoomMemberEventContent::new(MembershipState::Ban));
content.membership = MembershipState::Ban;
content.reason = body.reason.clone();
content.reason.clone_from(&body.reason);
content.displayname = None;
content.avatar_url = None;
content.is_direct = None;
+5 -3
View File
@@ -426,7 +426,9 @@ async fn join_room_by_id_helper_remote(
join_content.avatar_url = services.users.avatar_url(sender_user).await.ok();
join_content.blurhash = services.users.blurhash(sender_user).await.ok();
join_content.reason = reason;
join_content.join_authorized_via_users_server = join_authorized_via_users_server.clone();
join_content
.join_authorized_via_users_server
.clone_from(&join_authorized_via_users_server);
join_event_stub.insert(
"content".to_owned(),
@@ -752,7 +754,7 @@ async fn join_room_by_id_helper_local(
content.displayname = services.users.displayname(sender_user).await.ok();
content.avatar_url = services.users.avatar_url(sender_user).await.ok();
content.blurhash = services.users.blurhash(sender_user).await.ok();
content.reason = reason.clone();
content.reason.clone_from(&reason);
content.join_authorized_via_users_server = auth_user;
// Try normal join first
@@ -861,7 +863,7 @@ async fn make_join_request(
);
return Err(e);
},
| ErrorKind::Forbidden { .. } => {
| ErrorKind::Forbidden => {
warn!("{remote_server} refuses to let us join: {e}.");
return Err(e);
},
+1 -1
View File
@@ -39,7 +39,7 @@ pub(crate) async fn kick_user_route(
}
event.membership = MembershipState::Leave;
event.reason = body.reason.clone();
event.reason.clone_from(&body.reason);
event.is_direct = None;
event.join_authorized_via_users_server = None;
event.third_party_invite = None;
+1 -1
View File
@@ -347,7 +347,7 @@ async fn knock_room_helper_local(
content.displayname = services.users.displayname(sender_user).await.ok();
content.avatar_url = services.users.avatar_url(sender_user).await.ok();
content.blurhash = services.users.blurhash(sender_user).await.ok();
content.reason = reason.clone();
content.reason.clone_from(&reason.clone());
// Try normal knock first
let Err(error) = services
+1 -1
View File
@@ -119,5 +119,5 @@ fn membership_filter<Pdu: Event>(
return None;
}
return Some(pdu);
Some(pdu)
}
+1 -1
View File
@@ -35,7 +35,7 @@ pub(crate) async fn unban_user_route(
}
current_member_content.membership = MembershipState::Leave;
current_member_content.reason = body.reason.clone();
current_member_content.reason.clone_from(&body.reason);
current_member_content.join_authorized_via_users_server = None;
current_member_content.third_party_invite = None;
current_member_content.is_direct = None;