From 5dc35b1bc0667edfc6057f056c3870e645fa5454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Thu, 4 May 2023 15:37:24 +0200 Subject: [PATCH] chore: Update matrix-sdk and ruma --- Cargo.lock | 58 ++++++++++++++++++++++-------------------------------- Cargo.toml | 4 ++-- 2 files changed, 25 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0803614..7a8b6eb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1328,12 +1328,6 @@ dependencies = [ "url", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futf" version = "0.1.5" @@ -2873,7 +2867,7 @@ dependencies = [ [[package]] name = "matrix-sdk" version = "0.6.2" -source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=4002c7fad13bf058962976d9b08e0e03b70b49b2#4002c7fad13bf058962976d9b08e0e03b70b49b2" +source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=f03fe083678813b6a0b384377d67184ec91366fb#f03fe083678813b6a0b384377d67184ec91366fb" dependencies = [ "anymap2", "async-stream", @@ -2899,7 +2893,7 @@ dependencies = [ "matrix-sdk-indexeddb", "matrix-sdk-sqlite", "mime", - "mime_guess", + "mime2ext", "once_cell", "pin-project-lite", "rand 0.8.5", @@ -2920,14 +2914,12 @@ dependencies = [ [[package]] name = "matrix-sdk-base" version = "0.6.1" -source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=4002c7fad13bf058962976d9b08e0e03b70b49b2#4002c7fad13bf058962976d9b08e0e03b70b49b2" +source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=f03fe083678813b6a0b384377d67184ec91366fb#f03fe083678813b6a0b384377d67184ec91366fb" dependencies = [ - "async-stream", "async-trait", "bitflags 2.1.0", "dashmap", "eyeball", - "futures-core", "futures-util", "matrix-sdk-common", "matrix-sdk-crypto", @@ -2939,13 +2931,12 @@ dependencies = [ "thiserror", "tokio", "tracing", - "zeroize", ] [[package]] name = "matrix-sdk-common" version = "0.6.0" -source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=4002c7fad13bf058962976d9b08e0e03b70b49b2#4002c7fad13bf058962976d9b08e0e03b70b49b2" +source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=f03fe083678813b6a0b384377d67184ec91366fb#f03fe083678813b6a0b384377d67184ec91366fb" dependencies = [ "futures-core", "futures-util", @@ -2961,7 +2952,7 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" version = "0.6.0" -source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=4002c7fad13bf058962976d9b08e0e03b70b49b2#4002c7fad13bf058962976d9b08e0e03b70b49b2" +source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=f03fe083678813b6a0b384377d67184ec91366fb#f03fe083678813b6a0b384377d67184ec91366fb" dependencies = [ "aes", "async-std", @@ -2972,7 +2963,6 @@ dependencies = [ "cfg-if", "ctr", "dashmap", - "event-listener", "eyeball", "futures-core", "futures-util", @@ -2998,12 +2988,11 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.2.0" -source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=4002c7fad13bf058962976d9b08e0e03b70b49b2#4002c7fad13bf058962976d9b08e0e03b70b49b2" +source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=f03fe083678813b6a0b384377d67184ec91366fb#f03fe083678813b6a0b384377d67184ec91366fb" dependencies = [ "anyhow", "async-trait", "base64 0.21.0", - "dashmap", "getrandom 0.2.9", "gloo-utils", "indexed_db_futures", @@ -3024,9 +3013,8 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" version = "0.4.0" -source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=4002c7fad13bf058962976d9b08e0e03b70b49b2#4002c7fad13bf058962976d9b08e0e03b70b49b2" +source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=f03fe083678813b6a0b384377d67184ec91366fb#f03fe083678813b6a0b384377d67184ec91366fb" dependencies = [ - "base64 0.21.0", "byteorder", "qrcode", "ruma-common", @@ -3037,17 +3025,11 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.1.0" -source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=4002c7fad13bf058962976d9b08e0e03b70b49b2#4002c7fad13bf058962976d9b08e0e03b70b49b2" +source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=f03fe083678813b6a0b384377d67184ec91366fb#f03fe083678813b6a0b384377d67184ec91366fb" dependencies = [ - "async-stream", "async-trait", - "dashmap", "deadpool-sqlite", - "fs_extra", - "futures-core", - "futures-util", "matrix-sdk-base", - "matrix-sdk-common", "matrix-sdk-crypto", "matrix-sdk-store-encryption", "rmp-serde", @@ -3064,7 +3046,7 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.2.0" -source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=4002c7fad13bf058962976d9b08e0e03b70b49b2#4002c7fad13bf058962976d9b08e0e03b70b49b2" +source = "git+https://github.com/zecakeh/matrix-rust-sdk.git?rev=f03fe083678813b6a0b384377d67184ec91366fb#f03fe083678813b6a0b384377d67184ec91366fb" dependencies = [ "blake3", "chacha20poly1305", @@ -3111,6 +3093,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime2ext" +version = "0.1.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" + [[package]] name = "mime_guess" version = "2.0.4" @@ -4145,7 +4133,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.8.2" -source = "git+https://github.com/ruma/ruma.git?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" +source = "git+https://github.com/ruma/ruma.git?rev=54a4223caa1c1052464ecdba0f1e08f126e07bcd#54a4223caa1c1052464ecdba0f1e08f126e07bcd" dependencies = [ "assign", "js_int", @@ -4159,7 +4147,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.16.2" -source = "git+https://github.com/ruma/ruma.git?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" +source = "git+https://github.com/ruma/ruma.git?rev=54a4223caa1c1052464ecdba0f1e08f126e07bcd#54a4223caa1c1052464ecdba0f1e08f126e07bcd" dependencies = [ "assign", "bytes", @@ -4176,7 +4164,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.11.3" -source = "git+https://github.com/ruma/ruma.git?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" +source = "git+https://github.com/ruma/ruma.git?rev=54a4223caa1c1052464ecdba0f1e08f126e07bcd#54a4223caa1c1052464ecdba0f1e08f126e07bcd" dependencies = [ "base64 0.21.0", "bytes", @@ -4209,7 +4197,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.7.1" -source = "git+https://github.com/ruma/ruma.git?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" +source = "git+https://github.com/ruma/ruma.git?rev=54a4223caa1c1052464ecdba0f1e08f126e07bcd#54a4223caa1c1052464ecdba0f1e08f126e07bcd" dependencies = [ "js_int", "ruma-common", @@ -4220,7 +4208,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.1" -source = "git+https://github.com/ruma/ruma.git?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" +source = "git+https://github.com/ruma/ruma.git?rev=54a4223caa1c1052464ecdba0f1e08f126e07bcd#54a4223caa1c1052464ecdba0f1e08f126e07bcd" dependencies = [ "js_int", "thiserror", @@ -4229,7 +4217,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.11.3" -source = "git+https://github.com/ruma/ruma.git?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" +source = "git+https://github.com/ruma/ruma.git?rev=54a4223caa1c1052464ecdba0f1e08f126e07bcd#54a4223caa1c1052464ecdba0f1e08f126e07bcd" dependencies = [ "once_cell", "proc-macro-crate", @@ -4237,14 +4225,14 @@ dependencies = [ "quote", "ruma-identifiers-validation", "serde", - "syn 1.0.109", + "syn 2.0.15", "toml", ] [[package]] name = "ruma-push-gateway-api" version = "0.7.1" -source = "git+https://github.com/ruma/ruma.git?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" +source = "git+https://github.com/ruma/ruma.git?rev=54a4223caa1c1052464ecdba0f1e08f126e07bcd#54a4223caa1c1052464ecdba0f1e08f126e07bcd" dependencies = [ "js_int", "ruma-common", diff --git a/Cargo.toml b/Cargo.toml index 5f7107a8..978a27e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,7 @@ features = ["v4_10"] [dependencies.matrix-sdk] git = "https://github.com/zecakeh/matrix-rust-sdk.git" -rev = "4002c7fad13bf058962976d9b08e0e03b70b49b2" +rev = "f03fe083678813b6a0b384377d67184ec91366fb" features = [ "socks", "sso-login", @@ -90,7 +90,7 @@ features = [ [dependencies.ruma] # version = "0.8.2" git = "https://github.com/ruma/ruma.git" -rev = "0143bd9b9f5dcfcaa835afb76f342c12f014f945" +rev = "54a4223caa1c1052464ecdba0f1e08f126e07bcd" features = ["unstable-unspecified", "client-api-c", "unstable-sanitize"] [dependencies.shumate]