From eeba51d4d61b3f8f463535a2cc819f83a906cf9d Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathan@automatia.nl>
Date: Wed, 2 Feb 2022 14:27:59 +0100
Subject: [PATCH] state-res: Resolve FIXME comment

---
 crates/ruma-state-res/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/ruma-state-res/src/lib.rs b/crates/ruma-state-res/src/lib.rs
index 90df3c8e..cd520981 100644
--- a/crates/ruma-state-res/src/lib.rs
+++ b/crates/ruma-state-res/src/lib.rs
@@ -82,8 +82,7 @@ where
     // `all_conflicted` contains unique items
     // 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)
-        // FIXME: Use into_values() once MSRV >= 1.54
-        .chain(conflicting.into_iter().flat_map(|(_k, v)| v))
+        .chain(conflicting.into_values().flatten())
         // Don't honor events we cannot "verify"
         .filter(|id| fetch_event(id.borrow()).is_some())
         .collect();