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

fix blocks_in_conditions clippy lint

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-01-16 20:26:42 -05:00 • committed by June
parent 8d42351e34
commit ad1d272e2a
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -200,7 +200,7 @@ unused_extern_crates = "warn"
unused_import_braces = "warn" unused_import_braces = "warn"
# unused_lifetimes = "warn" # unused_lifetimes = "warn"
unused_qualifications = "warn" unused_qualifications = "warn"
unused_tuple_struct_fields = "warn" dead_code = "warn"
[workspace.lints.clippy] [workspace.lints.clippy]
suspicious = "warn" # assume deny in practice suspicious = "warn" # assume deny in practice
@ -212,7 +212,7 @@ expl_impl_clone_on_copy = "warn"
unnecessary_cast = "warn" unnecessary_cast = "warn"
cast_lossless = "warn" cast_lossless = "warn"
ptr_as_ptr = "warn" ptr_as_ptr = "warn"
ref_to_mut = "warn" mut_mut = "warn"
char_lit_as_u8 = "warn" char_lit_as_u8 = "warn"
dbg_macro = "warn" dbg_macro = "warn"
empty_structs_with_brackets = "warn" empty_structs_with_brackets = "warn"

19
src/service/rooms/event_handler/mod.rs
View file

@ -631,7 +631,7 @@ impl Service {
state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| { state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| {
let res = services().rooms.timeline.get_pdu(id); let res = services().rooms.timeline.get_pdu(id);
if let Err(e) = &res { if let Err(e) = &res {
error!("LOOK AT ME Failed to fetch event: {}", e); error!("Failed to fetch event: {}", e);
} }
res.ok().flatten() res.ok().flatten()
}); });
@ -975,13 +975,16 @@ impl Service {
debug!("Resolving state"); debug!("Resolving state");
let lock = services().globals.stateres_mutex.lock(); let lock = services().globals.stateres_mutex.lock();
let state = match state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| { let state_resolve =
let res = services().rooms.timeline.get_pdu(id); state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| {
if let Err(e) = &res { let res = services().rooms.timeline.get_pdu(id);
error!("LOOK AT ME Failed to fetch event: {}", e); if let Err(e) = &res {
} error!("Failed to fetch event: {}", e);
res.ok().flatten() }
}) { res.ok().flatten()
});
let state = match state_resolve {
Ok(new_state) => new_state, Ok(new_state) => new_state,
Err(e) => { Err(e) => {
error!("State resolution failed: {}", e); error!("State resolution failed: {}", e);