magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'clippy' into 'master'

Browse source 
Fix a bunch of clippy lints

See merge request famedly/conduit!178
This commit is contained in:
Timo Kösters 2021-09-01 10:47:23 +00:00
commit 8518d59a0b
8 changed files with 77 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server_server.rs
View file

@ -147,7 +147,7 @@ where
let result = find_actual_destination(globals, &destination).await;
(result.0, result.1.clone().into_uri_string())
(result.0, result.1.into_uri_string())
};
let actual_destination_str = actual_destination.clone().into_https_string();
@ -1562,7 +1562,7 @@ async fn upgrade_outlier_to_timeline_pdu(
None
};
if !state_res::event_auth::auth_check(
let check_result = state_res::event_auth::auth_check(
&room_version,
&incoming_pdu,
previous_create.clone(),
@ -1576,8 +1576,9 @@ async fn upgrade_outlier_to_timeline_pdu(
.and_then(|event_id| db.rooms.get_pdu(&event_id).ok().flatten())
},
)
.map_err(|_e| "Auth check failed.".to_owned())?
{
.map_err(|_e| "Auth check failed.".to_owned())?;
if !check_result {
return Err("Event has failed auth check with state at the event.".into());
}
debug!("Auth check succeeded.");