oss/continuwuity
oss/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-29 11:18:30 +00:00
Code Wiki Activity

Fix various clippy errors

Browse source
This commit is contained in:
Rudi Floren 2021-03-04 15:27:25 +01:00
parent 6309506a48
commit 4027cbd01d
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server_server.rs
View file

@ -3,7 +3,7 @@ use get_profile_information::v1::ProfileField;
use http::header::{HeaderValue, AUTHORIZATION, HOST};
use log::{info, warn};
use regex::Regex;
use rocket::{get, post, put, response::content::Json, State};
use rocket::{response::content::Json, State};
use ruma::{
api::{
federation::{
@ -29,6 +29,10 @@ use std::{
net::{IpAddr, SocketAddr},
time::{Duration, SystemTime},
};
#[cfg(feature = "conduit_bin")]
use {
rocket::{get, post, put}
};
#[tracing::instrument(skip(globals))]
pub async fn send_request<T: OutgoingRequest>(
@ -591,7 +595,7 @@ pub async fn send_transaction_message_route<'a>(
.get("users")
.and_then(|users| users.as_sequence())
.map_or_else(
|| Vec::new(),
Vec::new,
|users| {
users
.iter()
@ -623,7 +627,7 @@ pub async fn send_transaction_message_route<'a>(
.and_then(|string| {
UserId::parse_with_server_name(string, db.globals.server_name()).ok()
});
#[allow(clippy::blocks_in_if_conditions)]
if bridge_user_id.map_or(false, |bridge_user_id| {
db.rooms
.is_joined(&bridge_user_id, room_id)