state-res: Resolve FIXME comment

This commit is contained in:
Jonathan de Jong 2022-02-02 14:27:59 +01:00 committed by GitHub
parent e4d8761222
commit eeba51d4d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -82,8 +82,7 @@ where
// `all_conflicted` contains unique items // `all_conflicted` contains unique items
// synapse says `full_set = {eid for eid in full_conflicted_set if eid in event_map}` // synapse says `full_set = {eid for eid in full_conflicted_set if eid in event_map}`
let all_conflicted: HashSet<_> = get_auth_chain_diff(auth_chain_sets) let all_conflicted: HashSet<_> = get_auth_chain_diff(auth_chain_sets)
// FIXME: Use into_values() once MSRV >= 1.54 .chain(conflicting.into_values().flatten())
.chain(conflicting.into_iter().flat_map(|(_k, v)| v))
// Don't honor events we cannot "verify" // Don't honor events we cannot "verify"
.filter(|id| fetch_event(id.borrow()).is_some()) .filter(|id| fetch_event(id.borrow()).is_some())
.collect(); .collect();