rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ALL clippy warnings

Browse Source
This commit is contained in:
Devin Ragotzy
2021-01-15 11:05:57 -05:00
committed by Devin Ragotzy
parent 4cf530c55b
commit 4b2eb5ab82
12 changed files with 106 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/client_server/account.rs
View File

@@ -239,11 +239,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 2. Make conduit bot join
@@ -264,11 +260,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 3. Power levels
@@ -302,11 +294,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 4.1 Join Rules
@@ -323,11 +311,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 4.2 History Visibility
@@ -346,11 +330,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 4.3 Guest Access
@@ -367,11 +347,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 6. Events implied by name and topic
@@ -390,11 +366,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.rooms.build_and_append_pdu(
@@ -410,11 +382,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// Room alias
@@ -436,11 +404,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.rooms.set_alias(&alias, Some(&room_id), &db.globals)?;
@@ -463,11 +427,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.rooms.build_and_append_pdu(
PduBuilder {
@@ -486,11 +446,7 @@ pub async fn register_route(
},
&user_id,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// Send welcome message
@@ -515,11 +471,7 @@ pub async fn register_route(
},
&conduit_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
}
@@ -691,11 +643,7 @@ pub async fn deactivate_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
}

40
src/client_server/membership.rs
View File

@@ -124,11 +124,7 @@ pub async fn leave_room_route(
},
&sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.flush().await?;
@@ -164,11 +160,7 @@ pub async fn invite_user_route(
},
&sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.flush().await?;
@@ -220,11 +212,7 @@ pub async fn kick_user_route(
},
&sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.flush().await?;
@@ -280,11 +268,7 @@ pub async fn ban_user_route(
},
&sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.flush().await?;
@@ -332,11 +316,7 @@ pub async fn unban_user_route(
},
&sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.flush().await?;
@@ -685,9 +665,7 @@ async fn join_room_by_id_helper(
utils::to_canonical_object(&**pdu).expect("Pdu is valid canonical object"),
count,
pdu_id.clone().into(),
&db.globals,
&db.account_data,
&db.admin,
&db,
)?;
if state_events.contains(ev_id) {
@@ -717,11 +695,7 @@ async fn join_room_by_id_helper(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
}

6
src/client_server/message.rs
View File

@@ -68,11 +68,7 @@ pub async fn send_message_event_route(
},
&sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.transaction_ids.add_txnid(

12
src/client_server/profile.rs
View File

@@ -63,11 +63,7 @@ pub async fn set_displayname_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// Presence update
@@ -160,11 +156,7 @@ pub async fn set_avatar_url_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// Presence update

6
src/client_server/redact.rs
View File

@@ -31,11 +31,7 @@ pub async fn redact_event_route(
},
&sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.flush().await?;

90
src/client_server/room.rs
View File

@@ -65,11 +65,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 2. Let the room creator join
@@ -90,11 +86,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 3. Power levels
@@ -135,11 +127,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 4. Events set by preset
@@ -175,11 +163,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 4.2 History Visibility
@@ -196,11 +180,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 4.3 Guest Access
@@ -225,11 +205,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// 5. Events listed in initial_state
@@ -248,11 +224,7 @@ pub async fn create_room_route(
pdu_builder,
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
}
@@ -273,11 +245,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
}
@@ -295,11 +263,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
}
@@ -322,11 +286,7 @@ pub async fn create_room_route(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
}
@@ -413,11 +373,7 @@ pub async fn upgrade_room_route(
},
sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// Get the old room federations status
@@ -457,11 +413,7 @@ pub async fn upgrade_room_route(
},
sender_user,
&replacement_room,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// Join the new room
@@ -482,11 +434,7 @@ pub async fn upgrade_room_route(
},
sender_user,
&replacement_room,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
// Recommended transferable state events list from the specs
@@ -519,11 +467,7 @@ pub async fn upgrade_room_route(
},
sender_user,
&replacement_room,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
}
@@ -566,11 +510,7 @@ pub async fn upgrade_room_route(
},
sender_user,
&body.room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
db.flush().await?;

6
src/client_server/state.rs
View File

@@ -284,11 +284,7 @@ pub async fn send_state_event_for_key_helper(
},
&sender_user,
&room_id,
&db.globals,
&db.sending,
&db.admin,
&db.account_data,
&db.appservice,
&db,
)?;
Ok(event_id)