commit 879b746e3fd32230c75055bf282e7dd7bbcf43aa
parent f103dd323dc01f14f47b0379c30a6bbf04f4fb13
Author: MTRNord <mtrnord1@gmail.com>
Date: Thu, 20 Aug 2020 21:03:12 +0200
update: Update cargo dependencies and fix issues caused by it
Took 1 minute
Diffstat:
5 files changed, 177 insertions(+), 152 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -2,9 +2,9 @@
# It is not intended for manual editing.
[[package]]
name = "adler32"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]]
name = "anyhow"
@@ -25,14 +25,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
[[package]]
+name = "assign"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4af5687fe33aec5e70ef14caac5e0d363e335e5e5d6385fb75978d0c241b1d67"
+
+[[package]]
name = "async-trait"
-version = "0.1.36"
+version = "0.1.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92"
+checksum = "6e1a4a2f97ce50c9d0282c1468816208588441492b40d813b2e0419c22c05e7f"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
@@ -79,9 +85,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "cc"
-version = "1.0.58"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
+checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
[[package]]
name = "cfg-if"
@@ -359,7 +365,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
@@ -515,9 +521,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
+checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
dependencies = [
"autocfg",
]
@@ -610,9 +616,9 @@ dependencies = [
[[package]]
name = "i18n-embed"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f85e9383646a5f071c6dfe27e5f55acb6d24da25406485b0ebe9067593855dab"
+checksum = "325388e0591fad1d9b4da8f26195b086f9dee7c35f4b80c3fb0abb9b89b82a9d"
dependencies = [
"fluent-langneg",
"gettext",
@@ -636,7 +642,7 @@ dependencies = [
"quote 1.0.7",
"serde",
"serde_derive",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
@@ -686,9 +692,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.5.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
+checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9"
dependencies = [
"autocfg",
"hashbrown",
@@ -729,9 +735,9 @@ checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
[[package]]
name = "js-sys"
-version = "0.3.42"
+version = "0.3.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2"
+checksum = "85a7e2c92a4804dd459b86c339278d0fe87cf93757fae222c3fa3ae75458bc73"
dependencies = [
"wasm-bindgen",
]
@@ -776,9 +782,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.73"
+version = "0.2.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
+checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
[[package]]
name = "libflate"
@@ -819,8 +825,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
[[package]]
name = "matrix-sdk"
version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#d4fe2fe0a2575e788e12aa6aea05bdd383a85d68"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=89c9e311408d2c57245f4ec5af7bbd4daa0046d3#89c9e311408d2c57245f4ec5af7bbd4daa0046d3"
dependencies = [
+ "async-trait",
"futures-timer",
"http",
"matrix-sdk-base",
@@ -837,7 +844,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-base"
version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#d4fe2fe0a2575e788e12aa6aea05bdd383a85d68"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=89c9e311408d2c57245f4ec5af7bbd4daa0046d3#89c9e311408d2c57245f4ec5af7bbd4daa0046d3"
dependencies = [
"async-trait",
"matrix-sdk-common",
@@ -853,8 +860,9 @@ dependencies = [
[[package]]
name = "matrix-sdk-common"
version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#d4fe2fe0a2575e788e12aa6aea05bdd383a85d68"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=89c9e311408d2c57245f4ec5af7bbd4daa0046d3#89c9e311408d2c57245f4ec5af7bbd4daa0046d3"
dependencies = [
+ "assign",
"futures-locks",
"instant",
"js_int",
@@ -866,10 +874,10 @@ dependencies = [
[[package]]
name = "matrix-sdk-common-macros"
version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#d4fe2fe0a2575e788e12aa6aea05bdd383a85d68"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=89c9e311408d2c57245f4ec5af7bbd4daa0046d3#89c9e311408d2c57245f4ec5af7bbd4daa0046d3"
dependencies = [
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
@@ -967,9 +975,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
+checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
[[package]]
name = "openssl"
@@ -1012,22 +1020,22 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "pin-project"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
@@ -1050,9 +1058,18 @@ checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
[[package]]
name = "ppv-lite86"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
+
+[[package]]
+name = "proc-macro-crate"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+dependencies = [
+ "toml",
+]
[[package]]
name = "proc-macro-hack"
@@ -1173,7 +1190,7 @@ dependencies = [
[[package]]
name = "reqwest"
version = "0.10.7"
-source = "git+https://github.com/daydream-mx/reqwest.git?branch=MTRNord/wasm-worker-support#3cfec388702b239ba0daf41dc48a4fee775ce43a"
+source = "git+https://github.com/seanmonstar/reqwest?rev=cff487ff58630cf0ac59f3e46cbf20cf50a28b3f#cff487ff58630cf0ac59f3e46cbf20cf50a28b3f"
dependencies = [
"base64",
"bytes",
@@ -1212,26 +1229,26 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac"
[[package]]
name = "ruma"
-version = "0.1.0"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+version = "0.0.1"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
"ruma-api",
"ruma-client-api",
"ruma-common",
"ruma-events",
- "ruma-identifiers 0.17.0 (git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3)",
- "ruma-identifiers-macros",
+ "ruma-identifiers",
+ "ruma-serde",
]
[[package]]
name = "ruma-api"
-version = "0.16.1"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+version = "0.17.0-alpha.1"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
"http",
"percent-encoding",
"ruma-api-macros",
- "ruma-identifiers 0.17.0 (git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3)",
+ "ruma-identifiers",
"ruma-serde",
"serde",
"serde_json",
@@ -1240,25 +1257,28 @@ dependencies = [
[[package]]
name = "ruma-api-macros"
-version = "0.16.1"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+version = "0.17.0-alpha.1"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
+ "proc-macro-crate",
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
name = "ruma-client-api"
-version = "0.9.0"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+version = "0.10.0-alpha.1"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
+ "assign",
"http",
"js_int",
+ "percent-encoding",
"ruma-api",
"ruma-common",
"ruma-events",
- "ruma-identifiers 0.17.0 (git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3)",
+ "ruma-identifiers",
"ruma-serde",
"serde",
"serde_json",
@@ -1268,9 +1288,10 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.2.0"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
"js_int",
+ "ruma-identifiers",
"ruma-serde",
"serde",
"serde_json",
@@ -1279,13 +1300,13 @@ dependencies = [
[[package]]
name = "ruma-events"
-version = "0.21.3"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+version = "0.22.0-alpha.1"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
"js_int",
"ruma-common",
"ruma-events-macros",
- "ruma-identifiers 0.17.0 (git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3)",
+ "ruma-identifiers",
"ruma-serde",
"serde",
"serde_json",
@@ -1294,48 +1315,52 @@ dependencies = [
[[package]]
name = "ruma-events-macros"
-version = "0.21.3"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+version = "0.22.0-alpha.1"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
+ "proc-macro-crate",
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
name = "ruma-identifiers"
-version = "0.17.0"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+version = "0.17.4"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
+ "ruma-identifiers-macros",
+ "ruma-identifiers-validation",
"serde",
"strum",
]
[[package]]
-name = "ruma-identifiers"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7046d6ff26cf4f5b8bc77af68527544c61e32cab5810c40035c6491c08da0d3"
+name = "ruma-identifiers-macros"
+version = "0.17.4"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
- "serde",
- "strum",
+ "proc-macro2 1.0.19",
+ "quote 1.0.7",
+ "ruma-identifiers-validation",
+ "syn 1.0.38",
]
[[package]]
-name = "ruma-identifiers-macros"
-version = "0.17.0"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+name = "ruma-identifiers-validation"
+version = "0.1.1"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
- "proc-macro2 1.0.19",
- "quote 1.0.7",
- "ruma-identifiers 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.35",
+ "ruma-serde",
+ "serde",
+ "serde_json",
+ "strum",
]
[[package]]
name = "ruma-serde"
-version = "0.2.2"
-source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3"
+version = "0.2.3"
+source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434"
dependencies = [
"form_urlencoded",
"itoa",
@@ -1364,7 +1389,7 @@ checksum = "7903c2cf599db8f310b392332f38367ca4acc84420fa1aee3536299f433c10d5"
dependencies = [
"quote 1.0.7",
"rust-embed-utils",
- "syn 1.0.35",
+ "syn 1.0.38",
"walkdir",
]
@@ -1433,29 +1458,29 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
[[package]]
name = "serde"
-version = "1.0.114"
+version = "1.0.115"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.114"
+version = "1.0.115"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
name = "serde_json"
-version = "1.0.56"
+version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
dependencies = [
"itoa",
"ryu",
@@ -1500,23 +1525,23 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "strum"
-version = "0.18.0"
+version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
+checksum = "3924a58d165da3b7b2922c667ab0673c7b5fd52b5c19ea3442747bcb3cd15abe"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
-version = "0.18.0"
+version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
+checksum = "2d2ab682ecdcae7f5f45ae85cd7c1e6c8e68ea42c8a612d47fedf831c037146a"
dependencies = [
"heck",
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
@@ -1532,9 +1557,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.35"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
+checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
@@ -1578,7 +1603,7 @@ checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
@@ -1593,15 +1618,15 @@ dependencies = [
[[package]]
name = "tinystr"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bac79c4b51eda1b090b1edebfb667821bbb51f713855164dc7cec2cb8ac2ba3"
+checksum = "707151f004e8db265b83b1c7509d6c3b4c2c2bc8696113cbe0a8e595c2fdbd3b"
[[package]]
name = "tinyvec"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
+checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
[[package]]
name = "tokio"
@@ -1671,9 +1696,9 @@ dependencies = [
[[package]]
name = "tracing"
-version = "0.1.17"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
+checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c"
dependencies = [
"cfg-if",
"log",
@@ -1683,20 +1708,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.9"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b"
+checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
name = "tracing-core"
-version = "0.1.11"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f"
+checksum = "db63662723c316b43ca36d833707cc93dff82a02ba3d7e354f342682cc8b3545"
dependencies = [
"lazy_static",
]
@@ -1847,9 +1872,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "wasm-bindgen"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
+checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
dependencies = [
"cfg-if",
"serde",
@@ -1859,24 +1884,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
+checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0"
dependencies = [
"bumpalo",
"lazy_static",
"log",
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.15"
+version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ad6e4e8b2b7f8c90b6e09a9b590ea15cb0d1dbe28502b5a405cd95d1981671"
+checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
dependencies = [
"cfg-if",
"js-sys",
@@ -1886,9 +1911,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
+checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
dependencies = [
"quote 1.0.7",
"wasm-bindgen-macro-support",
@@ -1896,22 +1921,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
+checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"
+checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"
[[package]]
name = "wasm-logger"
@@ -1926,9 +1951,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.42"
+version = "0.3.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2"
+checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2035,7 +2060,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
]
[[package]]
@@ -2065,7 +2090,7 @@ source = "git+https://github.com/daydream-mx/yew.git?branch=MTRNord/daydream-no-
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.38",
"yew-router-route-parser",
]
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,7 @@ yewtil = { git = "https://github.com/daydream-mx/yew.git", branch = "MTRNord/day
# Matrix
#, branch = "daydream"
-matrix-sdk = { version = "0.1.0", git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = ["messages"]}# features = ["encryption"]}
+matrix-sdk = { version = "0.1.0", git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = ["messages"], rev = "89c9e311408d2c57245f4ec5af7bbd4daa0046d3"}# features = ["encryption"]}
url = "2.1.1"
thiserror = "1.0"
futures-locks = { git = "https://github.com/asomers/futures-locks", default-features = false }
@@ -68,7 +68,6 @@ features = [
[patch.crates-io]
olm-sys = { git = "https://gitlab.gnome.org/stoically/olm-sys", branch = "wasm-target" }
cjson = { git = "https://github.com/engineerd/cjson" }
-reqwest = { git = "https://github.com/daydream-mx/reqwest.git", branch = "MTRNord/wasm-worker-support"}
[profile.release]
# less code to include into binary
diff --git a/src/app/components/room_list/item.rs b/src/app/components/room_list/item.rs
@@ -54,7 +54,7 @@ impl Component for RoomItem {
let room = self.props.room.clone();
// TODO placeholder for encrypted rooms
- let last_message = match room.messages.iter().last().map(|m| &**m) {
+ let last_message = match room.messages.iter().last() {
Some(AnyPossiblyRedactedSyncMessageEvent::Regular(
AnySyncMessageEvent::RoomMessage(SyncMessageEvent {
content: MessageEventContent::Text(text_event),
diff --git a/src/app/matrix/mod.rs b/src/app/matrix/mod.rs
@@ -3,16 +3,20 @@ use std::sync::Arc;
use log::*;
use matrix_sdk::{
- api::r0::{filter::RoomEventFilter, message::get_message_events::Direction},
- events::{
- room::message::{
- FormattedBody, MessageEventContent, TextMessageEventContent,
+ api::r0::{
+ filter::RoomEventFilter,
+ message::{
+ get_message_events::Direction, get_message_events::Request as GetMessagesRequest,
},
- AnyMessageEvent, AnyRoomEvent, AnySyncMessageEvent, EventJson,
+ },
+ events::{
+ room::message::{FormattedBody, MessageEventContent, TextMessageEventContent},
+ AnyMessageEvent, AnyRoomEvent, AnySyncMessageEvent,
},
identifiers::RoomId,
+ js_int::uint,
locks::RwLock,
- Client, MessagesRequestBuilder, Room,
+ Client, Raw, Room,
};
use pulldown_cmark::{html, Options, Parser};
use serde::{Deserialize, Serialize};
@@ -64,10 +68,10 @@ pub enum Response {
Error(MatrixError),
LoggedIn(bool),
// TODO properly handle sync events
- Sync((RoomId, EventJson<AnySyncMessageEvent>)),
+ Sync((RoomId, Raw<AnySyncMessageEvent>)),
JoinedRoomSync(RoomId),
SyncPing,
- OldMessages((RoomId, Vec<EventJson<AnyMessageEvent>>)),
+ OldMessages((RoomId, Vec<Raw<AnyMessageEvent>>)),
JoinedRoom((RoomId, Room)),
SaveSession(SessionStore),
}
@@ -140,11 +144,12 @@ impl Agent for MatrixAgent {
let agent = self.clone();
spawn_local(async move {
// FIXME gracefully handle login errors
+ // TODO make the String to &str conversion smarter if possible
let login_response = agent
.matrix_client
.as_ref()
.unwrap()
- .login(username, password, None, Some("Daydream".to_string()))
+ .login(&username, &password, None, Some("Daydream"))
.await;
match login_response {
Ok(login_response) => {
@@ -252,42 +257,38 @@ impl Agent for MatrixAgent {
Request::GetOldMessages((room_id, from)) => {
let agent = self.clone();
spawn_local(async move {
- let mut builder = match from {
- Some(from) => MessagesRequestBuilder::new(room_id.clone(), from),
- None => MessagesRequestBuilder::new(
- room_id.clone(),
- agent
- .matrix_client
- .as_ref()
- .unwrap()
- .sync_token()
- .await
- .unwrap(),
- ),
+ let sync_token = match from {
+ Some(from) => from,
+ None => agent
+ .matrix_client
+ .as_ref()
+ .unwrap()
+ .sync_token()
+ .await
+ .unwrap(),
};
+ let mut req =
+ GetMessagesRequest::new(&room_id, &sync_token, Direction::Backward);
let filter = RoomEventFilter {
types: Some(vec!["m.room.message".to_string()]),
..Default::default()
};
// TODO find better way than cloning
- builder = (*builder
- .filter(filter)
- .direction(Direction::Backward)
- .limit(30))
- .clone();
+ req.filter = Some(filter);
+ req.limit = uint!(30);
// TODO handle error gracefully
let messsages = agent
.matrix_client
.clone()
.unwrap()
- .room_messages(builder.clone())
+ .room_messages(req)
.await
.unwrap();
// TODO save end point for future loading
- let mut wrapped_messages: Vec<EventJson<AnyMessageEvent>> = Vec::new();
- let chunk_iter: Vec<EventJson<AnyRoomEvent>> = messsages.chunk;
+ let mut wrapped_messages: Vec<Raw<AnyMessageEvent>> = Vec::new();
+ let chunk_iter: Vec<Raw<AnyRoomEvent>> = messsages.chunk;
let (oks, _): (Vec<_>, Vec<_>) = chunk_iter
.iter()
.map(|event| event.deserialize())
@@ -346,7 +347,7 @@ impl Agent for MatrixAgent {
}
let serialized_event =
- EventJson::from(AnyMessageEvent::RoomMessage(event.clone()));
+ Raw::from(AnyMessageEvent::RoomMessage(event.clone()));
wrapped_messages.push(serialized_event);
}
}
diff --git a/src/app/matrix/sync.rs b/src/app/matrix/sync.rs
@@ -10,11 +10,11 @@ use matrix_sdk::{
api::r0::sync::sync_events::Response as SyncResponse,
events::{
room::message::MessageEventContent, AnySyncMessageEvent, AnySyncRoomEvent,
- AnySyncStateEvent, EventJson,
+ AnySyncStateEvent,
},
identifiers::RoomId,
locks::RwLock,
- Client, Room, SyncSettings,
+ Client, Raw, Room, SyncSettings,
};
use wasm_bindgen_futures::spawn_local;
use yew::Callback;
@@ -192,7 +192,7 @@ impl Sync {
}
}
- let serialized_event = EventJson::from(AnySyncMessageEvent::RoomMessage(event));
+ let serialized_event = Raw::from(AnySyncMessageEvent::RoomMessage(event));
let resp = Response::Sync((room_id.clone(), serialized_event));
self.callback.emit(resp);
}
