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

state-res: Remove pointless shifting around of Vec elements

Browse Source
This commit is contained in:
Jonas Platte 2021-08-31 20:40:36 +02:00
parent 9c5b2e3d8c
commit 815fd19a33
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,10 @@ impl StateResolution {
state_sets.iter().map(|state_set| state_set.get(key)).collect::<Vec<_>>(); state_sets.iter().map(|state_set| state_set.get(key)).collect::<Vec<_>>();
if event_ids.iter().all_equal() { if event_ids.iter().all_equal() {
let id = event_ids.remove(0).expect("unconflicting `EventId` is not None"); // First .unwrap() is okay because
// * event_ids has the same length as state_sets
// * we never enter the loop this code is in if state_sets is empty
let id = event_ids.pop().unwrap().expect("unconflicting `EventId` is not None");
unconflicted_state.insert(key.clone(), id.clone()); unconflicted_state.insert(key.clone(), id.clone());
} else { } else {
conflicted_state conflicted_state