[fractal] bump matrix-sdk to commit bdaed6237e104b738b5ad25c063675373d9fa60d
- From: Christopher Davis <christopherdavis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] bump matrix-sdk to commit bdaed6237e104b738b5ad25c063675373d9fa60d
- Date: Fri, 5 Feb 2021 06:22:02 +0000 (UTC)
commit bd52ba787af6fbdf911c92adc99a7e1b334a3c89
Author: Julian Sparber <julian sparber net>
Date: Thu Feb 4 22:25:26 2021 +0100
bump matrix-sdk to commit bdaed6237e104b738b5ad25c063675373d9fa60d
This also bumps tokio to 1.1.0 since the matrix-sdk depends on it.
Cargo.lock | 1258 +++++++++++++++---------------------
fractal-gtk/Cargo.toml | 6 +-
fractal-gtk/src/appop/login.rs | 12 +-
fractal-gtk/src/appop/sync.rs | 37 +-
fractal-gtk/src/backend/room.rs | 2 +-
fractal-gtk/src/backend/sync.rs | 8 +-
fractal-gtk/src/model/message.rs | 52 +-
fractal-gtk/src/model/room.rs | 172 ++---
fractal-gtk/src/widgets/address.rs | 2 +-
fractal-gtk/src/widgets/login.rs | 2 +-
10 files changed, 617 insertions(+), 934 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 62e89e7d..5b9823af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,14 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
+[[package]]
+name = "aead"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
[[package]]
name = "aes"
version = "0.6.0"
@@ -23,6 +32,20 @@ dependencies = [
"ctr",
]
+[[package]]
+name = "aes-gcm"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
+
[[package]]
name = "aes-soft"
version = "0.6.4"
@@ -43,15 +66,6 @@ dependencies = [
"opaque-debug 0.3.0",
]
-[[package]]
-name = "ahash"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
-dependencies = [
- "const-random",
-]
-
[[package]]
name = "aho-corasick"
version = "0.7.15"
@@ -82,7 +96,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -91,14 +105,14 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
dependencies = [
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
name = "anyhow"
-version = "1.0.37"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86"
+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
[[package]]
name = "arrayref"
@@ -114,9 +128,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "assign"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4af5687fe33aec5e70ef14caac5e0d363e335e5e5d6385fb75978d0c241b1d67"
+checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002"
[[package]]
name = "async-io"
@@ -135,40 +149,7 @@ dependencies = [
"polling",
"vec-arena",
"waker-fn",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "async-native-tls"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33"
-dependencies = [
- "native-tls",
- "thiserror",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "22068c0c19514942eefcfd4daf8976ef1aad84e61539f95cd200c35202f80af5"
-dependencies = [
- "async-stream-impl",
- "futures-core",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "winapi",
]
[[package]]
@@ -225,7 +206,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -262,18 +243,6 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-[[package]]
-name = "bitvec"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
[[package]]
name = "blake2b_simd"
version = "0.5.11"
@@ -333,9 +302,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
name = "bumpalo"
-version = "3.4.0"
+version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+checksum = "099e596ef14349721d9016f6b80dd3419ea1bf289ab9b44df8e4dfd3a005d5d9"
[[package]]
name = "byte-tools"
@@ -345,25 +314,15 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
[[package]]
name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "bytes"
-version = "0.4.12"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
[[package]]
name = "bytes"
-version = "0.5.6"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
[[package]]
name = "cache-padded"
@@ -399,9 +358,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.65"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
[[package]]
name = "cfg-if"
@@ -415,6 +374,29 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "chacha20"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "ed8738f14471a99f0e316c327e68fc82a3611cc2895fcb604b89eedaf8f39d95"
+dependencies = [
+ "cipher",
+ "zeroize",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "af1fc18e6d90c40164bf6c317476f2a98f04661e310e79830366b7e914c58a8e"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
[[package]]
name = "chrono"
version = "0.4.19"
@@ -424,8 +406,8 @@ dependencies = [
"libc",
"num-integer",
"num-traits",
- "time 0.1.44",
- "winapi 0.3.9",
+ "time 0.1.43",
+ "winapi",
]
[[package]]
@@ -487,43 +469,11 @@ dependencies = [
"cache-padded",
]
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
-dependencies = [
- "cfg-if 0.1.10",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "const-random"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "486d435a7351580347279f374cb8a3c16937485441db80181357b7c4d70f17ed"
-dependencies = [
- "const-random-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "49a84d8ff70e3ec52311109b019c27672b4c1929e4cf7c18bcf0cd9fb5e230be"
-dependencies = [
- "getrandom 0.2.0",
- "lazy_static",
- "proc-macro-hack",
- "tiny-keccak",
-]
-
[[package]]
name = "const_fn"
-version = "0.4.3"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
+checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
[[package]]
name = "constant_time_eq"
@@ -554,25 +504,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
[[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
+name = "cpuid-bool"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
+
+[[package]]
+name = "crc32fast"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
dependencies = [
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
+ "cfg-if 1.0.0",
]
[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
+name = "crossbeam-epoch"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
+ "const_fn",
+ "crossbeam-utils",
"lazy_static",
+ "memoffset",
+ "scopeguard",
]
[[package]]
@@ -586,12 +543,6 @@ dependencies = [
"lazy_static",
]
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
[[package]]
name = "crypto-mac"
version = "0.10.0"
@@ -613,20 +564,19 @@ dependencies = [
[[package]]
name = "dashmap"
-version = "3.11.10"
+version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0f260e2fc850179ef410018660006951c1b55b79e8087e87111a2c388994b9b5"
+checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
dependencies = [
- "ahash",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"num_cpus",
]
[[package]]
name = "derivative"
-version = "2.1.3"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "eaed5874effa6cde088c644ddcdcb4ffd1511391c5be4fdd7a5ccd02c7e4a183"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
@@ -679,7 +629,7 @@ checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
dependencies = [
"libc",
"redox_users",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -688,12 +638,6 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-[[package]]
-name = "dotenv"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
-
[[package]]
name = "either"
version = "1.6.1"
@@ -702,9 +646,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "encoding_rs"
-version = "0.8.26"
+version = "0.8.28"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283"
+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
dependencies = [
"cfg-if 1.0.0",
]
@@ -836,27 +780,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2"
[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
+name = "fs2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
+ "libc",
+ "winapi",
]
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "funty"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
-
[[package]]
name = "futf"
version = "0.1.4"
@@ -869,9 +801,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
+checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
dependencies = [
"futures-channel",
"futures-core",
@@ -884,9 +816,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
dependencies = [
"futures-core",
"futures-sink",
@@ -894,15 +826,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
[[package]]
name = "futures-executor"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
+checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
dependencies = [
"futures-core",
"futures-task",
@@ -911,9 +843,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
[[package]]
name = "futures-lite"
@@ -926,7 +858,7 @@ dependencies = [
"futures-io",
"memchr",
"parking",
- "pin-project-lite 0.2.0",
+ "pin-project-lite",
"waker-fn",
]
@@ -941,9 +873,9 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
+checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@@ -953,15 +885,15 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
[[package]]
name = "futures-task"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
+checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
dependencies = [
"once_cell",
]
@@ -978,9 +910,9 @@ dependencies = [
[[package]]
name = "futures-util"
-version = "0.3.8"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
dependencies = [
"futures-channel",
"futures-core",
@@ -989,13 +921,22 @@ dependencies = [
"futures-sink",
"futures-task",
"memchr",
- "pin-project 1.0.2",
+ "pin-project-lite",
"pin-utils",
"proc-macro-hack",
"proc-macro-nested",
"slab",
]
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
[[package]]
name = "gdk"
version = "0.13.2"
@@ -1082,25 +1023,26 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"libc",
"wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
]
[[package]]
name = "getrandom"
-version = "0.2.0"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
+ "js-sys",
"libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasm-bindgen",
]
[[package]]
@@ -1120,6 +1062,16 @@ dependencies = [
"cc",
]
+[[package]]
+name = "ghash"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
+dependencies = [
+ "opaque-debug 0.3.0",
+ "polyval",
+]
+
[[package]]
name = "gio"
version = "0.9.1"
@@ -1151,7 +1103,7 @@ dependencies = [
"gobject-sys",
"libc",
"system-deps",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -1403,9 +1355,9 @@ dependencies = [
[[package]]
name = "gstreamer-video"
-version = "0.16.5"
+version = "0.16.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5849033d83664754094e0112a615b4950d29ba31fffaef12afcb2c3a0296fd88"
+checksum = "75fb6c5bcc0d406ca4a47938b8592121ff98e7a8f4303c24def1722df9f203d5"
dependencies = [
"bitflags",
"futures-channel",
@@ -1484,11 +1436,11 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.2.7"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
+checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5"
dependencies = [
- "bytes 0.5.6",
+ "bytes",
"fnv",
"futures-core",
"futures-sink",
@@ -1510,28 +1462,22 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
[[package]]
name = "heck"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
dependencies = [
"libc",
]
-[[package]]
-name = "hex"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
-
[[package]]
name = "hkdf"
version = "0.10.0"
@@ -1584,30 +1530,30 @@ dependencies = [
[[package]]
name = "http"
-version = "0.2.1"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747"
dependencies = [
- "bytes 0.5.6",
+ "bytes",
"fnv",
"itoa",
]
[[package]]
name = "http-body"
-version = "0.3.1"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
+checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994"
dependencies = [
- "bytes 0.5.6",
+ "bytes",
"http",
]
[[package]]
name = "httparse"
-version = "1.3.4"
+version = "1.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"
[[package]]
name = "httpdate"
@@ -1617,11 +1563,11 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
[[package]]
name = "hyper"
-version = "0.13.9"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
+checksum = "12219dc884514cb4a6a03737f4413c0e01c23a1b059b0156004b23f1e19dccbe"
dependencies = [
- "bytes 0.5.6",
+ "bytes",
"futures-channel",
"futures-core",
"futures-util",
@@ -1631,7 +1577,7 @@ dependencies = [
"httparse",
"httpdate",
"itoa",
- "pin-project 1.0.2",
+ "pin-project 1.0.5",
"socket2",
"tokio",
"tower-service",
@@ -1641,15 +1587,15 @@ dependencies = [
[[package]]
name = "hyper-tls"
-version = "0.4.3"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
- "bytes 0.5.6",
+ "bytes",
"hyper",
"native-tls",
"tokio",
- "tokio-tls",
+ "tokio-native-tls",
]
[[package]]
@@ -1665,9 +1611,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.6.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
+checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
dependencies = [
"autocfg",
"hashbrown",
@@ -1681,20 +1627,11 @@ checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
- "time 0.2.23",
+ "time 0.2.25",
"wasm-bindgen",
"web-sys",
]
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "ipnet"
version = "2.3.0"
@@ -1721,62 +1658,39 @@ dependencies = [
[[package]]
name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "js-sys"
-version = "0.3.45"
+version = "0.3.47"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
+checksum = "5cfb73131c35423a367daf8cbd24100af0d077668c8c2943f0e7dd775fef0f65"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "js_int"
-version = "0.1.9"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b96797f53235a1d6dc985f244a69de54b04c45b7e0e357a35c85a45a847d92f2"
+checksum = "fcae89e078a96b781b38f36225bb3a174b8f6e905dfec550dd16a13539c82acc"
dependencies = [
"serde",
]
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-[[package]]
-name = "lexical-core"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
-dependencies = [
- "arrayvec",
- "bitflags",
- "cfg-if 0.1.10",
- "ryu",
- "static_assertions",
-]
-
[[package]]
name = "libc"
-version = "0.2.80"
+version = "0.2.85"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "7ccac4b00700875e6a07c6cde370d44d32fa01c5a65cdd2fca6858c479d28bb3"
[[package]]
name = "libhandy"
@@ -1822,17 +1736,6 @@ dependencies = [
"system-deps",
]
-[[package]]
-name = "libsqlite3-sys"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "56d90181c2904c287e5390186be820e5ef311a3c62edebb7d6ca3d6a48ce041d"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
[[package]]
name = "linkify"
version = "0.4.0"
@@ -1872,16 +1775,25 @@ checksum = "73ac19ebe45489e5d53b4346d8b90bb3dd03275c5fdf2ce22a982516d86b535c"
dependencies = [
"lazy_static",
"regex",
- "winapi 0.3.9",
+ "winapi",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+dependencies = [
+ "scopeguard",
]
[[package]]
name = "log"
-version = "0.4.11"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
]
[[package]]
@@ -1944,16 +1856,15 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
[[package]]
name = "matrix-sdk"
-version = "0.1.0"
-source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=0422bae92485b033d4f9b56f2331909653655609#0422bae92485b033d4f9b56f2331909653655609";
+version = "0.2.0"
+source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=bdaed6237e104b738b5ad25c063675373d9fa60d#bdaed6237e104b738b5ad25c063675373d9fa60d";
dependencies = [
- "async-trait",
"dashmap",
+ "futures",
"futures-timer",
"http",
"matrix-sdk-base",
"matrix-sdk-common",
- "matrix-sdk-common-macros",
"mime",
"reqwest",
"serde_json",
@@ -1967,15 +1878,21 @@ dependencies = [
[[package]]
name = "matrix-sdk-base"
-version = "0.1.0"
-source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=0422bae92485b033d4f9b56f2331909653655609#0422bae92485b033d4f9b56f2331909653655609";
+version = "0.2.0"
+source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=bdaed6237e104b738b5ad25c063675373d9fa60d#bdaed6237e104b738b5ad25c063675373d9fa60d";
dependencies = [
- "async-trait",
+ "chacha20poly1305",
+ "dashmap",
+ "futures",
+ "hmac",
"matrix-sdk-common",
- "matrix-sdk-common-macros",
"matrix-sdk-crypto",
+ "pbkdf2",
+ "rand 0.8.3",
"serde",
"serde_json",
+ "sha2",
+ "sled",
"thiserror",
"tokio",
"tracing",
@@ -1984,60 +1901,43 @@ dependencies = [
[[package]]
name = "matrix-sdk-common"
-version = "0.1.0"
-source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=0422bae92485b033d4f9b56f2331909653655609#0422bae92485b033d4f9b56f2331909653655609";
+version = "0.2.0"
+source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=bdaed6237e104b738b5ad25c063675373d9fa60d#bdaed6237e104b738b5ad25c063675373d9fa60d";
dependencies = [
- "assign",
+ "async-trait",
"futures-locks",
"instant",
- "js_int",
"ruma",
+ "serde",
"tokio",
"uuid",
]
-[[package]]
-name = "matrix-sdk-common-macros"
-version = "0.1.0"
-source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=0422bae92485b033d4f9b56f2331909653655609#0422bae92485b033d4f9b56f2331909653655609";
-dependencies = [
- "quote",
- "syn",
-]
-
[[package]]
name = "matrix-sdk-crypto"
-version = "0.1.0"
-source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=0422bae92485b033d4f9b56f2331909653655609#0422bae92485b033d4f9b56f2331909653655609";
+version = "0.2.0"
+source =
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=bdaed6237e104b738b5ad25c063675373d9fa60d#bdaed6237e104b738b5ad25c063675373d9fa60d";
dependencies = [
"aes-ctr",
- "async-trait",
+ "aes-gcm",
"atomic",
"base64",
"byteorder",
"dashmap",
- "getrandom 0.2.0",
+ "getrandom 0.2.2",
"hmac",
"matrix-sdk-common",
- "matrix-sdk-common-macros",
"olm-rs",
"pbkdf2",
"serde",
"serde_json",
"sha2",
- "sqlx",
+ "sled",
"thiserror",
"tracing",
- "url",
"zeroize",
]
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
[[package]]
name = "md5"
version = "0.7.0"
@@ -2063,50 +1963,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
-name = "mime"
-version = "0.3.16"
+name = "memoffset"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+dependencies = [
+ "autocfg",
+]
[[package]]
-name = "mime_guess"
-version = "2.0.3"
+name = "mime"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
-dependencies = [
- "mime",
- "unicase",
-]
+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
[[package]]
name = "mio"
-version = "0.6.22"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7"
dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
"libc",
"log",
"miow",
- "net2",
- "slab",
- "winapi 0.2.8",
+ "ntapi",
+ "winapi",
]
[[package]]
name = "miow"
-version = "0.2.1"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "socket2",
+ "winapi",
]
[[package]]
@@ -2117,9 +2008,9 @@ checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204"
[[package]]
name = "native-tls"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
+checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
dependencies = [
"lazy_static",
"libc",
@@ -2140,18 +2031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998"
dependencies = [
"libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.35"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -2174,15 +2054,12 @@ dependencies = [
]
[[package]]
-name = "nom"
-version = "6.0.1"
+name = "ntapi"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
dependencies = [
- "bitvec",
- "lexical-core",
- "memchr",
- "version_check",
+ "winapi",
]
[[package]]
@@ -2273,11 +2150,11 @@ dependencies = [
[[package]]
name = "olm-rs"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "daab4abdd728e5e77ec15888fc12688c0b821c81fca621f1bb28dbe489cbc404"
+checksum = "8962a1fc909accf520991dcda872888554ecf16320097e02d3bd9981844a24ae"
dependencies = [
- "getrandom 0.2.0",
+ "getrandom 0.2.2",
"olm-sys",
"serde",
"serde_json",
@@ -2286,9 +2163,9 @@ dependencies = [
[[package]]
name = "olm-sys"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "87fa74f77d7ce49231025de2a26df4e71228a9ea5bd5b0a3edc8d6bb05e3d420"
+checksum = "0823939cee8b6f39ed0e39d8abf98919099f999ebef3eae2c67d9cd2e93ea008"
dependencies = [
"cmake",
]
@@ -2313,12 +2190,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
-version = "0.10.30"
+version = "0.10.32"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
dependencies = [
"bitflags",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"foreign-types",
"lazy_static",
"libc",
@@ -2333,9 +2210,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-sys"
-version = "0.9.58"
+version = "0.9.60"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
+checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
dependencies = [
"autocfg",
"cc",
@@ -2377,11 +2254,36 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+[[package]]
+name = "parking_lot"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
+dependencies = [
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
+ "redox_syscall 0.1.57",
+ "smallvec",
+ "winapi",
+]
+
[[package]]
name = "paste"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9"
+checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
[[package]]
name = "pbkdf2"
@@ -2490,11 +2392,11 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.2"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
+checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63"
dependencies = [
- "pin-project-internal 1.0.2",
+ "pin-project-internal 1.0.5",
]
[[package]]
@@ -2510,9 +2412,9 @@ dependencies = [
[[package]]
name = "pin-project-internal"
-version = "1.0.2"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b"
dependencies = [
"proc-macro2",
"quote",
@@ -2521,15 +2423,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.0"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
[[package]]
name = "pin-utils"
@@ -2553,7 +2449,28 @@ dependencies = [
"libc",
"log",
"wepoll-sys",
- "winapi 0.3.9",
+ "winapi",
+]
+
+[[package]]
+name = "poly1305"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8"
+dependencies = [
+ "cpuid-bool 0.2.0",
+ "universal-hash",
+]
+
+[[package]]
+name = "polyval"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
+dependencies = [
+ "cpuid-bool 0.2.0",
+ "opaque-debug 0.3.0",
+ "universal-hash",
]
[[package]]
@@ -2615,9 +2532,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
[[package]]
name = "proc-macro-nested"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
[[package]]
name = "proc-macro2"
@@ -2630,26 +2547,20 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
dependencies = [
"proc-macro2",
]
-[[package]]
-name = "radium"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
-
[[package]]
name = "rand"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
dependencies = [
- "getrandom 0.1.15",
+ "getrandom 0.1.16",
"libc",
"rand_chacha 0.2.2",
"rand_core 0.5.1",
@@ -2659,9 +2570,9 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.8.1"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
dependencies = [
"libc",
"rand_chacha 0.3.0",
@@ -2695,7 +2606,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [
- "getrandom 0.1.15",
+ "getrandom 0.1.16",
]
[[package]]
@@ -2704,7 +2615,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
dependencies = [
- "getrandom 0.2.0",
+ "getrandom 0.2.2",
]
[[package]]
@@ -2740,22 +2651,31 @@ version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+[[package]]
+name = "redox_syscall"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "redox_users"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
dependencies = [
- "getrandom 0.1.15",
- "redox_syscall",
+ "getrandom 0.1.16",
+ "redox_syscall 0.1.57",
"rust-argon2",
]
[[package]]
name = "regex"
-version = "1.4.2"
+version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
dependencies = [
"aho-corasick",
"memchr",
@@ -2765,9 +2685,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.22"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
[[package]]
name = "remove_dir_all"
@@ -2775,17 +2695,17 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
name = "reqwest"
-version = "0.10.9"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce"
+checksum = "fd281b1030aa675fb90aa994d07187645bb3c8fc756ca766e7c3070b439de9de"
dependencies = [
"base64",
- "bytes 0.5.6",
+ "bytes",
"encoding_rs",
"futures-core",
"futures-util",
@@ -2798,27 +2718,25 @@ dependencies = [
"lazy_static",
"log",
"mime",
- "mime_guess",
"native-tls",
"percent-encoding",
- "pin-project-lite 0.2.0",
+ "pin-project-lite",
"serde",
"serde_urlencoded",
"tokio",
+ "tokio-native-tls",
"tokio-socks",
- "tokio-tls",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
- "wasm-bindgen-test",
"web-sys",
"winreg",
]
[[package]]
name = "ruma"
-version = "0.0.1"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.0.2"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"assign",
"js_int",
@@ -2833,13 +2751,12 @@ dependencies = [
[[package]]
name = "ruma-api"
-version = "0.17.0-alpha.1"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.17.0-alpha.2"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"http",
"percent-encoding",
"ruma-api-macros",
- "ruma-common",
"ruma-identifiers",
"ruma-serde",
"serde",
@@ -2849,8 +2766,8 @@ dependencies = [
[[package]]
name = "ruma-api-macros"
-version = "0.17.0-alpha.1"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.17.0-alpha.2"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2860,8 +2777,8 @@ dependencies = [
[[package]]
name = "ruma-client-api"
-version = "0.10.0-alpha.1"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.10.0-alpha.2"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"assign",
"http",
@@ -2879,32 +2796,21 @@ dependencies = [
[[package]]
name = "ruma-common"
-version = "0.2.0"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.3.0-alpha.1"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"js_int",
- "ruma-common-macros",
+ "maplit",
"ruma-identifiers",
"ruma-serde",
"serde",
"serde_json",
]
-[[package]]
-name = "ruma-common-macros"
-version = "0.2.0"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "ruma-events"
-version = "0.22.0-alpha.1"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.22.0-alpha.2"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"js_int",
"ruma-common",
@@ -2917,8 +2823,8 @@ dependencies = [
[[package]]
name = "ruma-events-macros"
-version = "0.22.0-alpha.1"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.22.0-alpha.2"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2928,8 +2834,8 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
-version = "0.0.3"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.1.0-alpha.1"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"js_int",
"ruma-api",
@@ -2943,20 +2849,21 @@ dependencies = [
[[package]]
name = "ruma-identifiers"
-version = "0.17.4"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.18.0-alpha.1"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
- "ruma-common-macros",
+ "paste",
"ruma-identifiers-macros",
"ruma-identifiers-validation",
"ruma-serde",
+ "ruma-serde-macros",
"serde",
]
[[package]]
name = "ruma-identifiers-macros"
-version = "0.17.4"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.18.0-alpha.1"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"proc-macro2",
"quote",
@@ -2966,25 +2873,33 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
-version = "0.1.1"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
-dependencies = [
- "serde",
- "strum 0.19.5",
-]
+version = "0.2.0"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
[[package]]
name = "ruma-serde"
-version = "0.2.3"
-source =
"git+https://github.com/ruma/ruma?rev=48d1c9747561686e1c5627405780f6de01ee17b1#48d1c9747561686e1c5627405780f6de01ee17b1";
+version = "0.3.0"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
dependencies = [
"form_urlencoded",
"itoa",
"js_int",
+ "ruma-serde-macros",
"serde",
"serde_json",
]
+[[package]]
+name = "ruma-serde-macros"
+version = "0.3.0"
+source =
"git+https://github.com/ruma/ruma?rev=8c109d3c0a7ec66b352dc82677d30db7cb0723eb#8c109d3c0a7ec66b352dc82677d30db7cb0723eb";
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "rust-argon2"
version = "0.8.3"
@@ -2994,7 +2909,7 @@ dependencies = [
"base64",
"blake2b_simd",
"constant_time_eq",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils",
]
[[package]]
@@ -3019,7 +2934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
dependencies = [
"lazy_static",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -3028,6 +2943,12 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
[[package]]
name = "secret-service"
version = "2.0.1"
@@ -3039,7 +2960,7 @@ dependencies = [
"hkdf",
"lazy_static",
"num",
- "rand 0.8.1",
+ "rand 0.8.3",
"serde",
"sha2",
"zbus",
@@ -3094,18 +3015,18 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
[[package]]
name = "serde"
-version = "1.0.119"
+version = "1.0.123"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9bdd36f49e35b61d49efd8aa7fc068fd295961fd2286d0b2ee9a4c7a14e99cc3"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.119"
+version = "1.0.123"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
dependencies = [
"proc-macro2",
"quote",
@@ -3114,9 +3035,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.59"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
dependencies = [
"itoa",
"ryu",
@@ -3166,13 +3087,13 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "sha2"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
+checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
dependencies = [
"block-buffer 0.9.0",
"cfg-if 1.0.0",
- "cpuid-bool",
+ "cpuid-bool 0.1.2",
"digest 0.9.0",
"opaque-debug 0.3.0",
]
@@ -3189,16 +3110,37 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+[[package]]
+name = "sled"
+version = "0.34.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "1d0132f3e393bcb7390c60bb45769498cf4550bcb7a21d7f95c02b69f6362cdc"
+dependencies = [
+ "crc32fast",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "fs2",
+ "fxhash",
+ "libc",
+ "log",
+ "parking_lot",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+
[[package]]
name = "socket2"
-version = "0.3.17"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "redox_syscall",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -3242,88 +3184,15 @@ dependencies = [
"system-deps",
]
-[[package]]
-name = "sqlformat"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "74c70f0235b9925cbb106c52af1a28b5ea4885a8b851e328b8562e257a389c2d"
-dependencies = [
- "lazy_static",
- "maplit",
- "nom",
- "regex",
- "unicode_categories",
-]
-
-[[package]]
-name = "sqlx"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8974cacd80085fbe49e778708d660dec6fb351604dc34c3905b26efb2803b038"
-dependencies = [
- "sqlx-core",
- "sqlx-macros",
-]
-
-[[package]]
-name = "sqlx-core"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "88ac5a436f941c42eac509471a730df5c3c58e1450e68cd39afedbd948206273"
-dependencies = [
- "async-native-tls",
- "async-stream",
- "bitflags",
- "byteorder",
- "crossbeam-queue",
- "crossbeam-utils 0.7.2",
- "futures-channel",
- "futures-core",
- "futures-util",
- "hex",
- "libc",
- "libsqlite3-sys",
- "log",
- "memchr",
- "percent-encoding",
- "sqlformat",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "sqlx-macros"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "de2ae78b783af5922d811b14665a5a3755e531c3087bb805cf24cf71f15e6780"
-dependencies = [
- "dotenv",
- "futures",
- "heck",
- "lazy_static",
- "proc-macro2",
- "quote",
- "sqlx-core",
- "syn",
- "tokio",
- "url",
-]
-
[[package]]
name = "standback"
-version = "0.2.13"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8"
+checksum = "c66a8cff4fa24853fdf6b51f75c6d7f8206d7c75cab4e467bcd7f25c2b1febe0"
dependencies = [
"version_check",
]
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
[[package]]
name = "stdweb"
version = "0.4.20"
@@ -3410,15 +3279,6 @@ version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
-[[package]]
-name = "strum"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b89a286a7e3b5720b9a477b23253bc50debac207c8d21505f8e70b36792f11b5"
-dependencies = [
- "strum_macros 0.19.4",
-]
-
[[package]]
name = "strum_macros"
version = "0.18.0"
@@ -3431,29 +3291,17 @@ dependencies = [
"syn",
]
-[[package]]
-name = "strum_macros"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e61bb0be289045cb80bfce000512e32d09f8337e54c186725da381377ad1f8d5"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "subtle"
-version = "2.3.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
+checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]]
name = "syn"
-version = "1.0.58"
+version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
dependencies = [
"proc-macro2",
"quote",
@@ -3480,38 +3328,32 @@ checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b"
dependencies = [
"heck",
"pkg-config",
- "strum 0.18.0",
- "strum_macros 0.18.0",
+ "strum",
+ "strum_macros",
"thiserror",
"toml",
"version-compare",
]
-[[package]]
-name = "tap"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
-
[[package]]
name = "tempfile"
-version = "3.1.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"libc",
- "rand 0.7.3",
- "redox_syscall",
+ "rand 0.8.3",
+ "redox_syscall 0.2.4",
"remove_dir_all",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
name = "tendril"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b"
+checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33"
dependencies = [
"futf",
"mac",
@@ -3529,18 +3371,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
dependencies = [
"proc-macro2",
"quote",
@@ -3549,29 +3391,28 @@ dependencies = [
[[package]]
name = "thread_local"
-version = "1.0.1"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
dependencies = [
- "lazy_static",
+ "once_cell",
]
[[package]]
name = "time"
-version = "0.1.44"
+version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
dependencies = [
"libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
name = "time"
-version = "0.2.23"
+version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b"
+checksum = "1195b046942c221454c2539395f85413b33383a067449d78aab2b7b052a142f7"
dependencies = [
"const_fn",
"libc",
@@ -3579,7 +3420,7 @@ dependencies = [
"stdweb",
"time-macros",
"version_check",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -3605,20 +3446,11 @@ dependencies = [
"syn",
]
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
[[package]]
name = "tinyvec"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
+checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
dependencies = [
"tinyvec_macros",
]
@@ -3631,73 +3463,69 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "0.2.23"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"
+checksum = "6714d663090b6b0acb0fa85841c6d66233d150cdb2602c8f9b8abb03370beb3f"
dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
+ "autocfg",
+ "bytes",
+ "libc",
"memchr",
"mio",
"num_cpus",
- "pin-project-lite 0.1.11",
- "slab",
+ "pin-project-lite",
]
[[package]]
-name = "tokio-socks"
+name = "tokio-native-tls"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
dependencies = [
- "bytes 0.4.12",
- "either",
- "futures",
- "thiserror",
+ "native-tls",
"tokio",
]
[[package]]
-name = "tokio-tls"
-version = "0.3.1"
+name = "tokio-socks"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
+checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
dependencies = [
- "native-tls",
+ "either",
+ "futures-util",
+ "thiserror",
"tokio",
]
[[package]]
name = "tokio-util"
-version = "0.3.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
+checksum = "ebb7cb2f00c5ae8df755b252306272cd1790d39728363936e01827e11f0b017b"
dependencies = [
- "bytes 0.5.6",
+ "bytes",
"futures-core",
"futures-sink",
"log",
- "pin-project-lite 0.1.11",
+ "pin-project-lite",
"tokio",
]
[[package]]
name = "toml"
-version = "0.5.7"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
dependencies = [
"serde",
]
[[package]]
name = "tower-service"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
@@ -3706,17 +3534,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
dependencies = [
"cfg-if 1.0.0",
- "log",
- "pin-project-lite 0.2.0",
+ "pin-project-lite",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
-version = "0.1.11"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
+checksum = "43f080ea7e4107844ef4766459426fa2d5c1ada2e47edba05dc7fa99d9629f47"
dependencies = [
"proc-macro2",
"quote",
@@ -3782,15 +3609,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
[[package]]
name = "unicode-bidi"
version = "0.3.4"
@@ -3833,6 +3651,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+[[package]]
+name = "universal-hash"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
+dependencies = [
+ "generic-array 0.14.4",
+ "subtle",
+]
+
[[package]]
name = "url"
version = "2.2.0"
@@ -3854,19 +3682,19 @@ checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
[[package]]
name = "uuid"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
- "rand 0.7.3",
+ "getrandom 0.2.2",
"serde",
]
[[package]]
name = "vcpkg"
-version = "0.2.10"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
[[package]]
name = "vec-arena"
@@ -3922,17 +3750,17 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]
name = "wasm-bindgen"
-version = "0.2.68"
+version = "0.2.70"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
+checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"serde",
"serde_json",
"wasm-bindgen-macro",
@@ -3940,9 +3768,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.68"
+version = "0.2.70"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
+checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7"
dependencies = [
"bumpalo",
"lazy_static",
@@ -3955,11 +3783,11 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.18"
+version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da"
+checksum = "3de431a2910c86679c34283a33f66f4e4abd7e0aec27b6669060148872aadf94"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"js-sys",
"wasm-bindgen",
"web-sys",
@@ -3967,9 +3795,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.68"
+version = "0.2.70"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
+checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -3977,9 +3805,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.68"
+version = "0.2.70"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
+checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
dependencies = [
"proc-macro2",
"quote",
@@ -3990,39 +3818,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.68"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
-
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64"
-dependencies = [
- "console_error_panic_hook",
- "js-sys",
- "scoped-tls",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.3.18"
+version = "0.2.70"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585"
-dependencies = [
- "proc-macro2",
- "quote",
-]
+checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
[[package]]
name = "web-sys"
-version = "0.3.45"
+version = "0.3.47"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d"
+checksum = "c40dc691fc48003eba817c38da7113c15698142da971298003cac3ef175680b3"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4037,12 +3841,6 @@ dependencies = [
"cc",
]
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
[[package]]
name = "winapi"
version = "0.3.9"
@@ -4053,12 +3851,6 @@ dependencies = [
"winapi-x86_64-pc-windows-gnu",
]
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
@@ -4077,25 +3869,9 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
dependencies = [
- "winapi 0.3.9",
+ "winapi",
]
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "wyz"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
-
[[package]]
name = "xml5ever"
version = "0.16.1"
@@ -4105,7 +3881,7 @@ dependencies = [
"log",
"mac",
"markup5ever",
- "time 0.1.44",
+ "time 0.1.43",
]
[[package]]
@@ -4145,9 +3921,9 @@ dependencies = [
[[package]]
name = "zeroize"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a"
+checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36"
dependencies = [
"zeroize_derive",
]
@@ -4166,9 +3942,9 @@ dependencies = [
[[package]]
name = "zvariant"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4bfdc513511335faee7b18d6e8b6086de555d6e8b0a598415571bb0f0b446519"
+checksum = "2fc67d552ac18ccd9e440f062f5b32c46776f96073122a8da2fe0c533833a213"
dependencies = [
"byteorder",
"enumflags2",
@@ -4178,9 +3954,9 @@ dependencies = [
[[package]]
name = "zvariant_derive"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6651d08772eefc17d36ef4da3a521b2e5f87c10ef730125b83eb500512073c92"
+checksum = "eaee686340b5bff077d52423d8cc4f0f7cb323fe3f31ef676b8a3a2810bc53c5"
dependencies = [
"proc-macro-crate",
"proc-macro2",
diff --git a/fractal-gtk/Cargo.toml b/fractal-gtk/Cargo.toml
index fd0d7f6d..1db0a16b 100644
--- a/fractal-gtk/Cargo.toml
+++ b/fractal-gtk/Cargo.toml
@@ -70,8 +70,8 @@ version = "0.9.0"
features = ["v2_56"]
[dependencies.tokio]
-version = "0.2.22"
-features = ["rt-threaded", "time"]
+version = "1.1.1"
+features = ["rt-multi-thread", "time", "fs"]
[dependencies.url]
version = "2.1.1"
@@ -79,5 +79,5 @@ features = ["serde"]
[dependencies.matrix-sdk]
git = "https://github.com/matrix-org/matrix-rust-sdk.git";
-rev = "0422bae92485b033d4f9b56f2331909653655609"
+rev = "bdaed6237e104b738b5ad25c063675373d9fa60d"
features = ["unstable-synapse-quirks", "socks"]
diff --git a/fractal-gtk/src/appop/login.rs b/fractal-gtk/src/appop/login.rs
index 8750bffa..0e831963 100644
--- a/fractal-gtk/src/appop/login.rs
+++ b/fractal-gtk/src/appop/login.rs
@@ -48,13 +48,11 @@ impl AppOp {
identity_url,
});
- let _ = RUNTIME
- .handle()
- .block_on(matrix_client.restore_login(Session {
- access_token: access_token.to_string(),
- user_id: uid,
- device_id,
- }));
+ let _ = RUNTIME.block_on(matrix_client.restore_login(Session {
+ access_token: access_token.to_string(),
+ user_id: uid,
+ device_id,
+ }));
self.set_state(AppState::NoRoom);
self.since = None;
diff --git a/fractal-gtk/src/appop/sync.rs b/fractal-gtk/src/appop/sync.rs
index 82ef00d5..17f282aa 100644
--- a/fractal-gtk/src/appop/sync.rs
+++ b/fractal-gtk/src/appop/sync.rs
@@ -9,9 +9,7 @@ use crate::model::{
room::{Room, RoomMembership, RoomTag},
};
use crate::util::i18n::i18n;
-use log::warn;
-use matrix_sdk::api::r0::sync::sync_events::JoinedRoom;
-use matrix_sdk::api::r0::sync::sync_events::Response as SyncResponse;
+use matrix_sdk::deserialized_responses::{JoinedRoom, SyncResponse};
use matrix_sdk::events::AnyEphemeralRoomEventContent;
use matrix_sdk::events::AnySyncMessageEvent;
use matrix_sdk::events::AnySyncRoomEvent;
@@ -61,14 +59,8 @@ impl AppOp {
for (room_id, unread_notifications) in updates.room_notifications {
let r = room_id;
- let n: u64 = unread_notifications
- .notification_count
- .map(Into::into)
- .unwrap_or_default();
- let h: u64 = unread_notifications
- .highlight_count
- .map(Into::into)
- .unwrap_or_default();
+ let n: u64 = unread_notifications.notification_count;
+ let h: u64 = unread_notifications.highlight_count;
APPOP!(set_room_notifications, (r, n, h));
}
@@ -160,11 +152,6 @@ fn get_sync_updates(join: &BTreeMap<RoomId, JoinedRoom>, user_id: &UserId) -> Sy
.map(|(k, room)| {
let typing: Vec<Member> = room.ephemeral.events
.iter()
- .map(|ev| ev.deserialize())
- .inspect(|result_ev| if let Err(err) = result_ev {
- warn!("Bad event: {}", err);
- })
- .filter_map(Result::ok)
.filter_map(|event| match event.content() {
AnyEphemeralRoomEventContent::Typing(content) => {
Some(content.user_ids)
@@ -194,30 +181,24 @@ fn get_sync_updates(join: &BTreeMap<RoomId, JoinedRoom>, user_id: &UserId) -> Sy
room.timeline
.events
.iter()
- .map(move |ev| Ok((room_id.clone(), ev.deserialize()?)))
- })
- .inspect(|result_ev: &Result<_, serde_json::Error>| {
- if let Err(err) = result_ev {
- warn!("Bad event: {}", err);
- }
+ .map(move |ev| (room_id.clone(), ev))
})
- .filter_map(Result::ok)
.filter_map(|(room_id, event)| match event {
AnySyncRoomEvent::State(AnySyncStateEvent::RoomName(ev)) => {
let name = ev.content.name().map(Into::into).unwrap_or_default();
Some(RoomElement::Name(room_id, name))
}
AnySyncRoomEvent::State(AnySyncStateEvent::RoomTopic(ev)) => {
- Some(RoomElement::Topic(room_id, ev.content.topic))
+ Some(RoomElement::Topic(room_id, ev.content.topic.clone()))
}
AnySyncRoomEvent::State(AnySyncStateEvent::RoomAvatar(_)) => {
Some(RoomElement::NewAvatar(room_id))
}
- AnySyncRoomEvent::State(AnySyncStateEvent::RoomMember(ev)) => {
- Some(RoomElement::MemberEvent(ev.into_full_event(room_id)))
- }
+ AnySyncRoomEvent::State(AnySyncStateEvent::RoomMember(ev)) => Some(
+ RoomElement::MemberEvent(ev.clone().into_full_event(room_id)),
+ ),
AnySyncRoomEvent::Message(AnySyncMessageEvent::RoomRedaction(ev)) => {
- Some(RoomElement::RemoveMessage(room_id, ev.redacts))
+ Some(RoomElement::RemoveMessage(room_id, ev.redacts.clone()))
}
_ => None,
})
diff --git a/fractal-gtk/src/backend/room.rs b/fractal-gtk/src/backend/room.rs
index 784581b9..2f65f09c 100644
--- a/fractal-gtk/src/backend/room.rs
+++ b/fractal-gtk/src/backend/room.rs
@@ -972,7 +972,7 @@ pub async fn set_pushrules(
],
};
- let request = SetRoomRulesRequest::new("global", RuleKind::Room, room_id.as_str(), actions);
+ let request = SetRoomRulesRequest::new("global", RuleKind::Room, room_id.as_str(), &actions);
session_client.send(request).await?;
diff --git a/fractal-gtk/src/backend/sync.rs b/fractal-gtk/src/backend/sync.rs
index 5dc2f60b..93bbd930 100644
--- a/fractal-gtk/src/backend/sync.rs
+++ b/fractal-gtk/src/backend/sync.rs
@@ -7,9 +7,9 @@ use matrix_sdk::api::r0::filter::LazyLoadOptions;
use matrix_sdk::api::r0::filter::RoomEventFilter;
use matrix_sdk::api::r0::filter::RoomFilter;
use matrix_sdk::api::r0::sync::sync_events::Filter;
-use matrix_sdk::api::r0::sync::sync_events::Response;
-use matrix_sdk::api::r0::sync::sync_events::UnreadNotificationsCount;
use matrix_sdk::assign;
+use matrix_sdk::deserialized_responses::SyncResponse;
+use matrix_sdk::deserialized_responses::UnreadNotificationsCount;
use matrix_sdk::events::room::member::MemberEventContent;
use matrix_sdk::events::StateEvent;
use matrix_sdk::identifiers::{EventId, RoomId};
@@ -63,7 +63,7 @@ pub async fn sync(
session_client: MatrixClient,
since: Option<String>,
number_tries: u32,
-) -> Result<Response, SyncError> {
+) -> Result<SyncResponse, SyncError> {
let initial = since.is_none();
let timeline_not_types = [String::from("m.call.*")];
let timeline_types = [String::from("m.room.message"), String::from("m.sticker")];
@@ -118,7 +118,7 @@ pub async fn sync(
"Sync Error, waiting {} seconds to respond for the next sync",
waiting_time.as_secs()
);
- tokio::time::delay_for(waiting_time).await;
+ tokio::time::sleep(waiting_time).await;
Err(SyncError(err, number_tries))
}
diff --git a/fractal-gtk/src/model/message.rs b/fractal-gtk/src/model/message.rs
index 4b689097..8ac6dfcd 100644
--- a/fractal-gtk/src/model/message.rs
+++ b/fractal-gtk/src/model/message.rs
@@ -145,17 +145,23 @@ impl From<MessageEvent<MessageEventContent>> for Message {
Relation::Reply { in_reply_to } => (Some(in_reply_to.event_id), None),
_ => (None, None),
});
- let (body, formatted, in_reply_to) = content.new_content.map_or(
- (content.body, content.formatted, in_reply_to),
- |nc| {
- let in_reply_to = nc.relates_to.and_then(|r| match r {
- Relation::Reply { in_reply_to } => Some(in_reply_to.event_id),
- _ => None,
- });
+ let (body, formatted, in_reply_to) = content
+ .new_content
+ .and_then(|nc| {
+ // FIXME: this could go wrong if a text message wasn't replaced with a text
+ // message.
+ if let MessageEventContent::Text(nc) = *nc {
+ let in_reply_to = nc.relates_to.and_then(|r| match r {
+ Relation::Reply { in_reply_to } => Some(in_reply_to.event_id),
+ _ => None,
+ });
- (nc.body, nc.formatted, in_reply_to)
- },
- );
+ Some((nc.body, nc.formatted, in_reply_to))
+ } else {
+ None
+ }
+ })
+ .unwrap_or((content.body, content.formatted, in_reply_to));
let (formatted_body, format) = formatted.map_or(Default::default(), |f| {
(Some(f.body), Some(f.format.as_str().into()))
});
@@ -195,17 +201,23 @@ impl From<MessageEvent<MessageEventContent>> for Message {
Relation::Reply { in_reply_to } => (Some(in_reply_to.event_id), None),
_ => (None, None),
});
- let (body, formatted, in_reply_to) = content.new_content.map_or(
- (content.body, content.formatted, in_reply_to),
- |nc| {
- let in_reply_to = nc.relates_to.and_then(|r| match r {
- Relation::Reply { in_reply_to } => Some(in_reply_to.event_id),
- _ => None,
- });
+ let (body, formatted, in_reply_to) = content
+ .new_content
+ .and_then(|nc| {
+ // FIXME: this could go wrong if a notice message wasn't replaced with a
+ // notice message.
+ if let MessageEventContent::Notice(nc) = *nc {
+ let in_reply_to = nc.relates_to.and_then(|r| match r {
+ Relation::Reply { in_reply_to } => Some(in_reply_to.event_id),
+ _ => None,
+ });
- (nc.body, nc.formatted, in_reply_to)
- },
- );
+ Some((nc.body, nc.formatted, in_reply_to))
+ } else {
+ None
+ }
+ })
+ .unwrap_or((content.body, content.formatted, in_reply_to));
let (formatted_body, format) = formatted.map_or(Default::default(), |f| {
(Some(f.body), Some(f.format.as_str().into()))
});
diff --git a/fractal-gtk/src/model/room.rs b/fractal-gtk/src/model/room.rs
index 4274dcbf..b852b5bd 100644
--- a/fractal-gtk/src/model/room.rs
+++ b/fractal-gtk/src/model/room.rs
@@ -5,17 +5,17 @@ use anyhow::anyhow;
use chrono::DateTime;
use chrono::Utc;
use either::Either;
-use log::{debug, info, warn};
-use matrix_sdk::api::r0::sync::sync_events::Response as SyncResponse;
+use log::{debug, info};
+use matrix_sdk::deserialized_responses::SyncResponse;
use matrix_sdk::directory::PublicRoomsChunk;
use matrix_sdk::events::{
room::member::{MemberEventContent, MembershipState},
- AnyBasicEvent, AnyStrippedStateEvent, AnySyncEphemeralRoomEvent, AnySyncStateEvent,
- SyncStateEvent,
+ AnyBasicEvent, AnyBasicEventContent, AnyMessageEventContent, AnyStrippedStateEvent,
+ AnySyncEphemeralRoomEvent, AnySyncRoomEvent, AnySyncStateEvent, SyncStateEvent,
};
use matrix_sdk::identifiers::{EventId, RoomAliasId, RoomId, UserId};
-use matrix_sdk::Raw;
use serde::{Deserialize, Serialize};
+use serde_json::value::Value;
use std::collections::{BTreeMap, HashMap, HashSet};
use std::convert::{TryFrom, TryInto};
use url::{ParseError as UrlError, Url};
@@ -163,53 +163,23 @@ impl Room {
pub fn from_sync_response(response: &SyncResponse, user_id: UserId) -> Vec<Self> {
// getting the list of direct rooms
- let direct: HashSet<RoomId> = response.account_data.events
+ let direct: HashSet<RoomId> = response
+ .account_data
+ .events
.iter()
- .cloned()
- // Synapse sometimes sends an object with the key "[object Object]"
- // instead of a user ID. Since we don't need the key, we use our own
- // event type so it accepts that.
- // There's always at most one object of this type.
- .find_map(|ev| {
- Raw::<CustomDirectEvent>::from_json(ev.into_json())
- .deserialize()
- .ok()
+ .filter_map(|event| {
+ if let AnyBasicEventContent::Direct(content) = event.content() {
+ Some(content.values().flatten().cloned().collect::<Vec<RoomId>>())
+ } else {
+ None
+ }
})
- .map_or(Default::default(), |direct_event| {
- direct_event.content.values().flatten().cloned().collect()
- });
-
- /*
- response.rooms.join.iter().for_each(|(_, room)| {
- room.state.events.iter().for_each(|ev| log::info!("stevents: {}", ev.json().get()));
- });
- */
+ .flatten()
+ .collect();
let joined_rooms = response.rooms.join.iter().map(|(k, room)| {
- let stevents: Vec<_> = room
- .state
- .events
- .iter()
- .map(|ev| ev.deserialize())
- .inspect(|result_ev| {
- if let Err(err) = result_ev {
- warn!("Bad event: {}", err);
- }
- })
- .filter_map(Result::ok)
- .collect();
- let dataevs: Vec<_> = room
- .account_data
- .events
- .iter()
- .map(|ev| ev.deserialize())
- .inspect(|result_ev| {
- if let Err(err) = result_ev {
- warn!("Bad event: {}", err);
- }
- })
- .filter_map(Result::ok)
- .collect();
+ let stevents: Vec<_> = room.state.events.iter().collect();
+ let dataevs: Vec<_> = room.account_data.events.iter().collect();
let room_tag = dataevs
.iter()
.find_map(|event| match event {
@@ -274,28 +244,14 @@ impl Room {
_ => None,
}),
direct: direct.contains(&k),
- notifications: room
- .unread_notifications
- .notification_count
- .map(Into::into)
- .unwrap_or_default(),
- highlight: room
- .unread_notifications
- .highlight_count
- .map(Into::into)
- .unwrap_or_default(),
+ notifications: room.unread_notifications.notification_count,
+ highlight: room.unread_notifications.highlight_count,
prev_batch: room.timeline.prev_batch.clone(),
messages: room
.timeline
.events
.iter()
- .map(|ev| Ok((k.clone(), ev.deserialize()?)))
- .inspect(|result_ev: &Result<_, serde_json::Error>| {
- if let Err(err) = result_ev {
- warn!("Bad event: {}", err);
- }
- })
- .filter_map(|k_ev| k_ev.ok()?.try_into().ok())
+ .filter_map(|event| (k.clone(), event.clone()).try_into().ok())
.collect(),
admins: stevents
.iter()
@@ -335,15 +291,8 @@ impl Room {
.ephemeral
.events
.iter()
- .map(|ev| ev.deserialize())
- .inspect(|result_ev| {
- if let Err(err) = result_ev {
- warn!("Bad event: {}", err);
- }
- })
- .filter_map(Result::ok)
.filter_map(|event| match event {
- AnySyncEphemeralRoomEvent::Receipt(ev) => Some(ev.content.0),
+ AnySyncEphemeralRoomEvent::Receipt(ev) => Some(ev.content.0.clone()),
_ => None,
})
.take(1)
@@ -387,22 +336,10 @@ impl Room {
})
.for_each(|(msg, receipt)| msg.set_receipt(receipt));
- if let Some(event_id) = room
- .ephemeral
- .events
- .iter()
- .map(|ev| ev.deserialize())
- .inspect(|result_ev| {
- if let Err(err) = result_ev {
- warn!("Bad event: {}", err);
- }
- })
- .filter_map(Result::ok)
- .find_map(|event| match event {
- AnySyncEphemeralRoomEvent::FullyRead(ev) => Some(ev.content.event_id),
- _ => None,
- })
- {
+ if let Some(event_id) = room.ephemeral.events.iter().find_map(|event| match event {
+ AnySyncEphemeralRoomEvent::FullyRead(ev) => Some(ev.content.event_id.clone()),
+ _ => None,
+ }) {
let event_id = Some(event_id);
r.messages
@@ -416,50 +353,29 @@ impl Room {
r
});
- let left_rooms =
- response.rooms.leave.iter().map(|(k, room)| {
- // TODO: The spec doesn't explain where to get the reason
- // for the kicking from, so matrix-sdk doesn't support
- // that.
- if let Some(last_event) = room.timeline.events.last().and_then(|ev| {
- match serde_json::to_value(ev.json()) {
- Ok(event) => Some(event),
- Err(err) => {
- warn!("Bad event: {}", err);
- None
+ let left_rooms = response.rooms.leave.iter().map(|(k, room)| {
+ // TODO: The spec doesn't explain where to get the reason
+ // for the kicking from, so matrix-sdk doesn't support
+ // that.
+ if let Some(last_event) = room.timeline.events.last() {
+ if let AnySyncRoomEvent::Message(message) = last_event {
+ let kicker = message.sender().clone();
+ if kicker != user_id {
+ if let AnyMessageEventContent::Custom(message) = message.content() {
+ if let Value::String(kick_reason) = &message.json["reason"] {
+ let reason = Reason::Kicked(kick_reason.clone(), kicker);
+ return Self::new(k.clone(), RoomMembership::Left(reason));
+ }
}
}
- }) {
- if let Some(kicker) =
- UserId::try_from(last_event["sender"].as_str().unwrap_or_default())
- .ok()
- .filter(|leave_uid| *leave_uid != user_id)
- {
- let kick_reason = &last_event["content"]["reason"];
- let reason = Reason::Kicked(
- String::from(kick_reason.as_str().unwrap_or_default()),
- kicker,
- );
- return Self::new(k.clone(), RoomMembership::Left(reason));
- }
- };
+ }
+ };
- Self::new(k.clone(), RoomMembership::Left(Reason::None))
- });
+ Self::new(k.clone(), RoomMembership::Left(Reason::None))
+ });
let invited_rooms = response.rooms.invite.iter().filter_map(|(k, room)| {
- let stevents: Vec<_> = room
- .invite_state
- .events
- .iter()
- .map(|ev| ev.deserialize())
- .inspect(|result_ev| {
- if let Err(err) = result_ev {
- warn!("Bad event: {}", err);
- }
- })
- .filter_map(Result::ok)
- .collect();
+ let stevents: Vec<_> = room.invite_state.events.iter().collect();
let inv_sender = stevents
.iter()
.find_map(|event| match event {
diff --git a/fractal-gtk/src/widgets/address.rs b/fractal-gtk/src/widgets/address.rs
index 8c6fc80d..048b1d9a 100644
--- a/fractal-gtk/src/widgets/address.rs
+++ b/fractal-gtk/src/widgets/address.rs
@@ -181,7 +181,7 @@ impl<'a> Address<'a> {
match action {
Some(AddressAction::Delete) => {
if let Some(address) = address.clone() {
- RUNTIME.handle().block_on(delete_address(
+ RUNTIME.block_on(delete_address(
medium,
address,
session_client.homeserver().clone(),
diff --git a/fractal-gtk/src/widgets/login.rs b/fractal-gtk/src/widgets/login.rs
index a4ea0fc4..46b76805 100644
--- a/fractal-gtk/src/widgets/login.rs
+++ b/fractal-gtk/src/widgets/login.rs
@@ -98,7 +98,7 @@ impl LoginWidget {
};
let query = get_well_known(homeserver_url.clone());
- let (homeserver_url, idserver) = RUNTIME.handle().block_on(query)
+ let (homeserver_url, idserver) = RUNTIME.block_on(query)
.and_then(|response| {
let hs_url = Url::parse(&response.homeserver.base_url)?;
let ids = response
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
