chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

state-res: Fix new clippy warnings

Browse Source
This commit is contained in:
Kévin Commaille 2024-02-14 12:43:08 +01:00 committed by Kévin Commaille
parent 201733ebe9
commit 05c88d6afc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ruma-state-res/src/lib.rs
View File

@ -682,7 +682,7 @@ mod tests {
let sorted_power_events = let sorted_power_events =
crate::reverse_topological_power_sort(power_events, &auth_chain, |id| { crate::reverse_topological_power_sort(power_events, &auth_chain, |id| {
events.get(id).map(Arc::clone) events.get(id).cloned()
}) })
.unwrap(); .unwrap();
@ -690,7 +690,7 @@ mod tests {
&RoomVersion::V6, &RoomVersion::V6,
&sorted_power_events, &sorted_power_events,
HashMap::new(), // unconflicted events HashMap::new(), // unconflicted events
|id| events.get(id).map(Arc::clone), |id| events.get(id).cloned(),
) )
.expect("iterative auth check failed on resolved events"); .expect("iterative auth check failed on resolved events");
@ -703,7 +703,7 @@ mod tests {
resolved_power.get(&(StateEventType::RoomPowerLevels, "".to_owned())).cloned(); resolved_power.get(&(StateEventType::RoomPowerLevels, "".to_owned())).cloned();
let sorted_event_ids = let sorted_event_ids =
crate::mainline_sort(&events_to_sort, power_level, |id| events.get(id).map(Arc::clone)) crate::mainline_sort(&events_to_sort, power_level, |id| events.get(id).cloned())
.unwrap(); .unwrap();
assert_eq!( assert_eq!(
@ -1056,7 +1056,7 @@ mod tests {
store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap() store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap()
}) })
.collect(), .collect(),
|id| ev_map.get(id).map(Arc::clone), |id| ev_map.get(id).cloned(),
) { ) {
Ok(state) => state, Ok(state) => state,
Err(e) => panic!("{e}"), Err(e) => panic!("{e}"),
@ -1156,7 +1156,7 @@ mod tests {
store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap() store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap()
}) })
.collect(), .collect(),
|id| ev_map.get(id).map(Arc::clone), |id| ev_map.get(id).cloned(),
) { ) {
Ok(state) => state, Ok(state) => state,
Err(e) => panic!("{e}"), Err(e) => panic!("{e}"),

4
crates/ruma-state-res/src/test_utils.rs
View File

@ -118,7 +118,7 @@ pub(crate) fn do_check(
.collect(); .collect();
let resolved = crate::resolve(&RoomVersionId::V6, state_sets, auth_chain_sets, |id| { let resolved = crate::resolve(&RoomVersionId::V6, state_sets, auth_chain_sets, |id| {
event_map.get(id).map(Arc::clone) event_map.get(id).cloned()
}); });
match resolved { match resolved {
Ok(state) => state, Ok(state) => state,
@ -210,7 +210,7 @@ impl<E: Event> TestStore<E> {
pub(crate) fn get_event(&self, _: &RoomId, event_id: &EventId) -> Result<Arc<E>> { pub(crate) fn get_event(&self, _: &RoomId, event_id: &EventId) -> Result<Arc<E>> {
self.0 self.0
.get(event_id) .get(event_id)
.map(Arc::clone) .cloned()
.ok_or_else(|| Error::NotFound(format!("{event_id} not found"))) .ok_or_else(|| Error::NotFound(format!("{event_id} not found")))
} }