From 0092ae1e30d9e4a6da4aebc172446900aa0a25ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Fri, 2 May 2025 17:24:20 +0200 Subject: [PATCH] Upgrade matrix-sdk --- Cargo.lock | 180 ++++++++++++++--------------- Cargo.toml | 18 +-- src/session/model/room_list/mod.rs | 6 +- 3 files changed, 98 insertions(+), 106 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80328e26..952a2289 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "anymap2" @@ -94,9 +94,9 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "aperture" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2fdbb761a57876510cac81eb0b91fb5546bc20f082076c96a69868e4d94b6ef" +checksum = "e611d046ace4182750a3bf804b3f08490697fa44f6e3fe4b21a88afb05db6eb2" dependencies = [ "futures-channel", "gstreamer", @@ -158,7 +158,7 @@ dependencies = [ "enumflags2", "futures-channel", "futures-util", - "rand 0.9.0", + "rand 0.9.1", "serde", "serde_repr", "tokio", @@ -205,9 +205,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a194f9d963d8099596278594b3107448656ba73831c9d8c783e613ce86da64" +checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07" dependencies = [ "flate2", "futures-core", @@ -302,9 +302,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288" +checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" dependencies = [ "axum-core", "bytes", @@ -421,9 +421,9 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "blake3" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389a099b34312839e16420d499a9cad9650541715937ffbdd40d36f49e77eeb3" +checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" dependencies = [ "arrayref", "arrayvec", @@ -463,7 +463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c541c70a910b485670304fd420f0eab8f7bde68439db6a8d98819c3d2774d7e2" dependencies = [ "bit-vec", - "getrandom 0.2.15", + "getrandom 0.2.16", "siphasher", ] @@ -490,9 +490,9 @@ checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytemuck" -version = "1.22.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" +checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" [[package]] name = "byteorder" @@ -546,9 +546,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.19" +version = "1.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0" dependencies = [ "jobserver", "libc", @@ -603,9 +603,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -858,9 +858,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid", "zeroize", @@ -1273,7 +1273,7 @@ dependencies = [ "oo7", "pulldown-cmark", "qrcode", - "rand 0.9.0", + "rand 0.9.1", "regex", "rmp-serde", "ruma", @@ -1517,9 +1517,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", @@ -2084,9 +2084,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" +checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633" dependencies = [ "atomic-waker", "bytes", @@ -2103,9 +2103,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ "allocator-api2", "equivalent", @@ -2580,9 +2580,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.6" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488" +checksum = "27e77966151130221b079bcec80f1f34a9e414fa489d99152a201c07fd2182bc" dependencies = [ "jiff-static", "log", @@ -2593,9 +2593,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.6" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19" +checksum = "97265751f8a9a4228476f2fc17874a9e7e70e96b893368e42619880fe143b48a" dependencies = [ "proc-macro2", "quote", @@ -2731,9 +2731,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libloading" @@ -2747,9 +2747,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72" [[package]] name = "libseccomp" @@ -3019,8 +3019,7 @@ dependencies = [ [[package]] name = "matrix-sdk" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55232f098ff360b58b8bfc2605b995222dc4adbe0ea21bb94c220dd5f9a6dc54" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ "anymap2", "aquamarine", @@ -3032,6 +3031,7 @@ dependencies = [ "backon", "bytes", "bytesize", + "cfg-if", "event-listener", "eyeball", "eyeball-im", @@ -3077,8 +3077,7 @@ dependencies = [ [[package]] name = "matrix-sdk-base" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69467f921319733354fa5d5fb47a4e147e645c929d62519da7928cd6d203a9" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ "as_variant", "async-trait", @@ -3105,8 +3104,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75aa988a96e4a85e2b854f4f6487d31f1833e8abf3eebc1b8c13274a68dacf45" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ "async-trait", "eyeball-im", @@ -3129,8 +3127,7 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2a8a811f9809f37c360f7005350e76661cb2bed2624b87b8d772c444bf572a" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ "aes", "aquamarine", @@ -3171,13 +3168,12 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63da8893fc9062f4b7874f766fd5dcf048f8ea456b08ba89320cc68926b1112e" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ "anyhow", "async-trait", "base64", - "getrandom 0.2.15", + "getrandom 0.2.16", "gloo-utils", "hkdf", "indexed_db_futures", @@ -3200,8 +3196,7 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fc0b2a90a9c986d53fb772e49ec1f135748e2b4a7d38b253ee45f97ecb818e" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ "byteorder", "qrcode", @@ -3213,9 +3208,9 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddbf4f588b93ad08b760d3e51b046c4701dd7d900e75582d87c99d606e23e4b8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ + "as_variant", "async-trait", "deadpool-sqlite", "itertools 0.14.0", @@ -3237,8 +3232,7 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b14e1db0b31db81c5d20c20d24c84421893491da30e8e0218e991c3a350188e" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ "base64", "blake3", @@ -3257,8 +3251,7 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8f712c703cc43dda289d91bab17c16ec293ace7ced9c0eb805d6cafefd7685" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=284db615406792504551fd708b7cc4d1ddb8e41a#284db615406792504551fd708b7cc4d1ddb8e41a" dependencies = [ "as_variant", "async-once-cell", @@ -3535,7 +3528,7 @@ checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ "base64", "chrono", - "getrandom 0.2.15", + "getrandom 0.2.16", "http", "rand 0.8.5", "reqwest", @@ -3604,7 +3597,7 @@ dependencies = [ "num", "num-bigint-dig", "openssl", - "rand 0.9.0", + "rand 0.9.1", "serde", "tokio", "tracing", @@ -3654,9 +3647,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.107" +version = "0.9.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" +checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" dependencies = [ "cc", "libc", @@ -3923,9 +3916,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -4006,13 +3999,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy", ] [[package]] @@ -4041,7 +4033,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", ] [[package]] @@ -4184,7 +4176,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.15", + "getrandom 0.2.16", "libc", "untrusted", "windows-sys 0.52.0", @@ -4273,7 +4265,7 @@ dependencies = [ "base64", "bytes", "form_urlencoded", - "getrandom 0.2.15", + "getrandom 0.2.16", "http", "indexmap", "js-sys", @@ -4421,9 +4413,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ "bitflags 2.9.0", "errno", @@ -4645,9 +4637,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -4671,9 +4663,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] @@ -4842,9 +4834,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -4862,9 +4854,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", @@ -4905,7 +4897,7 @@ dependencies = [ "fastrand", "getrandom 0.3.2", "once_cell", - "rustix 1.0.5", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -5111,9 +5103,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", @@ -5124,9 +5116,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ "serde", "serde_spanned", @@ -5136,18 +5128,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.24" +version = "0.22.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ "indexmap", "serde", @@ -5290,7 +5282,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "470dbf6591da1b39d43c14523b2b469c86879a53e8b758c8e090a470fe7b1fbe" dependencies = [ - "rand 0.9.0", + "rand 0.9.1", "web-time", ] @@ -5428,7 +5420,7 @@ dependencies = [ "chacha20poly1305", "curve25519-dalek", "ed25519-dalek", - "getrandom 0.2.15", + "getrandom 0.2.16", "hkdf", "hmac", "matrix-pickle", @@ -5836,9 +5828,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +checksum = "9e27d6ad3dac991091e4d35de9ba2d2d00647c5d0fc26c5496dee55984ae111b" dependencies = [ "memchr", ] @@ -5954,7 +5946,7 @@ dependencies = [ "hex", "nix", "ordered-stream", - "rand 0.9.0", + "rand 0.9.1", "serde", "serde_repr", "static_assertions", @@ -5998,18 +5990,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.24" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.24" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index f644bf23..7931fa56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,9 +71,9 @@ shumate = { package = "libshumate", version = "0.6" } sourceview = { package = "sourceview5", version = "0.9" } [dependencies.matrix-sdk] -version = "0.11" -# git = "https://github.com/matrix-org/matrix-rust-sdk.git" -# rev = "b4a8089b40c68f71f01678c3b54d392ce44e7c68" +# version = "0.11" +git = "https://github.com/matrix-org/matrix-rust-sdk.git" +rev = "284db615406792504551fd708b7cc4d1ddb8e41a" features = [ "socks", "sso-login", @@ -82,14 +82,14 @@ features = [ ] [dependencies.matrix-sdk-store-encryption] -version = "0.11" -# git = "https://github.com/matrix-org/matrix-rust-sdk.git" -# rev = "b4a8089b40c68f71f01678c3b54d392ce44e7c68" +# version = "0.11" +git = "https://github.com/matrix-org/matrix-rust-sdk.git" +rev = "284db615406792504551fd708b7cc4d1ddb8e41a" [dependencies.matrix-sdk-ui] -version = "0.11" -# git = "https://github.com/matrix-org/matrix-rust-sdk.git" -# rev = "b4a8089b40c68f71f01678c3b54d392ce44e7c68" +# version = "0.11" +git = "https://github.com/matrix-org/matrix-rust-sdk.git" +rev = "284db615406792504551fd708b7cc4d1ddb8e41a" [dependencies.ruma] version = "0.12.2" diff --git a/src/session/model/room_list/mod.rs b/src/session/model/room_list/mod.rs index 041f0cad..59343cf4 100644 --- a/src/session/model/room_list/mod.rs +++ b/src/session/model/room_list/mod.rs @@ -205,7 +205,7 @@ mod imp { let mut new_rooms = HashMap::new(); - for (room_id, left_room) in rooms.leave { + for (room_id, left_room) in rooms.left { let room = if let Some(room) = self.get(&room_id) { room } else if let Some(matrix_room) = client.get_room(&room_id) { @@ -222,7 +222,7 @@ mod imp { room.handle_ambiguity_changes(left_room.ambiguity_changes.values()); } - for (room_id, joined_room) in rooms.join { + for (room_id, joined_room) in rooms.joined { let room = if let Some(room) = self.get(&room_id) { room } else if let Some(matrix_room) = client.get_room(&room_id) { @@ -240,7 +240,7 @@ mod imp { room.handle_ambiguity_changes(joined_room.ambiguity_changes.values()); } - for (room_id, _invited_room) in rooms.invite { + for (room_id, _invited_room) in rooms.invited { let room = if let Some(room) = self.get(&room_id) { room } else if let Some(matrix_room) = client.get_room(&room_id) {