magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'up-ruma' into 'next'

Browse source 
Upgrade Ruma

See merge request famedly/conduit!210
This commit is contained in:
Timo Kösters 2021-10-15 11:38:12 +00:00
commit dc8bc4a880
39 changed files with 902 additions and 948 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/database.rs
View file

@ -501,13 +501,13 @@ impl Database {
if let Some(parent_stateinfo) = states_parents.last() {
let statediffnew = current_state
.difference(&parent_stateinfo.1)
.cloned()
.copied()
.collect::<HashSet<_>>();
let statediffremoved = parent_stateinfo
.1
.difference(&current_state)
.cloned()
.copied()
.collect::<HashSet<_>>();
(statediffnew, statediffremoved)
@ -701,7 +701,7 @@ impl Database {
println!("Deleting starts");
let batch2 = db
let batch2: Vec<_> = db
.rooms
.tokenids
.iter()
@ -713,7 +713,7 @@ impl Database {
None
}
})
.collect::<Vec<_>>();
.collect();
for key in batch2 {
println!("del");