diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23b2149c..2b25741f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,8 @@ jobs: uses: actions/checkout@v3 with: submodules: true - - name: Install Rust (1.92 w/ clippy) - uses: dtolnay/rust-toolchain@1.92 + - name: Install Rust (1.93 w/ clippy) + uses: dtolnay/rust-toolchain@1.93 with: components: clippy - name: Install Rust (nightly w/ rustfmt) diff --git a/Cargo.lock b/Cargo.lock index 5832b0c5..4d391171 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f9ee0f6e02ffd7ad5816e9464499fba7b3effd01123b515c41d1697c43dad1" +checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" dependencies = [ "compression-codecs", "compression-core", @@ -318,6 +318,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-once-cell" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" + [[package]] name = "async-process" version = "2.5.0" @@ -412,9 +418,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "av-scenechange" @@ -452,18 +458,40 @@ dependencies = [ [[package]] name = "avif-serialize" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375082f007bd67184fb9c0374614b29f9aaa604ec301635f72338bb65386a53d" +checksum = "e7178fe5f7d460b13895ebb9dcb28a3a6216d2df2574a0806cb51b555d297f38" dependencies = [ "arrayvec", ] +[[package]] +name = "aws-lc-rs" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + [[package]] name = "axum" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" +checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90" dependencies = [ "axum-core", "bytes", @@ -578,9 +606,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" dependencies = [ "serde_core", ] @@ -593,18 +621,18 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "bitstream-io" -version = "4.9.0" +version = "4.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d4bd9d1db2c6bdf285e223a7fa369d5ce98ec767dec949c6ca62863ce61757" +checksum = "7eff00be299a18769011411c9def0d827e8f2d7bf0c3dbf53633147a8867fd1f" dependencies = [ - "core2", + "no_std_io2", ] [[package]] name = "blake3" -version = "1.8.4" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" dependencies = [ "arrayref", "arrayvec", @@ -676,15 +704,15 @@ dependencies = [ [[package]] name = "built" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" +checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9" [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "bytemuck" @@ -751,9 +779,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.59" +version = "1.2.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" +checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f" dependencies = [ "find-msvc-tools", "jobserver", @@ -792,7 +820,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "rand_core 0.10.0", + "rand_core 0.10.1", ] [[package]] @@ -810,9 +838,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "js-sys", @@ -835,9 +863,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", "clap_derive", @@ -857,9 +885,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck", "proc-macro2", @@ -882,6 +910,15 @@ dependencies = [ "error-code", ] +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -894,11 +931,21 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "compact_str" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" +checksum = "7fd622ebbb56a5b2ccb651b32b911cdeb2a9b4b11776b2473bf26a26a286244e" dependencies = [ "castaway", "cfg-if", @@ -910,9 +957,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7b51a7d9c967fc26773061ba86150f19c50c0d65c887cb1fbe295fd16619b7" +checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" dependencies = [ "compression-core", "flate2", @@ -921,9 +968,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" +checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" [[package]] name = "comrak" @@ -936,8 +983,8 @@ dependencies = [ "entities", "finl_unicode", "jetscii", - "phf 0.13.1", - "phf_codegen 0.13.1", + "phf", + "phf_codegen", "rustc-hash", "smallvec", "typed-arena", @@ -1004,15 +1051,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - [[package]] name = "cpufeatures" version = "0.2.17" @@ -1080,7 +1118,7 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "crossterm_winapi", "mio", "parking_lot 0.12.5", @@ -1096,7 +1134,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "crossterm_winapi", "derive_more 2.1.1", "document-features", @@ -1257,30 +1295,29 @@ checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" [[package]] name = "deadpool" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b" +checksum = "883466cb8db62725aee5f4a6011e8a5d42912b42632df32aad57fc91127c6e04" dependencies = [ "deadpool-runtime", - "lazy_static 1.5.0", "num_cpus", "tokio", ] [[package]] name = "deadpool-runtime" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" +checksum = "2657f61fb1dd8bf37a8d51093cc7cee4e77125b22f7753f49b289f831bec2bae" dependencies = [ "tokio", ] [[package]] name = "deadpool-sync" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04" +checksum = "e385cc95d3d582c328b36d1ff90feac061102b001894b555e6b465a2e0eaabbf" dependencies = [ "deadpool-runtime", ] @@ -1290,10 +1327,6 @@ name = "decancer" version = "3.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9244323129647178bf41ac861a2cdb9d9c81b9b09d3d0d1de9cd302b33b8a1d" -dependencies = [ - "lazy_static 1.5.0", - "regex", -] [[package]] name = "delegate-display" @@ -1470,15 +1503,15 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "objc2", ] [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", @@ -1500,6 +1533,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "ed25519" version = "2.2.3" @@ -1542,7 +1581,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9e9e99679670f67825fcd24a23cb4eb655a0f92c82bd4d1c1a1357c0cd71e87" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "editor-types-macros", "keybindings", "regex", @@ -1573,17 +1612,17 @@ dependencies = [ [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "emojis" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c1c1870b766fc398e5f0526498d09c94b6de15be5fd769a28bbc804fb1b05d" +checksum = "0a4d5d50b0b58df5173d8ff1192b4d1422ceae5d981b30d4b6f8ed1d673a2bc4" dependencies = [ - "phf 0.13.1", + "phf", ] [[package]] @@ -1761,23 +1800,9 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "fax" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" -dependencies = [ - "fax_derive", -] - -[[package]] -name = "fax_derive" -version = "0.2.0" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] +checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a" [[package]] name = "fdeflate" @@ -1846,21 +1871,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -1881,14 +1891,10 @@ dependencies = [ ] [[package]] -name = "futf" -version = "0.1.5" +name = "fs_extra" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" @@ -2054,18 +2060,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi 6.0.0", - "rand_core 0.10.0", + "rand_core 0.10.1", "wasip2", "wasip3", + "wasm-bindgen", ] [[package]] name = "gif" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e" +checksum = "ee8cfcc411d9adbbaba82fb72661cc1bcca13e8bba98b364e62b2dba8f960159" dependencies = [ "color_quant", "weezl", @@ -2110,9 +2118,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" dependencies = [ "atomic-waker", "bytes", @@ -2151,9 +2159,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "hashlink" @@ -2164,30 +2172,6 @@ dependencies = [ "hashbrown 0.15.5", ] -[[package]] -name = "headers" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb" -dependencies = [ - "base64", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" -dependencies = [ - "http", -] - [[package]] name = "heck" version = "0.5.0" @@ -2235,44 +2219,24 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" -dependencies = [ - "log", - "markup5ever 0.35.0", - "match_token", -] - -[[package]] -name = "html5ever" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2" +checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8" dependencies = [ "log", - "markup5ever 0.38.0", + "markup5ever", ] [[package]] name = "http" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", "itoa", ] -[[package]] -name = "http-auth" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150fa4a9462ef926824cf4519c84ed652ca8f4fbae34cb8af045b5cbcaf98822" -dependencies = [ - "memchr", -] - [[package]] name = "http-body" version = "1.0.1" @@ -2319,9 +2283,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" dependencies = [ "atomic-waker", "bytes", @@ -2341,35 +2305,17 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.7" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ "http", "hyper", "hyper-util", "rustls", - "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", ] [[package]] @@ -2400,7 +2346,7 @@ name = "iamb" version = "0.0.11" dependencies = [ "anyhow", - "bitflags 2.11.0", + "bitflags 2.13.0", "chrono", "clap", "comrak", @@ -2411,7 +2357,7 @@ dependencies = [ "feruca", "futures", "gethostname", - "html5ever 0.38.0", + "html5ever", "humansize", "image", "lazy_static 1.5.0", @@ -2428,7 +2374,7 @@ dependencies = [ "notify-rust", "open", "pretty_assertions", - "rand 0.10.0", + "rand 0.10.1", "ratatui", "ratatui-image", "regex", @@ -2440,7 +2386,7 @@ dependencies = [ "temp-dir", "thiserror 2.0.18", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "tracing-appender", "tracing-subscriber", @@ -2587,9 +2533,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" dependencies = [ "icu_normalizer", "icu_properties", @@ -2655,9 +2601,9 @@ dependencies = [ [[package]] name = "imgref" -version = "1.12.0" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" +checksum = "89194689a993ab15268672e99e7b0e19da2da3268ac682e8f02d29d4d1434cd7" [[package]] name = "impartial-ord" @@ -2691,12 +2637,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "serde", "serde_core", ] @@ -2768,16 +2714,6 @@ version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" -[[package]] -name = "iri-string" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "is-docker" version = "0.2.0" @@ -2842,6 +2778,55 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys", + "log", + "simd_cesu8", + "thiserror 2.0.18", + "walkdir", + "windows-link 0.2.1", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn 2.0.117", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.117", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -2854,13 +2839,12 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.94" +version = "0.3.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9" +checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" dependencies = [ "cfg-if", "futures-util", - "once_cell", "wasm-bindgen", ] @@ -2895,21 +2879,11 @@ dependencies = [ [[package]] name = "konst" -version = "0.3.16" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4381b9b00c55f251f2ebe9473aef7c117e96828def1a7cb3bd3f0f903c6894e9" +checksum = "f660d5f887e3562f9ab6f4a14988795b694099d66b4f5dedc02d197ba9becb1d" dependencies = [ "const_panic", - "konst_kernel", - "typewit", -] - -[[package]] -name = "konst_kernel" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4b1eb7788f3824c629b1116a7a9060d6e898c358ebff59070093d51103dcc3c" -dependencies = [ "typewit", ] @@ -2945,15 +2919,15 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.184" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libfuzzer-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12a681b7dd8ce12bff52488013ba614b869148d54dd79836ab85aafdd53f08d" +checksum = "a9fd2f41a1cba099f79a0b6b6c35656cf7c03351a7bae8ff0f28f25270f929d2" dependencies = [ "arbitrary", "cc", @@ -2967,9 +2941,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" +checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" dependencies = [ "libc", ] @@ -2987,9 +2961,9 @@ dependencies = [ [[package]] name = "linkify" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780" +checksum = "92f9ae2f3d31697697311f016320fe984127e636b45cf5eb5c175b7eb103dadb" dependencies = [ "memchr", ] @@ -3029,9 +3003,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" [[package]] name = "loop9" @@ -3057,17 +3031,11 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - [[package]] name = "mac-notification-sys" -version = "0.6.12" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a16783dd1a47849b8c8133c9cd3eb2112cfbc6901670af3dba47c8bbfb07d3" +checksum = "50efa634682b3fc5a1ab6f3dd5b2bce7b848011fc485b53b063dc68f2f74feae" dependencies = [ "cc", "objc2", @@ -3131,49 +3099,27 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "markup5ever" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" -dependencies = [ - "log", - "tendril 0.4.3", - "web_atoms 0.1.3", -] - -[[package]] -name = "markup5ever" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862" +checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de" dependencies = [ "log", - "tendril 0.5.0", - "web_atoms 0.2.3", + "tendril", + "web_atoms", ] [[package]] name = "markup5ever_rcdom" -version = "0.38.0+unofficial" +version = "0.39.0+unofficial" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333171ccdf66e915257740d44e38ea5b1b19ce7b45d33cc35cb6f118fbd981ff" +checksum = "3ac010f19d6c4af81eeb4018a39d7a115de9d285af45c126a4ac02e6fc5716b7" dependencies = [ - "html5ever 0.38.0", - "markup5ever 0.38.0", - "tendril 0.5.0", + "html5ever", + "markup5ever", + "tendril", "xml5ever", ] -[[package]] -name = "match_token" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "matchers" version = "0.2.0" @@ -3214,14 +3160,15 @@ dependencies = [ [[package]] name = "matrix-sdk" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b33f9bc45edd7f8e25161521fdd30654da5c55e6749be6afa1aa9d6cf838ace0" +checksum = "7083d580527511ac5d9369e03b9f2b20902e76949f1b3964051f978e4d3756ae" dependencies = [ "anymap2", "aquamarine", "as_variant", "async-channel", + "async-once-cell", "async-stream", "async-trait", "axum", @@ -3248,12 +3195,15 @@ dependencies = [ "mime", "mime2ext", "oauth2", - "once_cell", + "oauth2-reqwest", "percent-encoding", "pin-project-lite", - "rand 0.8.5", + "rand 0.10.1", "reqwest", "ruma", + "rustls", + "rustls-native-certs", + "rustls-pki-types", "serde", "serde_html_form", "serde_json", @@ -3268,18 +3218,19 @@ dependencies = [ "url", "urlencoding", "vodozemac", + "webpki-roots", "zeroize", ] [[package]] name = "matrix-sdk-base" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f404a390ff98a73c426b1496b169be60ce6a93723a9a664e579d978a84c5e4" +checksum = "e09a917eb1f7643d9d9a06b2f131e2ceb39df6910a7b830dac18bfd6db37a1f5" dependencies = [ "as_variant", "async-trait", - "bitflags 2.11.0", + "bitflags 2.13.0", "decancer", "eyeball", "eyeball-im", @@ -3288,7 +3239,6 @@ dependencies = [ "matrix-sdk-common", "matrix-sdk-crypto", "matrix-sdk-store-encryption", - "once_cell", "regex", "ruma", "serde", @@ -3301,9 +3251,9 @@ dependencies = [ [[package]] name = "matrix-sdk-common" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54fae2bdfc3d760d21a84d6d2036b5db5c48d9a3dee3794119e3fb9c4cc4ccc5" +checksum = "2b9d1e0fee0f090180ef9457034adc547e80de9e6e3eb2e63aaac68a8476f836" dependencies = [ "eyeball-im", "futures-core", @@ -3325,9 +3275,9 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304fc576810a9618bb831c4ad6403c758ec424f677668a49a196e3cde4b8f99f" +checksum = "c54afd2a326f51c13a6ad44ec86315a688fffeb3f1e287fb343e0e1836a3bdaf" dependencies = [ "aes", "aquamarine", @@ -3346,7 +3296,7 @@ dependencies = [ "js_option", "matrix-sdk-common", "pbkdf2", - "rand 0.8.5", + "rand 0.10.1", "rmp-serde", "ruma", "serde", @@ -3366,14 +3316,14 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6096084cc8d339c03e269ca25534d0f1e88d0097c35a215eb8c311797ec3e9" +checksum = "fef37395fffb7c916f7109ab0d16d8ca599403dd8164d08c0d966176b66ede47" dependencies = [ "async-trait", "base64", "futures-util", - "getrandom 0.2.17", + "getrandom 0.4.2", "gloo-utils", "hkdf", "js-sys", @@ -3398,9 +3348,9 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4325742fc06b7f75c80eec39e8fb32b06ea4b09b7aa1d432b67b01d08fbacc28" +checksum = "a49133429271005745f8d5a05362d2ba6567274777250236799927ca30dc0670" dependencies = [ "as_variant", "async-trait", @@ -3426,17 +3376,18 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162a93e83114d5cef25c0ebaea72aa01b9f233df6ec4a2af45f175d01ec26323" +checksum = "2f48f304e553fb6200b1d7d1f77a88fd182076d4b25624e9dbfa42d6a37de35e" dependencies = [ "base64", "blake3", "chacha20poly1305", "getrandom 0.2.17", + "getrandom 0.4.2", "hmac", "pbkdf2", - "rand 0.8.5", + "rand 0.10.1", "rmp-serde", "serde", "serde_json", @@ -3496,9 +3447,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" [[package]] name = "memoffset" @@ -3549,9 +3500,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", "log", @@ -3567,7 +3518,7 @@ checksum = "09c80ba31e8c8ae56606acf6d7b03b9e316779714489e9952f7d9ee07b909aee" dependencies = [ "anymap2", "arboard", - "bitflags 2.11.0", + "bitflags 2.13.0", "crossterm 0.29.0", "derive_more 0.99.20", "editor-types", @@ -3608,23 +3559,6 @@ dependencies = [ "pxfm", ] -[[package]] -name = "native-tls" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -3641,7 +3575,16 @@ dependencies = [ ] [[package]] -name = "nom" +name = "no_std_io2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418abd1b6d34fbf6cae440dc874771b0525a604428704c76e48b29a5e67b8003" +dependencies = [ + "memchr", +] + +[[package]] +name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" @@ -3667,9 +3610,9 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "notify-rust" -version = "4.14.0" +version = "4.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2c9bc1689653cfbc04400b8719f2562638ff9c545bbd48cc58c657a14526df" +checksum = "50ff2e74231b72c832d82982193b417f230945be6bdb5575b251d941d31adb00" dependencies = [ "futures-lite", "log", @@ -3700,9 +3643,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-derive" @@ -3773,8 +3716,7 @@ dependencies = [ "chrono", "getrandom 0.2.17", "http", - "rand 0.8.5", - "reqwest", + "rand 0.8.6", "serde", "serde_json", "serde_path_to_error", @@ -3783,6 +3725,16 @@ dependencies = [ "url", ] +[[package]] +name = "oauth2-reqwest" +version = "0.1.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234fb5c965bbce983ee5de636a7a51d6a3223da8067ea02f9ab2d2d78ac08be2" +dependencies = [ + "oauth2", + "reqwest", +] + [[package]] name = "objc2" version = "0.6.4" @@ -3798,7 +3750,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "objc2", "objc2-core-graphics", "objc2-foundation", @@ -3810,7 +3762,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "dispatch2", "objc2", ] @@ -3821,7 +3773,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "dispatch2", "objc2", "objc2-core-foundation", @@ -3840,7 +3792,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "block2", "libc", "objc2", @@ -3853,7 +3805,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "objc2", "objc2-core-foundation", ] @@ -3878,59 +3830,21 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open" -version = "5.3.3" +version = "5.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc" +checksum = "2fbaa89d2ddc8473c78a3adf69eea8cffa28c483b8e02a971ef31527cd0fc92c" dependencies = [ "is-wsl", "libc", "pathdiff", ] -[[package]] -name = "openssl" -version = "0.10.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf" -dependencies = [ - "bitflags 2.11.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "openssl-probe" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" -[[package]] -name = "openssl-sys" -version = "0.9.112" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -4042,7 +3956,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", - "hmac", ] [[package]] @@ -4062,53 +3975,24 @@ dependencies = [ "indexmap", ] -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_shared 0.11.3", -] - [[package]] name = "phf" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_shared 0.13.1", + "phf_shared", "serde", ] -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", -] - [[package]] name = "phf_codegen" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" dependencies = [ - "phf_generator 0.13.1", - "phf_shared 0.13.1", -] - -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared 0.11.3", - "rand 0.8.5", + "phf_generator", + "phf_shared", ] [[package]] @@ -4118,16 +4002,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", - "phf_shared 0.13.1", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher", + "phf_shared", ] [[package]] @@ -4168,9 +4043,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] name = "png" @@ -4178,7 +4053,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "crc32fast", "fdeflate", "flate2", @@ -4301,18 +4176,18 @@ dependencies = [ [[package]] name = "profiling" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773" +checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5" dependencies = [ "profiling-procmacros", ] [[package]] name = "profiling-procmacros" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" +checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb" dependencies = [ "quote", "syn 2.0.117", @@ -4320,9 +4195,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.13.5" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1" dependencies = [ "bytes", "prost-derive", @@ -4330,9 +4205,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.13.5" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" dependencies = [ "anyhow", "itertools 0.14.0", @@ -4343,9 +4218,9 @@ dependencies = [ [[package]] name = "pxfm" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d" +checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f" [[package]] name = "qoi" @@ -4373,9 +4248,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.2" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" +checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", ] @@ -4406,10 +4281,11 @@ version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" dependencies = [ + "aws-lc-rs", "bytes", "getrandom 0.3.4", "lru-slab", - "rand 0.9.2", + "rand 0.9.4", "ring", "rustc-hash", "rustls", @@ -4468,9 +4344,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -4479,9 +4355,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.5", @@ -4489,13 +4365,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ "chacha20 0.10.0", "getrandom 0.4.2", - "rand_core 0.10.0", + "rand_core 0.10.1", ] [[package]] @@ -4538,9 +4414,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rand_xoshiro" @@ -4557,7 +4433,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "cassowary", "compact_str", "crossterm 0.28.1", @@ -4581,7 +4457,7 @@ dependencies = [ "base64-simd", "icy_sixel", "image", - "rand 0.8.5", + "rand 0.8.6", "ratatui", "rustix 0.38.44", "serde", @@ -4616,7 +4492,7 @@ dependencies = [ "num-traits", "paste", "profiling", - "rand 0.9.2", + "rand 0.9.4", "rand_chacha 0.9.0", "simd_helpers", "thiserror 2.0.18", @@ -4641,9 +4517,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -4689,7 +4565,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", ] [[package]] @@ -4705,9 +4581,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.3" +version = "1.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" dependencies = [ "aho-corasick", "memchr", @@ -4728,15 +4604,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "reqwest" -version = "0.12.28" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" dependencies = [ "base64", "bytes", @@ -4748,22 +4624,17 @@ dependencies = [ "http-body-util", "hyper", "hyper-rustls", - "hyper-tls", "hyper-util", "js-sys", "log", - "native-tls", "percent-encoding", "pin-project-lite", "quinn", "rustls", "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", + "rustls-platform-verifier", "sync_wrapper", "tokio", - "tokio-native-tls", "tokio-rustls", "tokio-util", "tower", @@ -4774,7 +4645,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", ] [[package]] @@ -4828,30 +4698,30 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.4.0" +version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d4c8b64f049c6721ec8ccec37ddfc3d641c4a7fca57e8f2a89de509c73df39" +checksum = "2da316a15f47e3d053de9cb2c439650bd8fa4aaeb9365f2e5f27f492ff73c196" dependencies = [ "libc", "rtoolbox", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rtoolbox" -version = "0.0.3" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cc970b249fbe527d6e02e0a227762c9108b2f49d81094fe357ffc6d14d7f6f" +checksum = "50a0e551c1e27e1731aba276dbeaeac73f53c7cd34d1bda485d02bd1e0f36844" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "ruma" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f620a2116d0d3082f9256e61dcdf67f2ec266d3f6bb9d2f9c8a20ec5a1fabb" +checksum = "ee4fe5bfacdb0e95e733da3b6c37d98edf46447a4a8e8dea824e0da266d8ad59" dependencies = [ "assign", "js_int", @@ -4859,21 +4729,19 @@ dependencies = [ "ruma-client-api", "ruma-common", "ruma-events", - "ruma-federation-api", "ruma-html", "web-time", ] [[package]] name = "ruma-client-api" -version = "0.22.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc977d1a91ea15dcf896cbd7005ed4a253784468833638998109ffceaee53e7" +checksum = "bf7ca43a888ca569168d7e3901f4dd14a777b860bb19f4c08e35414162eb261c" dependencies = [ "as_variant", "assign", "bytes", - "date_header", "http", "js_int", "js_option", @@ -4890,22 +4758,22 @@ dependencies = [ [[package]] name = "ruma-common" -version = "0.17.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a01993f22d291320b7c9267675e7395775e95269ff526e2c8c3ed5e13175b" +checksum = "2c3b4f00112791b490acce57df1ce3eb3f88899b045bebcff8a29f75369640cc" dependencies = [ "as_variant", "base64", "bytes", + "date_header", "form_urlencoded", - "getrandom 0.2.17", + "getrandom 0.4.2", "http", "indexmap", - "js-sys", "js_int", "konst", "percent-encoding", - "rand 0.8.5", + "rand 0.10.1", "regex", "ruma-identifiers-validation", "ruma-macros", @@ -4924,66 +4792,42 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dbdeccb62cb4ffe3282325de8ba28cbc0fdce7c78a3f11b7241fbfdb9cb9907" +checksum = "85d2f90830fc131691349b96a69ff53444eb6c3e8dc7869c77961b43cfaf3344" dependencies = [ "as_variant", "indexmap", "js_int", "js_option", - "percent-encoding", - "regex", "ruma-common", - "ruma-identifiers-validation", "ruma-macros", "serde", "serde_json", "thiserror 2.0.18", "tracing", - "url", "web-time", "wildmatch", "zeroize", ] -[[package]] -name = "ruma-federation-api" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb45c15badbf4299c6113a6b90df3e7cb64edbe756bbd8e0224144b56b38305" -dependencies = [ - "headers", - "http", - "http-auth", - "js_int", - "mime", - "ruma-common", - "ruma-events", - "ruma-signatures", - "serde", - "serde_json", - "thiserror 2.0.18", - "tracing", -] - [[package]] name = "ruma-html" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6dcd6e9823e177d15460d3cd3a413f38a2beea381f26aca1001c05cd6954ff" +checksum = "48d33a944650f4bbd2188dd204d39dd87a9a1498f14b3a13252910c90ed7cd43" dependencies = [ "as_variant", - "html5ever 0.35.0", + "html5ever", "tracing", "wildmatch", ] [[package]] name = "ruma-identifiers-validation" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9c6b5643060beec0fc9d7acfb41d2c5d91e1591db440ff62361d178e77c35fe" +checksum = "9d6cff00317675f487c4e7ccfb18875a14c5a14867b51d13f2a826053f03c432" dependencies = [ "js_int", "thiserror 2.0.18", @@ -4991,9 +4835,9 @@ dependencies = [ [[package]] name = "ruma-macros" -version = "0.17.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0753312ad577ac462de1742bf2e326b6ba9856ff6f13343aeb17d423fd5426" +checksum = "c8cfb39eaa9b9fd389126ff941e060b496add5cbbfef559d80c46e571dda459c" dependencies = [ "as_variant", "cfg-if", @@ -5003,23 +4847,7 @@ dependencies = [ "ruma-identifiers-validation", "serde", "syn 2.0.117", - "toml 0.9.12+spec-1.1.0", -] - -[[package]] -name = "ruma-signatures" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146ace2cd59b60ec80d3e801a84e7e6a91e3e01d18a9f5d896ea7ca16a6b8e08" -dependencies = [ - "base64", - "ed25519-dalek", - "pkcs8", - "rand 0.8.5", - "ruma-common", - "serde_json", - "sha2", - "thiserror 2.0.18", + "toml", ] [[package]] @@ -5028,7 +4856,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -5057,7 +4885,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "errno", "libc", "linux-raw-sys 0.4.15", @@ -5070,7 +4898,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "errno", "libc", "linux-raw-sys 0.12.1", @@ -5079,34 +4907,75 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.37" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ + "aws-lc-rs", + "log", "once_cell", - "ring", "rustls-pki-types", "rustls-webpki", "subtle", "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pki-types" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" dependencies = [ "web-time", "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" -version = "0.103.10" +version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -5124,6 +4993,15 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.29" @@ -5156,7 +5034,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "core-foundation", "core-foundation-sys", "libc", @@ -5232,9 +5110,9 @@ dependencies = [ [[package]] name = "serde_html_form" -version = "0.2.8" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2f2d7ff8a2140333718bb329f5c40fc5f0865b84c426183ce14c97d2ab8154f" +checksum = "0946d52b4b7e28823148aebbeceb901012c595ad737920d504fa8634bb099e6f" dependencies = [ "form_urlencoded", "indexmap", @@ -5245,9 +5123,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", @@ -5299,17 +5177,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest", -] - [[package]] name = "sha2" version = "0.10.9" @@ -5341,9 +5208,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "signal-hook" @@ -5391,6 +5258,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +[[package]] +name = "simd_cesu8" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +dependencies = [ + "rustc_version", + "simdutf8", +] + [[package]] name = "simd_helpers" version = "0.1.0" @@ -5400,11 +5277,17 @@ dependencies = [ "quote", ] +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "siphasher" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "slab" @@ -5430,9 +5313,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" dependencies = [ "serde", ] @@ -5445,9 +5328,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", "windows-sys 0.61.2", @@ -5481,19 +5364,6 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6" -[[package]] -name = "string_cache" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" -dependencies = [ - "new_debug_unreachable", - "parking_lot 0.12.5", - "phf_shared 0.11.3", - "precomputed-hash", - "serde", -] - [[package]] name = "string_cache" version = "0.9.0" @@ -5502,31 +5372,19 @@ checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901" dependencies = [ "new_debug_unreachable", "parking_lot 0.12.5", - "phf_shared 0.13.1", + "phf_shared", "precomputed-hash", "serde", ] -[[package]] -name = "string_cache_codegen" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", - "proc-macro2", - "quote", -] - [[package]] name = "string_cache_codegen" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69" dependencies = [ - "phf_generator 0.13.1", - "phf_shared 0.13.1", + "phf_generator", + "phf_shared", "proc-macro2", "quote", ] @@ -5565,6 +5423,12 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "symlink" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" + [[package]] name = "syn" version = "1.0.109" @@ -5638,17 +5502,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - [[package]] name = "tendril" version = "0.5.0" @@ -5793,9 +5646,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.51.0" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", @@ -5817,16 +5670,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.4" @@ -5862,19 +5705,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.9.12+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" -dependencies = [ - "serde_core", - "serde_spanned", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "winnow 0.7.15", -] - [[package]] name = "toml" version = "1.1.2+spec-1.1.0" @@ -5884,19 +5714,10 @@ dependencies = [ "indexmap", "serde_core", "serde_spanned", - "toml_datetime 1.1.1+spec-1.1.0", + "toml_datetime", "toml_parser", "toml_writer", - "winnow 1.0.1", -] - -[[package]] -name = "toml_datetime" -version = "0.7.5+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" -dependencies = [ - "serde_core", + "winnow", ] [[package]] @@ -5910,14 +5731,14 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.10+spec-1.1.0" +version = "0.25.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b" +checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" dependencies = [ "indexmap", - "toml_datetime 1.1.1+spec-1.1.0", + "toml_datetime", "toml_parser", - "winnow 1.0.1", + "winnow", ] [[package]] @@ -5926,7 +5747,7 @@ version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow 1.0.1", + "winnow", ] [[package]] @@ -5953,25 +5774,25 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "async-compression", - "bitflags 2.11.0", + "bitflags 2.13.0", "bytes", "futures-core", "futures-util", "http", "http-body", "http-body-util", - "iri-string", "pin-project-lite", "tokio", "tokio-util", "tower", "tower-layer", "tower-service", + "url", ] [[package]] @@ -6000,11 +5821,12 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" +checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c" dependencies = [ "crossbeam-channel", + "symlink", "thiserror 2.0.18", "time", "tracing-subscriber", @@ -6085,24 +5907,15 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "typewit" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19094686c694eb41b3b99dcc2f2975d4b078512fa22ae6c63f7ca318bdcff7" -dependencies = [ - "typewit_proc_macros", -] - -[[package]] -name = "typewit_proc_macros" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" +checksum = "214ca0b2191785cbc06209b9ca1861e048e39b5ba33574b3cedd58363d5bb5f6" [[package]] name = "uds_windows" @@ -6121,7 +5934,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "470dbf6591da1b39d43c14523b2b469c86879a53e8b758c8e090a470fe7b1fbe" dependencies = [ - "rand 0.9.2", + "rand 0.9.4", "web-time", ] @@ -6160,9 +5973,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.13.2" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" +checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-truncate" @@ -6254,9 +6067,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.0" +version = "1.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" +checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" dependencies = [ "getrandom 0.4.2", "js-sys", @@ -6339,9 +6152,9 @@ checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" [[package]] name = "vodozemac" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022a277687e4e8685d72b95a7ca3ccfec907daa946678e715f8badaa650883d" +checksum = "b98bf83c0992966775b8012f194b07b44928996163e5a05b741b43891571ae5b" dependencies = [ "aes", "arrayvec", @@ -6356,7 +6169,7 @@ dependencies = [ "hmac", "matrix-pickle", "prost", - "rand 0.8.5", + "rand 0.8.6", "serde", "serde_bytes", "serde_json", @@ -6373,6 +6186,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -6390,11 +6213,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.4+wasi-0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", ] [[package]] @@ -6403,14 +6226,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.51.0", ] [[package]] name = "wasm-bindgen" -version = "0.2.117" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0" +checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" dependencies = [ "cfg-if", "once_cell", @@ -6421,9 +6244,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.67" +version = "0.4.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e" +checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280" dependencies = [ "js-sys", "wasm-bindgen", @@ -6431,9 +6254,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.117" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be" +checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6441,9 +6264,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.117" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2" +checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" dependencies = [ "bumpalo", "proc-macro2", @@ -6454,9 +6277,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.117" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b" +checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" dependencies = [ "unicode-ident", ] @@ -6485,9 +6308,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" dependencies = [ "futures-util", "js-sys", @@ -6520,7 +6343,7 @@ version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "hashbrown 0.15.5", "indexmap", "semver", @@ -6545,7 +6368,7 @@ version = "0.31.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "rustix 1.1.4", "wayland-backend", "wayland-scanner", @@ -6557,7 +6380,7 @@ version = "0.32.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -6569,7 +6392,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6583,7 +6406,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a" dependencies = [ "proc-macro2", - "quick-xml 0.39.2", + "quick-xml 0.39.4", "quote", ] @@ -6598,9 +6421,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.94" +version = "0.3.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a" +checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d" dependencies = [ "js-sys", "wasm-bindgen", @@ -6619,33 +6442,30 @@ dependencies = [ [[package]] name = "web_atoms" -version = "0.1.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414" +checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538" dependencies = [ - "phf 0.11.3", - "phf_codegen 0.11.3", - "string_cache 0.8.9", - "string_cache_codegen 0.5.4", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", ] [[package]] -name = "web_atoms" -version = "0.2.3" +name = "webpki-root-certs" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a9779e9f04d2ac1ce317aee707aa2f6b773afba7b931222bff6983843b1576" +checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" dependencies = [ - "phf 0.13.1", - "phf_codegen 0.13.1", - "string_cache 0.9.0", - "string_cache_codegen 0.6.1", + "rustls-pki-types", ] [[package]] name = "webpki-roots" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" dependencies = [ "rustls-pki-types", ] @@ -6690,6 +6510,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -7084,18 +6913,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" dependencies = [ "memchr", ] @@ -7109,6 +6929,12 @@ dependencies = [ "wit-bindgen-rust-macro", ] +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "wit-bindgen-core" version = "0.51.0" @@ -7158,7 +6984,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", - "bitflags 2.11.0", + "bitflags 2.13.0", "indexmap", "log", "serde", @@ -7243,12 +7069,12 @@ dependencies = [ [[package]] name = "xml5ever" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dc9559429edf0cd3f327cc0afd9d6b36fa8cec6d93107b7fbe64f806b5f2d9" +checksum = "5ab627f34ff61b80d756180d556f9c68801d836d271b3b8c094504ceca69d221" dependencies = [ "log", - "markup5ever 0.38.0", + "markup5ever", ] [[package]] @@ -7271,9 +7097,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -7294,9 +7120,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.14.0" +version = "5.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc" +checksum = "eee682d202a77e4a9f3b2c2bdf48a7b28af5c08c34ddf66f98c93e5e39464285" dependencies = [ "async-broadcast", "async-executor", @@ -7321,7 +7147,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 0.7.15", + "winnow", "zbus_macros", "zbus_names", "zvariant", @@ -7329,9 +7155,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.14.0" +version = "5.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222" +checksum = "adf1bd45a81a103745b1757754762a26e8cd01e4532e4d6c8ec431624b80d1d6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7344,29 +7170,29 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f" +checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d" dependencies = [ "serde", - "winnow 0.7.15", + "winnow", "zvariant", ] [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" dependencies = [ "proc-macro2", "quote", @@ -7375,9 +7201,9 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] @@ -7396,18 +7222,18 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" +checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" dependencies = [ "proc-macro2", "quote", @@ -7479,23 +7305,23 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.10.0" +version = "5.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b" +checksum = "a192a0bde63360d77a7523c833d4b4ce6070a927e2c53246e4c540b1a3e27be0" dependencies = [ "endi", "enumflags2", "serde", - "winnow 0.7.15", + "winnow", "zvariant_derive", "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "5.10.0" +version = "5.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c" +checksum = "90bc6cde9c01c511074be97f7ccb6c19d0da89e3f8662e812e999dcfd4638737" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7506,13 +7332,13 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9" +checksum = "1e8535915cfa75547e559d8c68e8139909a4aeee076831e4ef7fc59d8172c4d6" dependencies = [ "proc-macro2", "quote", "serde", "syn 2.0.117", - "winnow 0.7.15", + "winnow", ] diff --git a/Cargo.toml b/Cargo.toml index d967d8c7..a77e3784 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,15 +11,13 @@ license = "Apache-2.0" exclude = [".github", "CONTRIBUTING.md"] keywords = ["matrix", "chat", "tui", "vim"] categories = ["command-line-utilities"] -rust-version = "1.92" +rust-version = "1.93" build = "build.rs" [features] default = ["bundled", "desktop"] -bundled = ["matrix-sdk/bundled-sqlite", "rustls-tls"] +bundled = ["matrix-sdk/bundled-sqlite"] desktop = ["dep:notify-rust", "modalkit/clipboard"] -native-tls = ["matrix-sdk/native-tls"] -rustls-tls = ["matrix-sdk/rustls-tls"] [build-dependencies.vergen-gitcl] version = "9" @@ -38,12 +36,12 @@ emojis = "0.8" feruca = "0.11" futures = "0.3" gethostname = "1.1" -html5ever = "0.38.0" +html5ever = "0.39.0" humansize = "2.0.0" image = "0.25.6" libc = "0.2" -linkify = "0.10.0" -markup5ever_rcdom = "0.38" +linkify = "0.11.0" +markup5ever_rcdom = "0.39" mime = "0.3.16" mime_guess = "2.0.4" nom = "8.0" @@ -88,12 +86,12 @@ version = "0.0.25" #rev = "e40dbb0bfeabe4cfd08facd2acb446080a330d75" [dependencies.matrix-sdk] -version = "0.16.0" +version = "0.18.0" default-features = false features = ["e2e-encryption", "sqlite", "sso-login"] [dependencies.matrix-sdk-crypto] -version = "0.16.0" +version = "0.18.0" [dependencies.tokio] version = "1.24.1" diff --git a/flake.lock b/flake.lock index 49d8ee58..1a7f0840 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1759893430, - "narHash": "sha256-yAy4otLYm9iZ+NtQwTMEbqHwswSFUbhn7x826RR6djw=", + "lastModified": 1780532242, + "narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=", "owner": "ipetkov", "repo": "crane", - "rev": "1979a2524cb8c801520bd94c38bb3d5692419d93", + "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1760510549, - "narHash": "sha256-NP+kmLMm7zSyv4Fufv+eSJXyqjLMUhUfPT6lXRlg/bU=", + "lastModified": 1781260166, + "narHash": "sha256-vKKEJke8kswPWPu/J/giMA92VFrVNWQn7x6TwRmJHBo=", "owner": "nix-community", "repo": "fenix", - "rev": "ef7178cf086f267113b5c48fdeb6e510729c8214", + "rev": "a257e130673b0a1caa7137bf0896169910efdd5a", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1760457219, - "narHash": "sha256-WJOUGx42hrhmvvYcGkwea+BcJuQJLcns849OnewQqX4=", + "lastModified": 1781193851, + "narHash": "sha256-Pz4G9dV3Cy9L2Gtl8dMrHlwPa8Oy+vE8NIXmd2b6ZVo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8747cf81540bd1bbbab9ee2702f12c33aa887b46", + "rev": "dc0ac97934098a20224a4638f39ae88fa97e9b88", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 41895dea..a38b0897 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ rustToolchain = fenix.packages.${system}.fromToolchainFile { file = ./rust-toolchain.toml; # When the file changes, this hash must be updated. - sha256 = "sha256-sqSWJDUxc+zaz1nBWMAJKTAGBuGWP25GCftIOlCEAtA="; + sha256 = "sha256-SBKjxhC6zHTu0SyJwxLlQHItzMzYZ71VCWQC2hOzpRY="; }; # Nightly toolchain for rustfmt (pinned to current flake lock) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 951fceff..06dbe8ff 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.92" +channel = "1.93" components = [ "clippy" ] diff --git a/src/main.rs b/src/main.rs index db2b4ab8..f605b09f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,7 +28,7 @@ use std::sync::Arc; use std::time::{Duration, Instant}; use clap::Parser; -use matrix_sdk::ruma::api::client::error::ErrorKind; +use matrix_sdk::ruma::api::error::ErrorKind; use matrix_sdk::ruma::OwnedUserId; use matrix_sdk_crypto::encrypt_room_key_export; use modalkit::keybindings::InputBindings; diff --git a/src/message/mod.rs b/src/message/mod.rs index 05bc9d26..0fb8c43f 100644 --- a/src/message/mod.rs +++ b/src/message/mod.rs @@ -11,6 +11,7 @@ use std::ops::{Deref, DerefMut}; use chrono::{DateTime, Local as LocalTz}; use humansize::{format_size, DECIMAL}; use matrix_sdk::ruma::events::receipt::ReceiptThread; +use matrix_sdk::ruma::events::AnyRedactionEvent; use unicode_width::UnicodeWidthStr; use matrix_sdk::ruma::{ @@ -560,11 +561,13 @@ fn body_cow_content(content: &RoomMessageEventContent) -> Cow<'_, str> { } fn redaction_reason_unsigned(unsigned: &RedactedUnsigned) -> Option { - unsigned - .redacted_because - .deserialize() - .ok() - .and_then(|ev| ev.content.reason) + let ev = unsigned.redacted_because.deserialize().ok()?; + + let AnyRedactionEvent::RoomRedaction(ev) = ev else { + return None; + }; + + ev.content.reason } fn body_cow_reason(reason: Option<&str>) -> Cow<'static, str> { @@ -864,7 +867,7 @@ impl Message { }; match &content.relates_to { - Some(Relation::Reply { in_reply_to }) => Some(in_reply_to.event_id.clone()), + Some(Relation::Reply(reply)) => Some(reply.in_reply_to.event_id.clone()), Some(Relation::Thread(Thread { in_reply_to: Some(in_reply_to), is_falling_back: false, diff --git a/src/message/state.rs b/src/message/state.rs index 6756140f..ab990513 100644 --- a/src/message/state.rs +++ b/src/message/state.rs @@ -5,9 +5,9 @@ use std::str::FromStr; use matrix_sdk::ruma::{ events::{ room::member::MembershipChange, - AnyFullStateEventContent, + AnyStateEventContentChange, AnySyncStateEvent, - FullStateEventContent, + StateEventContentChange, }, OwnedRoomId, UserId, @@ -23,8 +23,8 @@ fn bold(s: impl Into>) -> StyleTreeNode { } pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { - let event = match ev.content() { - AnyFullStateEventContent::PolicyRuleRoom(FullStateEventContent::Original { + let event = match ev.content_change() { + AnyStateEventContentChange::PolicyRuleRoom(StateEventContentChange::Original { content, .. }) => { @@ -42,7 +42,7 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { m }, - AnyFullStateEventContent::PolicyRuleServer(FullStateEventContent::Original { + AnyStateEventContentChange::PolicyRuleServer(StateEventContentChange::Original { content, .. }) => { @@ -60,7 +60,7 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { m }, - AnyFullStateEventContent::PolicyRuleUser(FullStateEventContent::Original { + AnyStateEventContentChange::PolicyRuleUser(StateEventContentChange::Original { content, .. }) => { @@ -78,22 +78,7 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { m }, - AnyFullStateEventContent::RoomAliases(FullStateEventContent::Original { - content, .. - }) => { - let mut m = String::from("* set the room aliases to: "); - - for (i, alias) in content.aliases.iter().enumerate() { - if i != 0 { - m.push_str(", "); - } - - m.push_str(alias.as_str()); - } - - m - }, - AnyFullStateEventContent::RoomAvatar(FullStateEventContent::Original { + AnyStateEventContentChange::RoomAvatar(StateEventContentChange::Original { content, prev_content, }) => { @@ -112,7 +97,7 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { (None, None) => return Cow::Borrowed("* updated the room avatar state"), } }, - AnyFullStateEventContent::RoomCanonicalAlias(FullStateEventContent::Original { + AnyStateEventContentChange::RoomCanonicalAlias(StateEventContentChange::Original { content, prev_content, }) => { @@ -138,8 +123,9 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { }, } }, - AnyFullStateEventContent::RoomCreate(FullStateEventContent::Original { - content, .. + AnyStateEventContentChange::RoomCreate(StateEventContentChange::Original { + content, + .. }) => { if content.federate { return Cow::Borrowed("* created a federated room"); @@ -147,16 +133,18 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { return Cow::Borrowed("* created a non-federated room"); } }, - AnyFullStateEventContent::RoomEncryption(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::RoomEncryption(StateEventContentChange::Original { + .. + }) => { return Cow::Borrowed("* updated the encryption settings for the room"); }, - AnyFullStateEventContent::RoomGuestAccess(FullStateEventContent::Original { + AnyStateEventContentChange::RoomGuestAccess(StateEventContentChange::Original { content, .. }) => { format!("* set guest access for the room to {:?}", content.guest_access.as_str()) }, - AnyFullStateEventContent::RoomHistoryVisibility(FullStateEventContent::Original { + AnyStateEventContentChange::RoomHistoryVisibility(StateEventContentChange::Original { content, .. }) => { @@ -165,13 +153,13 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { content.history_visibility.as_str() ) }, - AnyFullStateEventContent::RoomJoinRules(FullStateEventContent::Original { + AnyStateEventContentChange::RoomJoinRules(StateEventContentChange::Original { content, .. }) => { format!("* update the join rules for the room to {:?}", content.join_rule.as_str()) }, - AnyFullStateEventContent::RoomMember(FullStateEventContent::Original { + AnyStateEventContentChange::RoomMember(StateEventContentChange::Original { content, prev_content, }) => { @@ -284,25 +272,37 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { }, } }, - AnyFullStateEventContent::RoomName(FullStateEventContent::Original { content, .. }) => { + AnyStateEventContentChange::RoomName(StateEventContentChange::Original { + content, .. + }) => { format!("* updated the room name to {:?}", content.name) }, - AnyFullStateEventContent::RoomPinnedEvents(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::RoomPinnedEvents(StateEventContentChange::Original { + .. + }) => { return Cow::Borrowed("* updated the pinned events for the room"); }, - AnyFullStateEventContent::RoomPowerLevels(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::RoomPolicy(StateEventContentChange::Original { + content, + .. + }) => { + format!("* updated the room policy server to {}", content.via) + }, + AnyStateEventContentChange::RoomPowerLevels(StateEventContentChange::Original { + .. + }) => { return Cow::Borrowed("* updated the power levels for the room"); }, - AnyFullStateEventContent::RoomServerAcl(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::RoomServerAcl(StateEventContentChange::Original { .. }) => { return Cow::Borrowed("* updated the room's server ACLs"); }, - AnyFullStateEventContent::RoomThirdPartyInvite(FullStateEventContent::Original { + AnyStateEventContentChange::RoomThirdPartyInvite(StateEventContentChange::Original { content, .. }) => { format!("* sent a third-party invite to {:?}", content.display_name) }, - AnyFullStateEventContent::RoomTombstone(FullStateEventContent::Original { + AnyStateEventContentChange::RoomTombstone(StateEventContentChange::Original { content, .. }) => { @@ -311,16 +311,18 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { content.replacement_room.as_str() ) }, - AnyFullStateEventContent::RoomTopic(FullStateEventContent::Original { - content, .. + AnyStateEventContentChange::RoomTopic(StateEventContentChange::Original { + content, + .. }) => { format!("* set the room topic to {:?}", content.topic) }, - AnyFullStateEventContent::SpaceChild(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::SpaceChild(StateEventContentChange::Original { .. }) => { format!("* added a space child: {}", ev.state_key()) }, - AnyFullStateEventContent::SpaceParent(FullStateEventContent::Original { - content, .. + AnyStateEventContentChange::SpaceParent(StateEventContentChange::Original { + content, + .. }) => { if content.canonical { format!("* added a canonical parent space: {}", ev.state_key()) @@ -328,14 +330,15 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { format!("* added a parent space: {}", ev.state_key()) } }, - AnyFullStateEventContent::BeaconInfo(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::BeaconInfo(StateEventContentChange::Original { .. }) => { return Cow::Borrowed("* shared beacon information"); }, - AnyFullStateEventContent::CallMember(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::CallMember(StateEventContentChange::Original { .. }) => { return Cow::Borrowed("* updated membership for room call"); }, - AnyFullStateEventContent::MemberHints(FullStateEventContent::Original { - content, .. + AnyStateEventContentChange::MemberHints(StateEventContentChange::Original { + content, + .. }) => { let mut m = String::from("* updated the list of service members in the room hints: "); @@ -351,78 +354,78 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { }, // Redacted variants of state events: - AnyFullStateEventContent::PolicyRuleRoom(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::PolicyRuleRoom(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated a room policy rule (redacted)"); }, - AnyFullStateEventContent::PolicyRuleServer(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::PolicyRuleServer(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated a server policy rule (redacted)"); }, - AnyFullStateEventContent::PolicyRuleUser(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::PolicyRuleUser(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated a user policy rule (redacted)"); }, - AnyFullStateEventContent::RoomAliases(FullStateEventContent::Redacted(_)) => { - return Cow::Borrowed("* updated the room aliases for the room (redacted)"); - }, - AnyFullStateEventContent::RoomAvatar(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomAvatar(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the room avatar (redacted)"); }, - AnyFullStateEventContent::RoomCanonicalAlias(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomCanonicalAlias(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the canonical alias for the room (redacted)"); }, - AnyFullStateEventContent::RoomCreate(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomCreate(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* created the room (redacted)"); }, - AnyFullStateEventContent::RoomEncryption(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomEncryption(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the encryption settings for the room (redacted)"); }, - AnyFullStateEventContent::RoomGuestAccess(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomGuestAccess(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed( "* updated the guest access configuration for the room (redacted)", ); }, - AnyFullStateEventContent::RoomHistoryVisibility(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomHistoryVisibility(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated history visilibity for the room (redacted)"); }, - AnyFullStateEventContent::RoomJoinRules(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomJoinRules(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the join rules for the room (redacted)"); }, - AnyFullStateEventContent::RoomMember(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomMember(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the room membership (redacted)"); }, - AnyFullStateEventContent::RoomName(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomName(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the room name (redacted)"); }, - AnyFullStateEventContent::RoomPinnedEvents(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomPinnedEvents(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the pinned events for the room (redacted)"); }, - AnyFullStateEventContent::RoomPowerLevels(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomPolicy(StateEventContentChange::Redacted(_)) => { + return Cow::Borrowed("* updated the room policy server (redacted)"); + }, + AnyStateEventContentChange::RoomPowerLevels(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the power levels for the room (redacted)"); }, - AnyFullStateEventContent::RoomServerAcl(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomServerAcl(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the room's server ACLs (redacted)"); }, - AnyFullStateEventContent::RoomThirdPartyInvite(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomThirdPartyInvite(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* sent a third-party invite (redacted)"); }, - AnyFullStateEventContent::RoomTombstone(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomTombstone(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* upgraded the room (redacted)"); }, - AnyFullStateEventContent::RoomTopic(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomTopic(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* updated the room topic (redacted)"); }, - AnyFullStateEventContent::SpaceChild(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::SpaceChild(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* added a space child (redacted)"); }, - AnyFullStateEventContent::SpaceParent(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::SpaceParent(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* added a parent space (redacted)"); }, - AnyFullStateEventContent::BeaconInfo(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::BeaconInfo(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("* shared beacon information (redacted)"); }, - AnyFullStateEventContent::CallMember(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::CallMember(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("Call membership changed"); }, - AnyFullStateEventContent::MemberHints(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::MemberHints(StateEventContentChange::Redacted(_)) => { return Cow::Borrowed("Member hints changed"); }, @@ -436,8 +439,8 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> { } pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { - let children = match ev.content() { - AnyFullStateEventContent::PolicyRuleRoom(FullStateEventContent::Original { + let children = match ev.content_change() { + AnyStateEventContentChange::PolicyRuleRoom(StateEventContentChange::Original { content, .. }) => { @@ -455,7 +458,7 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { cs }, - AnyFullStateEventContent::PolicyRuleServer(FullStateEventContent::Original { + AnyStateEventContentChange::PolicyRuleServer(StateEventContentChange::Original { content, .. }) => { @@ -473,7 +476,7 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { cs }, - AnyFullStateEventContent::PolicyRuleUser(FullStateEventContent::Original { + AnyStateEventContentChange::PolicyRuleUser(StateEventContentChange::Original { content, .. }) => { @@ -491,23 +494,7 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { cs }, - AnyFullStateEventContent::RoomAliases(FullStateEventContent::Original { - content, .. - }) => { - let prefix = StyleTreeNode::Text("* set the room aliases to: ".into()); - let mut cs = vec![prefix]; - - for (i, alias) in content.aliases.iter().enumerate() { - if i != 0 { - cs.push(StyleTreeNode::Text(", ".into())); - } - - cs.push(StyleTreeNode::RoomAlias(alias.clone())); - } - - cs - }, - AnyFullStateEventContent::RoomAvatar(FullStateEventContent::Original { + AnyStateEventContentChange::RoomAvatar(StateEventContentChange::Original { content, prev_content, }) => { @@ -528,12 +515,12 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { vec![node] }, - AnyFullStateEventContent::RoomCanonicalAlias(FullStateEventContent::Original { + AnyStateEventContentChange::RoomCanonicalAlias(StateEventContentChange::Original { content, .. }) => { if let Some(canon) = content.alias.as_ref() { - let canon = bold(canon.to_string()); + let canon = StyleTreeNode::RoomAlias(canon.to_owned()); let prefix = StyleTreeNode::Text("* updated the canonical alias for the room to: ".into()); vec![prefix, canon] @@ -543,8 +530,9 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { )] } }, - AnyFullStateEventContent::RoomCreate(FullStateEventContent::Original { - content, .. + AnyStateEventContentChange::RoomCreate(StateEventContentChange::Original { + content, + .. }) => { if content.federate { vec![StyleTreeNode::Text("* created a federated room".into())] @@ -552,12 +540,14 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { vec![StyleTreeNode::Text("* created a non-federated room".into())] } }, - AnyFullStateEventContent::RoomEncryption(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::RoomEncryption(StateEventContentChange::Original { + .. + }) => { vec![StyleTreeNode::Text( "* updated the encryption settings for the room".into(), )] }, - AnyFullStateEventContent::RoomGuestAccess(FullStateEventContent::Original { + AnyStateEventContentChange::RoomGuestAccess(StateEventContentChange::Original { content, .. }) => { @@ -565,7 +555,7 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { let prefix = StyleTreeNode::Text("* set guest access for the room to ".into()); vec![prefix, access] }, - AnyFullStateEventContent::RoomHistoryVisibility(FullStateEventContent::Original { + AnyStateEventContentChange::RoomHistoryVisibility(StateEventContentChange::Original { content, .. }) => { @@ -574,7 +564,7 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { let vis = bold(format!("{:?}", content.history_visibility.as_str())); vec![prefix, vis] }, - AnyFullStateEventContent::RoomJoinRules(FullStateEventContent::Original { + AnyStateEventContentChange::RoomJoinRules(StateEventContentChange::Original { content, .. }) => { @@ -582,7 +572,7 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { let rule = bold(format!("{:?}", content.join_rule.as_str())); vec![prefix, rule] }, - AnyFullStateEventContent::RoomMember(FullStateEventContent::Original { + AnyStateEventContentChange::RoomMember(StateEventContentChange::Original { content, prev_content, }) => { @@ -732,27 +722,41 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { }, } }, - AnyFullStateEventContent::RoomName(FullStateEventContent::Original { content, .. }) => { + AnyStateEventContentChange::RoomName(StateEventContentChange::Original { + content, .. + }) => { let prefix = StyleTreeNode::Text("* updated the room name to ".into()); let name = bold(format!("{:?}", content.name)); vec![prefix, name] }, - AnyFullStateEventContent::RoomPinnedEvents(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::RoomPinnedEvents(StateEventContentChange::Original { + .. + }) => { vec![StyleTreeNode::Text( "* updated the pinned events for the room".into(), )] }, - AnyFullStateEventContent::RoomPowerLevels(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::RoomPolicy(StateEventContentChange::Original { + content, + .. + }) => { + let prefix = StyleTreeNode::Text("* updated the room policy server to ".into()); + let server = bold(format!("{}", content.via)); + vec![prefix, server] + }, + AnyStateEventContentChange::RoomPowerLevels(StateEventContentChange::Original { + .. + }) => { vec![StyleTreeNode::Text( "* updated the power levels for the room".into(), )] }, - AnyFullStateEventContent::RoomServerAcl(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::RoomServerAcl(StateEventContentChange::Original { .. }) => { vec![StyleTreeNode::Text( "* updated the room's server ACLs".into(), )] }, - AnyFullStateEventContent::RoomThirdPartyInvite(FullStateEventContent::Original { + AnyStateEventContentChange::RoomThirdPartyInvite(StateEventContentChange::Original { content, .. }) => { @@ -760,7 +764,7 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { let name = bold(format!("{:?}", content.display_name)); vec![prefix, name] }, - AnyFullStateEventContent::RoomTombstone(FullStateEventContent::Original { + AnyStateEventContentChange::RoomTombstone(StateEventContentChange::Original { content, .. }) => { @@ -768,14 +772,15 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { let room = StyleTreeNode::RoomId(content.replacement_room.clone()); vec![prefix, room] }, - AnyFullStateEventContent::RoomTopic(FullStateEventContent::Original { - content, .. + AnyStateEventContentChange::RoomTopic(StateEventContentChange::Original { + content, + .. }) => { let prefix = StyleTreeNode::Text("* set the room topic to ".into()); let topic = bold(format!("{:?}", content.topic)); vec![prefix, topic] }, - AnyFullStateEventContent::SpaceChild(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::SpaceChild(StateEventContentChange::Original { .. }) => { let prefix = StyleTreeNode::Text("* added a space child: ".into()); let room_id = if let Ok(room_id) = OwnedRoomId::from_str(ev.state_key()) { @@ -786,8 +791,9 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { vec![prefix, room_id] }, - AnyFullStateEventContent::SpaceParent(FullStateEventContent::Original { - content, .. + AnyStateEventContentChange::SpaceParent(StateEventContentChange::Original { + content, + .. }) => { let prefix = if content.canonical { StyleTreeNode::Text("* added a canonical parent space: ".into()) @@ -803,16 +809,17 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { vec![prefix, room_id] }, - AnyFullStateEventContent::BeaconInfo(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::BeaconInfo(StateEventContentChange::Original { .. }) => { vec![StyleTreeNode::Text("* shared beacon information".into())] }, - AnyFullStateEventContent::CallMember(FullStateEventContent::Original { .. }) => { + AnyStateEventContentChange::CallMember(StateEventContentChange::Original { .. }) => { vec![StyleTreeNode::Text( "* updated membership for room call".into(), )] }, - AnyFullStateEventContent::MemberHints(FullStateEventContent::Original { - content, .. + AnyStateEventContentChange::MemberHints(StateEventContentChange::Original { + content, + .. }) => { let prefix = StyleTreeNode::Text( "* updated the list of service members in the room hints: ".into(), @@ -831,116 +838,116 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree { }, // Redacted variants of state events: - AnyFullStateEventContent::PolicyRuleRoom(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::PolicyRuleRoom(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated a room policy rule (redacted)".into(), )] }, - AnyFullStateEventContent::PolicyRuleServer(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::PolicyRuleServer(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated a server policy rule (redacted)".into(), )] }, - AnyFullStateEventContent::PolicyRuleUser(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::PolicyRuleUser(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated a user policy rule (redacted)".into(), )] }, - AnyFullStateEventContent::RoomAliases(FullStateEventContent::Redacted(_)) => { - vec![StyleTreeNode::Text( - "* updated the room aliases for the room (redacted)".into(), - )] - }, - AnyFullStateEventContent::RoomAvatar(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomAvatar(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the room avatar (redacted)".into(), )] }, - AnyFullStateEventContent::RoomCanonicalAlias(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomCanonicalAlias(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the canonical alias for the room (redacted)".into(), )] }, - AnyFullStateEventContent::RoomCreate(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomCreate(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text("* created the room (redacted)".into())] }, - AnyFullStateEventContent::RoomEncryption(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomEncryption(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the encryption settings for the room (redacted)".into(), )] }, - AnyFullStateEventContent::RoomGuestAccess(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomGuestAccess(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the guest access configuration for the room (redacted)".into(), )] }, - AnyFullStateEventContent::RoomHistoryVisibility(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomHistoryVisibility(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated history visilibity for the room (redacted)".into(), )] }, - AnyFullStateEventContent::RoomJoinRules(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomJoinRules(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the join rules for the room (redacted)".into(), )] }, - AnyFullStateEventContent::RoomMember(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomMember(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the room membership (redacted)".into(), )] }, - AnyFullStateEventContent::RoomName(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomName(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the room name (redacted)".into(), )] }, - AnyFullStateEventContent::RoomPinnedEvents(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomPinnedEvents(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the pinned events for the room (redacted)".into(), )] }, - AnyFullStateEventContent::RoomPowerLevels(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomPolicy(StateEventContentChange::Redacted(_)) => { + vec![StyleTreeNode::Text( + "* updated the room policy server (redacted)".into(), + )] + }, + AnyStateEventContentChange::RoomPowerLevels(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the power levels for the room (redacted)".into(), )] }, - AnyFullStateEventContent::RoomServerAcl(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomServerAcl(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the room's server ACLs (redacted)".into(), )] }, - AnyFullStateEventContent::RoomThirdPartyInvite(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomThirdPartyInvite(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* sent a third-party invite (redacted)".into(), )] }, - AnyFullStateEventContent::RoomTombstone(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomTombstone(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text("* upgraded the room (redacted)".into())] }, - AnyFullStateEventContent::RoomTopic(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::RoomTopic(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* updated the room topic (redacted)".into(), )] }, - AnyFullStateEventContent::SpaceChild(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::SpaceChild(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* added a space child (redacted)".into(), )] }, - AnyFullStateEventContent::SpaceParent(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::SpaceParent(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* added a parent space (redacted)".into(), )] }, - AnyFullStateEventContent::BeaconInfo(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::BeaconInfo(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text( "* shared beacon information (redacted)".into(), )] }, - AnyFullStateEventContent::CallMember(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::CallMember(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text("Call membership changed".into())] }, - AnyFullStateEventContent::MemberHints(FullStateEventContent::Redacted(_)) => { + AnyStateEventContentChange::MemberHints(StateEventContentChange::Redacted(_)) => { vec![StyleTreeNode::Text("Member hints changed".into())] }, diff --git a/src/tests.rs b/src/tests.rs index 9213d247..61063ebb 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -18,7 +18,6 @@ use lazy_static::lazy_static; use ratatui::style::{Color, Style}; use serde_json::{Map, Value}; use tokio::sync::mpsc::unbounded_channel; -use url::Url; use crate::{ base::{ChatStore, EventLocation, ProgramStore, RoomInfo}, @@ -56,13 +55,13 @@ lazy_static! { pub static ref TEST_USER3: OwnedUserId = user_id!("@user3:example.com").to_owned(); pub static ref TEST_USER4: OwnedUserId = user_id!("@user4:example.com").to_owned(); pub static ref TEST_USER5: OwnedUserId = user_id!("@user5:example.com").to_owned(); - pub static ref MSG1_EVID: OwnedEventId = EventId::new(server_name!("example.com")); - pub static ref MSG2_EVID: OwnedEventId = EventId::new(server_name!("example.com")); + pub static ref MSG1_EVID: OwnedEventId = EventId::new_v1(server_name!("example.com")); + pub static ref MSG2_EVID: OwnedEventId = EventId::new_v1(server_name!("example.com")); pub static ref MSG3_EVID: OwnedEventId = event_id!("$5jRz3KfVhaUzXtVj7k:example.com").to_owned(); pub static ref MSG4_EVID: OwnedEventId = event_id!("$JP6qFV7WyXk5ZnexM3:example.com").to_owned(); - pub static ref MSG5_EVID: OwnedEventId = EventId::new(server_name!("example.com")); + pub static ref MSG5_EVID: OwnedEventId = EventId::new_v1(server_name!("example.com")); pub static ref MSG1_KEY: MessageKey = (LocalEcho, MSG1_EVID.clone()); pub static ref MSG2_KEY: MessageKey = (OriginServer(UInt::new(1).unwrap()), MSG2_EVID.clone()); pub static ref MSG3_KEY: MessageKey = (OriginServer(UInt::new(2).unwrap()), MSG3_EVID.clone()); @@ -233,8 +232,13 @@ pub fn mock_settings() -> ApplicationSettings { pub async fn mock_store() -> ProgramStore { let (tx, _) = unbounded_channel(); - let homeserver = Url::parse("https://localhost").unwrap(); - let client = matrix_sdk::Client::new(homeserver).await.unwrap(); + let client = matrix_sdk::Client::builder() + .homeserver_url("https://localhost") + // don't panic if no certs are available like in a nix build sandbox + .disable_ssl_verification() + .build() + .await + .unwrap(); let worker = Requester { tx, client }; let mut store = ChatStore::new(worker, mock_settings()); diff --git a/src/windows/room/chat.rs b/src/windows/room/chat.rs index 7d26a1fe..36c8a1ed 100644 --- a/src/windows/room/chat.rs +++ b/src/windows/room/chat.rs @@ -586,7 +586,7 @@ impl ChatState { // XXX: second parameter can be a locally unique transaction id. // Useful for doing retries. let resp = room.send(msg.clone()).await.map_err(IambError::from)?; - let event_id = resp.event_id; + let event_id = resp.response.event_id; // Reset message bar state now that it's been sent. self.reset(); diff --git a/src/windows/room/mod.rs b/src/windows/room/mod.rs index 6230052b..8be49687 100644 --- a/src/windows/room/mod.rs +++ b/src/windows/room/mod.rs @@ -1,17 +1,11 @@ //! # Windows for Matrix rooms and spaces use std::collections::HashSet; +use matrix_sdk::ruma::api::error::ErrorKind as ClientApiErrorKind; use matrix_sdk::{ notification_settings::RoomNotificationMode, room::Room as MatrixRoom, ruma::{ - api::client::{ - alias::{ - create_alias::v3::Request as CreateAliasRequest, - delete_alias::v3::Request as DeleteAliasRequest, - }, - error::ErrorKind as ClientApiErrorKind, - }, events::{ room::{ canonical_alias::RoomCanonicalAliasEventContent, @@ -248,16 +242,7 @@ impl RoomState { match act { RoomAction::InviteAccept => { if let Some(room) = store.application.worker.client.get_room(self.id()) { - let details = room.invite_details().await.map_err(IambError::from)?; - let details = details.invitee.event().original_content(); - let is_direct = details.and_then(|ev| ev.is_direct).unwrap_or_default(); - room.join().await.map_err(IambError::from)?; - - if is_direct { - room.set_is_direct(true).await.map_err(IambError::from)?; - } - Ok(vec![]) } else { Err(IambError::NotInvited.into()) @@ -417,9 +402,7 @@ impl RoomState { } // Try creating the room alias on the server. - let alias_create_req = - CreateAliasRequest::new(orai.clone(), room.room_id().into()); - if let Err(e) = client.send(alias_create_req).await { + if let Err(e) = client.create_room_alias(&orai, room.room_id()).await { if let Some(ClientApiErrorKind::Unknown) = e.client_api_error_kind() { // Ignore when it already exists. } else { @@ -459,8 +442,7 @@ impl RoomState { } // If the room alias does not exist on the server, create it - let alias_create_req = CreateAliasRequest::new(orai, room.room_id().into()); - if let Err(e) = client.send(alias_create_req).await { + if let Err(e) = client.create_room_alias(&orai, room.room_id()).await { if let Some(ClientApiErrorKind::Unknown) = e.client_api_error_kind() { // Ignore when it already exists. } else { @@ -530,12 +512,11 @@ impl RoomState { let _ = room.send_state_event(ev).await.map_err(IambError::from)?; // And then unmap it on the server. - let del_req = DeleteAliasRequest::new(alias_to_destroy); - let _ = store + store .application .worker .client - .send(del_req) + .remove_room_alias(&alias_to_destroy) .await .map_err(IambError::from)?; }, @@ -563,12 +544,11 @@ impl RoomState { let _ = room.send_state_event(ev).await.map_err(IambError::from)?; // And then unmap it on the server. - let del_req = DeleteAliasRequest::new(orai); - let _ = store + store .application .worker .client - .send(del_req) + .remove_room_alias(&orai) .await .map_err(IambError::from)?; },