From 49471c1df0eadef33e09d154f8ca37dec97df25c Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 12 Apr 2025 07:49:26 +0300 Subject: [PATCH] Upgrade mxlink (1.6.0 -> 1.7.0) and matrix-sdk (0.10.0 -> 0.11.0) --- Cargo.lock | 416 ++++++++++++++++++++++++++++++++++++++++++++++------- Cargo.toml | 4 +- 2 files changed, 366 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 10a323c..6ba286a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -72,6 +72,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anthropic" version = "0.0.8" @@ -120,6 +135,12 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "archery" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae2ed21cd55021f05707a807a5fc85695dafb98832921f6cfa06db67ca5b869" + [[package]] name = "arrayref" version = "0.3.9" @@ -137,9 +158,9 @@ dependencies = [ [[package]] name = "as_variant" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" +checksum = "9dbc3a507a82b17ba0d98f6ce8fd6954ea0c8152e98009d36a40d8dcc8ce078a" [[package]] name = "assign" @@ -300,6 +321,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "backon" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0b50b1b78dbadd44ab18b3c794e496f3a139abb9fbc27d9c94c4eebbb96496" +dependencies = [ + "fastrand", + "gloo-timers", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.74" @@ -317,7 +349,7 @@ dependencies = [ [[package]] name = "baibot" -version = "1.5.0" +version = "1.5.1" dependencies = [ "anthropic", "anyhow", @@ -325,7 +357,7 @@ dependencies = [ "base64 0.22.1", "chrono", "etke_openai_api_rust", - "matrix-sdk", + "matrix-sdk 0.11.0", "mxidwc", "mxlink", "quick_cache", @@ -403,16 +435,15 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "blake3" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1230237285e3e10cde447185e8975408ae24deaa67205ce684805c25bc0c7937" +checksum = "389a099b34312839e16420d499a9cad9650541715937ffbdd40d36f49e77eeb3" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "memmap2", ] [[package]] @@ -473,9 +504,15 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "bytesize" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2c12f985c78475a6b8d629afd0c360260ef34cfef52efccdcfd31972f81c2e" +checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659" + +[[package]] +name = "bytesize" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3c8f83209414aacf0eeae3cf730b18d6981697fba62f200fcfb92b9f082acba" [[package]] name = "cbc" @@ -537,7 +574,13 @@ version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", + "serde", + "wasm-bindgen", + "windows-link", ] [[package]] @@ -1051,12 +1094,24 @@ dependencies = [ [[package]] name = "eyeball-im" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad276eb017655257443d34f27455f60e8b02b839c6ebcaa8d6f06cc498784e8f" +checksum = "2bce23da1ef2af356501c395426370ef09d778989557a749a874645ec74aba23" dependencies = [ "futures-core", - "imbl", + "imbl 4.0.1", + "tokio", + "tracing", +] + +[[package]] +name = "eyeball-im" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43e8e9d31591be508826b875d8fe6056aebcaec3281ac0e45434ff303686c566" +dependencies = [ + "futures-core", + "imbl 5.0.0", "tokio", "tracing", ] @@ -1592,6 +1647,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "iana-time-zone" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "icu_collections" version = "1.5.0" @@ -1746,7 +1825,22 @@ dependencies = [ "bitmaps", "imbl-sized-chunks", "rand_core 0.6.4", - "rand_xoshiro", + "rand_xoshiro 0.6.0", + "serde", + "version_check", +] + +[[package]] +name = "imbl" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4308a675e4cfc1920f36a8f4d8fb62d5533b7da106844bd1ec51c6f1fa94a0c" +dependencies = [ + "archery", + "bitmaps", + "imbl-sized-chunks", + "rand_core 0.9.2", + "rand_xoshiro 0.7.0", "serde", "version_check", ] @@ -1904,6 +1998,12 @@ dependencies = [ "typewit", ] +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" + [[package]] name = "lazy_static" version = "1.5.0" @@ -2053,20 +2153,20 @@ dependencies = [ "async-trait", "backoff", "bytes", - "bytesize", + "bytesize 1.3.3", "event-listener", "eyeball", - "eyeball-im", + "eyeball-im 0.6.1", "futures-core", "futures-util", "gloo-timers", "growable-bloom-filter", "http 1.2.0", - "imbl", + "imbl 4.0.1", "indexmap", "js_int", - "matrix-sdk-base", - "matrix-sdk-common", + "matrix-sdk-base 0.10.0", + "matrix-sdk-common 0.10.0", "matrix-sdk-indexeddb", "matrix-sdk-sqlite", "mime", @@ -2091,6 +2191,59 @@ dependencies = [ "zeroize", ] +[[package]] +name = "matrix-sdk" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55232f098ff360b58b8bfc2605b995222dc4adbe0ea21bb94c220dd5f9a6dc54" +dependencies = [ + "anymap2", + "aquamarine", + "as_variant", + "async-channel", + "async-stream", + "async-trait", + "backon", + "bytes", + "bytesize 2.0.1", + "event-listener", + "eyeball", + "eyeball-im 0.7.0", + "futures-core", + "futures-util", + "gloo-timers", + "growable-bloom-filter", + "http 1.2.0", + "imbl 5.0.0", + "indexmap", + "js_int", + "language-tags", + "matrix-sdk-base 0.11.0", + "matrix-sdk-common 0.11.0", + "mime", + "mime2ext", + "oauth2", + "once_cell", + "percent-encoding", + "pin-project-lite", + "reqwest 0.12.12", + "ruma", + "serde", + "serde_html_form", + "serde_json", + "sha2", + "tempfile", + "thiserror 2.0.11", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "url", + "urlencoding", + "vodozemac", + "zeroize", +] + [[package]] name = "matrix-sdk-base" version = "0.10.0" @@ -2102,12 +2255,39 @@ dependencies = [ "bitflags 2.9.0", "decancer", "eyeball", - "eyeball-im", + "eyeball-im 0.6.1", "futures-util", "growable-bloom-filter", - "matrix-sdk-common", + "matrix-sdk-common 0.10.0", "matrix-sdk-crypto", - "matrix-sdk-store-encryption", + "matrix-sdk-store-encryption 0.10.0", + "once_cell", + "regex", + "ruma", + "serde", + "serde_json", + "thiserror 2.0.11", + "tokio", + "tracing", + "unicode-normalization", +] + +[[package]] +name = "matrix-sdk-base" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe69467f921319733354fa5d5fb47a4e147e645c929d62519da7928cd6d203a9" +dependencies = [ + "as_variant", + "async-trait", + "bitflags 2.9.0", + "decancer", + "eyeball", + "eyeball-im 0.7.0", + "futures-util", + "growable-bloom-filter", + "matrix-sdk-common 0.11.0", + "matrix-sdk-store-encryption 0.11.0", "once_cell", "regex", "ruma", @@ -2126,11 +2306,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "072d77e461933834e12810d63906409f37a039acad31a16dda62b63e1f4c31cf" dependencies = [ "async-trait", - "eyeball-im", + "eyeball-im 0.6.1", "futures-core", "futures-util", "gloo-timers", - "imbl", + "imbl 4.0.1", "ruma", "serde", "serde_json", @@ -2143,6 +2323,29 @@ dependencies = [ "web-sys", ] +[[package]] +name = "matrix-sdk-common" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75aa988a96e4a85e2b854f4f6487d31f1833e8abf3eebc1b8c13274a68dacf45" +dependencies = [ + "async-trait", + "eyeball-im 0.7.0", + "futures-core", + "futures-util", + "gloo-timers", + "imbl 5.0.0", + "ruma", + "serde", + "serde_json", + "thiserror 2.0.11", + "tokio", + "tracing", + "tracing-subscriber", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "matrix-sdk-crypto" version = "0.10.0" @@ -2164,7 +2367,7 @@ dependencies = [ "hmac", "itertools 0.14.0", "js_option", - "matrix-sdk-common", + "matrix-sdk-common 0.10.0", "pbkdf2", "rand 0.8.5", "rmp-serde", @@ -2199,7 +2402,7 @@ dependencies = [ "indexed_db_futures", "js-sys", "matrix-sdk-crypto", - "matrix-sdk-store-encryption", + "matrix-sdk-store-encryption 0.10.0", "ruma", "serde", "serde-wasm-bindgen", @@ -2222,9 +2425,9 @@ dependencies = [ "async-trait", "deadpool-sqlite", "itertools 0.14.0", - "matrix-sdk-base", + "matrix-sdk-base 0.10.0", "matrix-sdk-crypto", - "matrix-sdk-store-encryption", + "matrix-sdk-store-encryption 0.10.0", "rmp-serde", "ruma", "rusqlite", @@ -2256,21 +2459,32 @@ dependencies = [ "zeroize", ] +[[package]] +name = "matrix-sdk-store-encryption" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b14e1db0b31db81c5d20c20d24c84421893491da30e8e0218e991c3a350188e" +dependencies = [ + "base64 0.22.1", + "blake3", + "chacha20poly1305", + "hmac", + "pbkdf2", + "rand 0.8.5", + "rmp-serde", + "serde", + "serde_json", + "sha2", + "thiserror 2.0.11", + "zeroize", +] + [[package]] name = "memchr" version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" -dependencies = [ - "libc", -] - [[package]] name = "mime" version = "0.3.17" @@ -2337,7 +2551,7 @@ dependencies = [ "base64 0.22.1", "chacha20poly1305", "hex", - "matrix-sdk", + "matrix-sdk 0.10.0", "mime", "quick_cache", "rand 0.9.0", @@ -2410,6 +2624,26 @@ dependencies = [ "libc", ] +[[package]] +name = "oauth2" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" +dependencies = [ + "base64 0.22.1", + "chrono", + "getrandom 0.2.15", + "http 1.2.0", + "rand 0.8.5", + "reqwest 0.12.12", + "serde", + "serde_json", + "serde_path_to_error", + "sha2", + "thiserror 1.0.69", + "url", +] + [[package]] name = "object" version = "0.36.7" @@ -2656,9 +2890,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14" +checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0" dependencies = [ "bitflags 2.9.0", "memchr", @@ -2815,6 +3049,15 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_xoshiro" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" +dependencies = [ + "rand_core 0.9.2", +] + [[package]] name = "readlock" version = "0.1.9" @@ -3059,9 +3302,9 @@ dependencies = [ [[package]] name = "ruma" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6fea33e3d17b9e009fefb3f175ca7fd40b1e7d1e72444478fd1b28611eb50a" +checksum = "c64fdaae631940eda62844a8a3026aba2ba84c22588c888ebec44861ba4d0c18" dependencies = [ "assign", "js_int", @@ -3075,9 +3318,9 @@ dependencies = [ [[package]] name = "ruma-client-api" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23989b539eceeaad01ba089ad307788f90a29bac2e5f730ff0a523eeae3fa1d7" +checksum = "b9a89ac03a0f4451f946ed9aed6fdd16ef5a78a3a2849e87af4b2474a176b2fb" dependencies = [ "as_variant", "assign", @@ -3099,9 +3342,9 @@ dependencies = [ [[package]] name = "ruma-common" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1058c04b8dd62f4fba71c9f65112fb79bc332438d11aefe1e8edf67b7fb58a98" +checksum = "6b75da013b362664c3e161662902e5da3f77e990525681b59c6035bac27e87b4" dependencies = [ "as_variant", "base64 0.22.1", @@ -3132,9 +3375,9 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.30.1" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1b8e15942e35ba56004429bc0845f481281f903e86957973a08ec08f8d06f0" +checksum = "6c100eb6c7691ef010f18d9af315f486fc4da621b7203c431e88352148e84551" dependencies = [ "as_variant", "indexmap", @@ -3157,9 +3400,9 @@ dependencies = [ [[package]] name = "ruma-federation-api" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d70c3d37a8e42992aeaa5786cb406ad302bcd05c0e7e3073d5316b4574340dd" +checksum = "373bc5a30b84574dfce3e75c33d79d6ba9843bf0eee1bf351f904eef9bea001a" dependencies = [ "http 1.2.0", "js_int", @@ -3503,6 +3746,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a" +dependencies = [ + "itoa", + "serde", +] + [[package]] name = "serde_spanned" version = "0.6.8" @@ -4392,14 +4645,55 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result 0.3.2", + "windows-strings 0.4.0", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + [[package]] name = "windows-registry" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", - "windows-strings", + "windows-result 0.2.0", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] @@ -4412,16 +4706,34 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-strings" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index ec3d12e..ba99510 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,9 +22,9 @@ base64 = "0.22.*" chrono = { version = "0.4.*", default-features = false, features = ["std", "now"] } # We'd rather not depend on this, but we cannot use the ruma-events EventContent macro without it. # We add the `native-tls` feature, because of https://github.com/etkecc/rust-mxlink/issues/1 -matrix-sdk = { version = "0.10.0", default-features = false, features = ["native-tls"] } +matrix-sdk = { version = "0.11.0", default-features = false, features = ["native-tls"] } mxidwc = "1.0.*" -mxlink = ">=1.6.0" +mxlink = ">=1.7.0" etke_openai_api_rust = "0.1.*" quick_cache = "0.6.*" regex = "1.11.*"