state-res: Upgrade rand and update usage

This commit is contained in:
Jonas Platte 2021-05-08 00:57:43 +02:00
parent f58462a002
commit 410b4aed25
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
2 changed files with 3 additions and 13 deletions

View File

@ -29,7 +29,7 @@ log = "0.4.11"
[dev-dependencies] [dev-dependencies]
criterion = "0.3.3" criterion = "0.3.3"
rand = "0.7.3" rand = "0.8.3"
tracing-subscriber = "0.2.15" tracing-subscriber = "0.2.15"
[[bench]] [[bench]]

View File

@ -1,22 +1,12 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use rand::seq::SliceRandom;
use ruma_events::EventType; use ruma_events::EventType;
use ruma_identifiers::EventId;
use ruma_state_res::{is_power_event, room_version::RoomVersion, StateMap, StateResolution}; use ruma_state_res::{is_power_event, room_version::RoomVersion, StateMap, StateResolution};
mod utils; mod utils;
use utils::{room_id, INITIAL_EVENTS}; use utils::{room_id, INITIAL_EVENTS};
fn shuffle(list: &mut [EventId]) {
use rand::Rng;
let mut rng = rand::thread_rng();
for i in 1..list.len() {
let j = rng.gen_range(0, list.len());
list.swap(i, j);
}
}
fn test_event_sort() { fn test_event_sort() {
let mut events = INITIAL_EVENTS(); let mut events = INITIAL_EVENTS();
@ -57,7 +47,7 @@ fn test_event_sort() {
// don't remove any events so we know it sorts them all correctly // don't remove any events so we know it sorts them all correctly
let mut events_to_sort = events.keys().cloned().collect::<Vec<_>>(); let mut events_to_sort = events.keys().cloned().collect::<Vec<_>>();
shuffle(&mut events_to_sort); events_to_sort.shuffle(&mut rand::thread_rng());
let power_level = resolved_power.get(&(EventType::RoomPowerLevels, "".to_string())); let power_level = resolved_power.get(&(EventType::RoomPowerLevels, "".to_string()));