diff --git a/patches/228553.patch b/patches/228553.patch deleted file mode 100644 index ed8b99c3..00000000 --- a/patches/228553.patch +++ /dev/null @@ -1,6459 +0,0 @@ -From 4f1e9acc5be05d8e53ef74aa47d66687cfb6917b Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Thu, 27 Apr 2023 17:34:29 +0200 -Subject: [PATCH 1/2] matrix-sdk-crypto-nodejs: 0.1.0-beta.3 -> 0.1.0-beta.6 - ---- - .../matrix-sdk-crypto-nodejs/Cargo.lock | 3487 ++++++++++------- - .../matrix-sdk-crypto-nodejs/default.nix | 14 +- - .../remove-duplicate-dependency.patch | 55 - - 3 files changed, 2093 insertions(+), 1463 deletions(-) - delete mode 100644 pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch - -diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock -index b5045040a3d57..437f13e5e7865 100644 ---- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock -+++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock -@@ -4,9 +4,9 @@ version = 3 - - [[package]] - name = "addr2line" --version = "0.17.0" -+version = "0.19.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" - dependencies = [ - "gimli", - ] -@@ -30,17 +30,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" - dependencies = [ - "generic-array", -- "rand_core 0.6.3", -+ "rand_core 0.6.4", - ] - - [[package]] - name = "aes" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba" -+checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" - dependencies = [ - "cfg-if", -- "cipher 0.4.3", -+ "cipher 0.4.4", - "cpufeatures", - ] - -@@ -50,20 +50,38 @@ version = "0.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" - dependencies = [ -- "getrandom 0.2.7", -+ "getrandom 0.2.9", -+ "once_cell", -+ "version_check", -+] -+ -+[[package]] -+name = "ahash" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -+dependencies = [ -+ "cfg-if", -+ "getrandom 0.2.9", - "once_cell", - "version_check", - ] - - [[package]] - name = "aho-corasick" --version = "0.7.18" -+version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" - dependencies = [ - "memchr", - ] - -+[[package]] -+name = "android_log-sys" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" -+ - [[package]] - name = "android_system_properties" - version = "0.1.5" -@@ -74,58 +92,77 @@ dependencies = [ - ] - - [[package]] --name = "ansi_term" --version = "0.12.1" -+name = "anes" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" -+ -+[[package]] -+name = "anstream" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -+checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" - dependencies = [ -- "winapi", -+ "anstyle", -+ "anstyle-parse", -+ "anstyle-query", -+ "anstyle-wincon", -+ "colorchoice", -+ "is-terminal", -+ "utf8parse", - ] - - [[package]] --name = "anyhow" --version = "1.0.65" -+name = "anstyle" -+version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" -+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - - [[package]] --name = "anymap2" --version = "0.13.0" -+name = "anstyle-parse" -+version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" -+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -+dependencies = [ -+ "utf8parse", -+] - - [[package]] --name = "app_dirs2" --version = "2.5.4" -+name = "anstyle-query" -+version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "47a8d2d8dbda5fca0a522259fb88e4f55d2b10ad39f5f03adeebf85031eba501" -+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" - dependencies = [ -- "jni", -- "ndk-context", -- "winapi", -- "xdg", -+ "windows-sys 0.48.0", - ] - - [[package]] --name = "arc-swap" --version = "1.5.1" -+name = "anstyle-wincon" -+version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" -+checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" -+dependencies = [ -+ "anstyle", -+ "windows-sys 0.48.0", -+] - - [[package]] --name = "arrayref" --version = "0.3.6" -+name = "anyhow" -+version = "1.0.70" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" - - [[package]] --name = "arrayvec" --version = "0.4.12" -+name = "anymap2" -+version = "0.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" --dependencies = [ -- "nodrop", --] -+checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" -+ -+[[package]] -+name = "arrayref" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - - [[package]] - name = "arrayvec" -@@ -155,7 +192,7 @@ checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" - dependencies = [ - "askama_shared", - "proc-macro2", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -177,8 +214,8 @@ dependencies = [ - "proc-macro2", - "quote", - "serde", -- "syn", -- "toml", -+ "syn 1.0.109", -+ "toml 0.5.11", - ] - - [[package]] -@@ -205,60 +242,168 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" - - [[package]] - name = "async-channel" --version = "1.7.1" -+version = "1.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" -+checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" - dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", - ] - -+[[package]] -+name = "async-compression" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -+dependencies = [ -+ "flate2", -+ "futures-core", -+ "memchr", -+ "pin-project-lite", -+ "tokio", -+] -+ -+[[package]] -+name = "async-executor" -+version = "1.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -+dependencies = [ -+ "async-lock", -+ "async-task", -+ "concurrent-queue", -+ "fastrand", -+ "futures-lite", -+ "slab", -+] -+ -+[[package]] -+name = "async-global-executor" -+version = "2.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -+dependencies = [ -+ "async-channel", -+ "async-executor", -+ "async-io", -+ "async-lock", -+ "blocking", -+ "futures-lite", -+ "once_cell", -+] -+ -+[[package]] -+name = "async-io" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -+dependencies = [ -+ "async-lock", -+ "autocfg", -+ "cfg-if", -+ "concurrent-queue", -+ "futures-lite", -+ "log", -+ "parking", -+ "polling", -+ "rustix", -+ "slab", -+ "socket2", -+ "waker-fn", -+] -+ - [[package]] - name = "async-lock" --version = "2.5.0" -+version = "2.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" -+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" - dependencies = [ - "event-listener", - ] - - [[package]] --name = "async-once-cell" --version = "0.4.2" -+name = "async-process" -+version = "1.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" -+dependencies = [ -+ "async-io", -+ "async-lock", -+ "autocfg", -+ "blocking", -+ "cfg-if", -+ "event-listener", -+ "futures-lite", -+ "rustix", -+ "signal-hook", -+ "windows-sys 0.48.0", -+] -+ -+[[package]] -+name = "async-std" -+version = "1.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f61305cacf1d0c5c9d3ee283d22f8f1f8c743a18ceb44a1b102bd53476c141de" -+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -+dependencies = [ -+ "async-channel", -+ "async-global-executor", -+ "async-io", -+ "async-lock", -+ "async-process", -+ "crossbeam-utils", -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-lite", -+ "gloo-timers", -+ "kv-log-macro", -+ "log", -+ "memchr", -+ "once_cell", -+ "pin-project-lite", -+ "pin-utils", -+ "slab", -+ "wasm-bindgen-futures", -+] - - [[package]] - name = "async-stream" --version = "0.3.3" -+version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" -+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" - dependencies = [ - "async-stream-impl", - "futures-core", -+ "pin-project-lite", - ] - - [[package]] - name = "async-stream-impl" --version = "0.3.3" -+version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" -+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.15", - ] - -+[[package]] -+name = "async-task" -+version = "4.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" -+ - [[package]] - name = "async-trait" --version = "0.1.57" -+version = "0.1.68" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" -+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.15", - ] - - [[package]] -@@ -270,13 +415,19 @@ dependencies = [ - "autocfg", - ] - -+[[package]] -+name = "atomic-waker" -+version = "1.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" -+ - [[package]] - name = "atty" - version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" - dependencies = [ -- "hermit-abi", -+ "hermit-abi 0.1.19", - "libc", - "winapi", - ] -@@ -289,39 +440,39 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - - [[package]] - name = "axum" --version = "0.5.16" -+version = "0.6.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043" -+checksum = "113713495a32dd0ab52baf5c10044725aa3aec00b31beda84218e469029b72a3" - dependencies = [ - "async-trait", - "axum-core", -- "bitflags", -+ "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", -- "itoa 1.0.3", -+ "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", -+ "rustversion", - "serde", - "serde_json", -+ "serde_path_to_error", - "sync_wrapper", -- "tokio", - "tower", -- "tower-http", - "tower-layer", - "tower-service", - ] - - [[package]] - name = "axum-core" --version = "0.2.8" -+version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d9f0c0a60006f2a293d82d571f635042a72edf927539b7685bd62d361963839b" -+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" - dependencies = [ - "async-trait", - "bytes", -@@ -329,6 +480,7 @@ dependencies = [ - "http", - "http-body", - "mime", -+ "rustversion", - "tower-layer", - "tower-service", - ] -@@ -340,7 +492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" - dependencies = [ - "futures-core", -- "getrandom 0.2.7", -+ "getrandom 0.2.9", - "instant", - "pin-project-lite", - "rand 0.8.5", -@@ -349,30 +501,36 @@ dependencies = [ - - [[package]] - name = "backtrace" --version = "0.3.66" -+version = "0.3.67" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" - dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", -- "miniz_oxide 0.5.3", -+ "miniz_oxide 0.6.2", - "object", - "rustc-demangle", - ] - - [[package]] - name = "base64" --version = "0.13.0" -+version = "0.13.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -+ -+[[package]] -+name = "base64" -+version = "0.21.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - - [[package]] - name = "base64ct" --version = "1.5.2" -+version = "1.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" -+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - - [[package]] - name = "benchmarks" -@@ -399,38 +557,35 @@ dependencies = [ - ] - - [[package]] --name = "bit-set" --version = "0.5.3" -+name = "bitflags" -+version = "1.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" --dependencies = [ -- "bit-vec", --] -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] --name = "bit-vec" --version = "0.6.3" -+name = "bitflags" -+version = "2.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -+checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" - - [[package]] --name = "bitflags" --version = "1.3.2" -+name = "bitmaps" -+version = "3.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" - - [[package]] - name = "blake3" --version = "1.3.1" -+version = "1.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" -+checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" - dependencies = [ - "arrayref", -- "arrayvec 0.7.2", -+ "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -- "digest 0.10.3", -+ "digest 0.10.6", - ] - - [[package]] -@@ -444,51 +599,54 @@ dependencies = [ - - [[package]] - name = "block-buffer" --version = "0.10.2" -+version = "0.10.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" -+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" - dependencies = [ - "generic-array", - ] - - [[package]] - name = "block-padding" --version = "0.3.2" -+version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" -+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" - dependencies = [ - "generic-array", - ] - - [[package]] --name = "bs58" --version = "0.4.0" -+name = "blocking" -+version = "1.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" -+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -+dependencies = [ -+ "async-channel", -+ "async-lock", -+ "async-task", -+ "atomic-waker", -+ "fastrand", -+ "futures-lite", -+ "log", -+] - - [[package]] --name = "bstr" --version = "0.2.17" -+name = "bs58" -+version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" --dependencies = [ -- "lazy_static", -- "memchr", -- "regex-automata", -- "serde", --] -+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - - [[package]] - name = "bumpalo" --version = "3.11.0" -+version = "3.12.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" -+checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" - - [[package]] - name = "bytemuck" --version = "1.12.1" -+version = "1.13.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" -+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" - - [[package]] - name = "byteorder" -@@ -498,21 +656,21 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - - [[package]] - name = "bytes" --version = "1.2.1" -+version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - - [[package]] --name = "cache-padded" -+name = "bytesize" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" -+checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" - - [[package]] - name = "camino" --version = "1.1.1" -+version = "1.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" -+checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" - dependencies = [ - "serde", - ] -@@ -528,9 +686,9 @@ dependencies = [ - - [[package]] - name = "cargo_metadata" --version = "0.15.1" -+version = "0.15.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "406c859255d568f4f742b3146d51851f3bfd49f734a2c289d9107c4395ee0062" -+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" - dependencies = [ - "camino", - "cargo-platform", -@@ -540,12 +698,6 @@ dependencies = [ - "thiserror", - ] - --[[package]] --name = "cassowary" --version = "0.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" -- - [[package]] - name = "cast" - version = "0.3.0" -@@ -558,20 +710,14 @@ version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" - dependencies = [ -- "cipher 0.4.3", -+ "cipher 0.4.4", - ] - - [[package]] - name = "cc" --version = "1.0.73" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -- --[[package]] --name = "cesu8" --version = "1.1.0" -+version = "1.0.79" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - - [[package]] - name = "cfg-if" -@@ -612,19 +758,46 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - - [[package]] - name = "chrono" --version = "0.4.22" -+version = "0.4.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" - dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", -- "time 0.1.44", -+ "time 0.1.45", - "wasm-bindgen", - "winapi", - ] - -+[[package]] -+name = "ciborium" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" -+dependencies = [ -+ "ciborium-io", -+ "ciborium-ll", -+ "serde", -+] -+ -+[[package]] -+name = "ciborium-io" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" -+ -+[[package]] -+name = "ciborium-ll" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" -+dependencies = [ -+ "ciborium-io", -+ "half", -+] -+ - [[package]] - name = "cipher" - version = "0.3.0" -@@ -636,9 +809,9 @@ dependencies = [ - - [[package]] - name = "cipher" --version = "0.4.3" -+version = "0.4.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" - dependencies = [ - "crypto-common", - "inout", -@@ -646,49 +819,43 @@ dependencies = [ - - [[package]] - name = "clap" --version = "2.34.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" --dependencies = [ -- "ansi_term", -- "atty", -- "bitflags", -- "strsim 0.8.0", -- "textwrap 0.11.0", -- "unicode-width", -- "vec_map", --] -- --[[package]] --name = "clap" --version = "3.2.22" -+version = "3.2.23" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" -+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" - dependencies = [ - "atty", -- "bitflags", -+ "bitflags 1.3.2", - "clap_derive 3.2.18", - "clap_lex 0.2.4", - "indexmap", - "once_cell", -- "strsim 0.10.0", -+ "strsim", - "termcolor", -- "textwrap 0.15.1", -+ "textwrap", - ] - - [[package]] - name = "clap" --version = "4.0.18" -+version = "4.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b" -+checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" - dependencies = [ -- "atty", -- "bitflags", -- "clap_derive 4.0.18", -- "clap_lex 0.3.0", -+ "clap_builder", -+ "clap_derive 4.2.0", - "once_cell", -- "strsim 0.10.0", -- "termcolor", -+] -+ -+[[package]] -+name = "clap_builder" -+version = "4.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" -+dependencies = [ -+ "anstream", -+ "anstyle", -+ "bitflags 1.3.2", -+ "clap_lex 0.4.1", -+ "strsim", - ] - - [[package]] -@@ -697,24 +864,23 @@ version = "3.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" - dependencies = [ -- "heck 0.4.0", -+ "heck", - "proc-macro-error", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] - name = "clap_derive" --version = "4.0.18" -+version = "4.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3" -+checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" - dependencies = [ -- "heck 0.4.0", -- "proc-macro-error", -+ "heck", - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.15", - ] - - [[package]] -@@ -728,31 +894,27 @@ dependencies = [ - - [[package]] - name = "clap_lex" --version = "0.3.0" -+version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" --dependencies = [ -- "os_str_bytes", --] -+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - - [[package]] --name = "clipboard-win" --version = "4.4.2" -+name = "cmake" -+version = "0.1.50" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" -+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" - dependencies = [ -- "error-code", -- "str-buf", -- "winapi", -+ "cc", - ] - - [[package]] --name = "cmake" --version = "0.1.48" -+name = "codespan-reporting" -+version = "0.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" -+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" - dependencies = [ -- "cc", -+ "termcolor", -+ "unicode-width", - ] - - [[package]] -@@ -762,36 +924,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - - [[package]] --name = "combine" --version = "4.6.6" -+name = "colorchoice" -+version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" --dependencies = [ -- "bytes", -- "memchr", --] -+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - - [[package]] - name = "concurrent-queue" --version = "1.2.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" --dependencies = [ -- "cache-padded", --] -- --[[package]] --name = "console" --version = "0.15.1" -+version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" -+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" - dependencies = [ -- "encode_unicode", -- "libc", -- "once_cell", -- "terminal_size", -- "unicode-width", -- "winapi", -+ "crossbeam-utils", - ] - - [[package]] -@@ -812,18 +956,18 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - - [[package]] - name = "const_format" --version = "0.2.26" -+version = "0.2.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "939dc9e2eb9077e0679d2ce32de1ded8531779360b003b4a972a7a39ec263495" -+checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" - dependencies = [ - "const_format_proc_macros", - ] - - [[package]] - name = "const_format_proc_macros" --version = "0.2.22" -+version = "0.2.29" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ef196d5d972878a48da7decb7686eded338b4858fbabeed513d63a7c98b2b82d" -+checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" - dependencies = [ - "proc-macro2", - "quote", -@@ -832,15 +976,18 @@ dependencies = [ - - [[package]] - name = "constant_time_eq" --version = "0.1.5" -+version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -+checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" - - [[package]] - name = "convert_case" --version = "0.5.0" -+version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" -+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -+dependencies = [ -+ "unicode-segmentation", -+] - - [[package]] - name = "core-foundation" -@@ -854,24 +1001,24 @@ dependencies = [ - - [[package]] - name = "core-foundation-sys" --version = "0.8.3" -+version = "0.8.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - - [[package]] - name = "cpp_demangle" --version = "0.3.5" -+version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" -+checksum = "2c76f98bdfc7f66172e6c7065f981ebb576ffc903fe4c0561d9f0c2509226dc6" - dependencies = [ - "cfg-if", - ] - - [[package]] - name = "cpufeatures" --version = "0.2.4" -+version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dc948ebb96241bb40ab73effeb80d9f93afaad49359d159a5e61be51619fe813" -+checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" - dependencies = [ - "libc", - ] -@@ -887,15 +1034,16 @@ dependencies = [ - - [[package]] - name = "criterion" --version = "0.3.6" -+version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" -+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" - dependencies = [ -+ "anes", - "atty", - "cast", -- "clap 2.34.0", -+ "ciborium", -+ "clap 3.2.23", - "criterion-plot", -- "csv", - "futures", - "itertools", - "lazy_static", -@@ -905,7 +1053,6 @@ dependencies = [ - "rayon", - "regex", - "serde", -- "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", -@@ -915,9 +1062,9 @@ dependencies = [ - - [[package]] - name = "criterion-plot" --version = "0.4.5" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" -+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" - dependencies = [ - "cast", - "itertools", -@@ -925,9 +1072,9 @@ dependencies = [ - - [[package]] - name = "crossbeam-channel" --version = "0.5.6" -+version = "0.5.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" - dependencies = [ - "cfg-if", - "crossbeam-utils", -@@ -935,9 +1082,9 @@ dependencies = [ - - [[package]] - name = "crossbeam-deque" --version = "0.8.2" -+version = "0.8.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" - dependencies = [ - "cfg-if", - "crossbeam-epoch", -@@ -946,51 +1093,24 @@ dependencies = [ - - [[package]] - name = "crossbeam-epoch" --version = "0.9.10" -+version = "0.9.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" -+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" - dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", -- "once_cell", - "scopeguard", - ] - - [[package]] - name = "crossbeam-utils" --version = "0.8.11" -+version = "0.8.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" -+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" - dependencies = [ - "cfg-if", -- "once_cell", --] -- --[[package]] --name = "crossterm" --version = "0.23.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" --dependencies = [ -- "bitflags", -- "crossterm_winapi", -- "libc", -- "mio", -- "parking_lot 0.12.1", -- "signal-hook", -- "signal-hook-mio", -- "winapi", --] -- --[[package]] --name = "crossterm_winapi" --version = "0.9.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" --dependencies = [ -- "winapi", - ] - - [[package]] -@@ -1004,44 +1124,32 @@ dependencies = [ - ] - - [[package]] --name = "csv" --version = "1.1.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" --dependencies = [ -- "bstr", -- "csv-core", -- "itoa 0.4.8", -- "ryu", -- "serde", --] -- --[[package]] --name = "csv-core" --version = "0.1.10" -+name = "ctor" -+version = "0.1.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" - dependencies = [ -- "memchr", -+ "quote", -+ "syn 1.0.109", - ] - - [[package]] - name = "ctor" --version = "0.1.23" -+version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" -+checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" - dependencies = [ - "quote", -- "syn", -+ "syn 2.0.15", - ] - - [[package]] - name = "ctr" --version = "0.9.1" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0d14f329cfbaf5d0e06b5e87fff7e265d2673c5ea7d2c27691a2c107db1442a0" -+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" - dependencies = [ -- "cipher 0.4.3", -+ "cipher 0.4.4", - ] - - [[package]] -@@ -1059,38 +1167,47 @@ dependencies = [ - ] - - [[package]] --name = "darling" --version = "0.14.1" -+name = "cxx" -+version = "1.0.94" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02" -+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" - dependencies = [ -- "darling_core", -- "darling_macro", -+ "cc", -+ "cxxbridge-flags", -+ "cxxbridge-macro", -+ "link-cplusplus", - ] - - [[package]] --name = "darling_core" --version = "0.14.1" -+name = "cxx-build" -+version = "1.0.94" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" -+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" - dependencies = [ -- "fnv", -- "ident_case", -+ "cc", -+ "codespan-reporting", -+ "once_cell", - "proc-macro2", - "quote", -- "strsim 0.10.0", -- "syn", -+ "scratch", -+ "syn 2.0.15", - ] - - [[package]] --name = "darling_macro" --version = "0.14.1" -+name = "cxxbridge-flags" -+version = "1.0.94" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" -+ -+[[package]] -+name = "cxxbridge-macro" -+version = "1.0.94" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" -+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" - dependencies = [ -- "darling_core", -+ "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.15", - ] - - [[package]] -@@ -1103,7 +1220,7 @@ dependencies = [ - "hashbrown", - "lock_api", - "once_cell", -- "parking_lot_core 0.9.3", -+ "parking_lot_core 0.9.7", - ] - - [[package]] -@@ -1124,95 +1241,56 @@ name = "deadpool-runtime" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" -- --[[package]] --name = "debugid" --version = "0.8.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" --dependencies = [ -- "uuid 1.1.2", --] -- --[[package]] --name = "deflate" --version = "0.8.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" --dependencies = [ -- "adler32", -- "byteorder", --] -- --[[package]] --name = "deflate" --version = "1.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" --dependencies = [ -- "adler32", --] -- --[[package]] --name = "der" --version = "0.5.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" - dependencies = [ -- "const-oid", -+ "tokio", - ] - - [[package]] --name = "derivative" --version = "2.2.0" -+name = "deadpool-sqlite" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -+checksum = "e026821eaacbce25ff0d54405e4421d71656fcae3e4a9323461280fcda6dbc7d" - dependencies = [ -- "proc-macro2", -- "quote", -- "syn", -+ "deadpool", -+ "deadpool-sync", -+ "rusqlite", - ] - - [[package]] --name = "derive_builder" --version = "0.11.2" -+name = "deadpool-sync" -+version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" -+checksum = "b1bea344b64b32537fde6e0f0179b1ede34d435636719dd40fe6a0f28218a61c" - dependencies = [ -- "derive_builder_macro", -+ "deadpool", - ] - - [[package]] --name = "derive_builder_core" --version = "0.11.2" -+name = "debugid" -+version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" -+checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" - dependencies = [ -- "darling", -- "proc-macro2", -- "quote", -- "syn", -+ "uuid", - ] - - [[package]] --name = "derive_builder_macro" --version = "0.11.2" -+name = "deflate" -+version = "0.8.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -+checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" - dependencies = [ -- "derive_builder_core", -- "syn", -+ "adler32", -+ "byteorder", - ] - - [[package]] --name = "dialoguer" --version = "0.10.2" -+name = "der" -+version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a92e7e37ecef6857fdc0c0c5d42fd5b0938e46590c2183cc92dd310a6d078eb1" -+checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" - dependencies = [ -- "console", -- "tempfile", -- "zeroize", -+ "const-oid", - ] - - [[package]] -@@ -1226,11 +1304,11 @@ dependencies = [ - - [[package]] - name = "digest" --version = "0.10.3" -+version = "0.10.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" -+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" - dependencies = [ -- "block-buffer 0.10.2", -+ "block-buffer 0.10.4", - "crypto-common", - "subtle", - ] -@@ -1244,16 +1322,6 @@ dependencies = [ - "dirs-sys", - ] - --[[package]] --name = "dirs-next" --version = "2.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" --dependencies = [ -- "cfg-if", -- "dirs-sys-next", --] -- - [[package]] - name = "dirs-sys" - version = "0.3.7" -@@ -1265,23 +1333,6 @@ dependencies = [ - "winapi", - ] - --[[package]] --name = "dirs-sys-next" --version = "0.1.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" --dependencies = [ -- "libc", -- "redox_users", -- "winapi", --] -- --[[package]] --name = "discard" --version = "1.0.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" -- - [[package]] - name = "displaydoc" - version = "0.2.3" -@@ -1290,14 +1341,14 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] - name = "ed25519" --version = "1.5.2" -+version = "1.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" -+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" - dependencies = [ - "serde", - "signature", -@@ -1320,40 +1371,28 @@ dependencies = [ - - [[package]] - name = "either" --version = "1.8.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" -- --[[package]] --name = "encode_unicode" --version = "0.3.6" -+version = "1.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - - [[package]] - name = "encoding_rs" --version = "0.8.31" -+version = "0.8.32" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" - dependencies = [ - "cfg-if", - ] - --[[package]] --name = "endian-type" --version = "0.1.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" -- - [[package]] - name = "errno" --version = "0.2.8" -+version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" - dependencies = [ - "errno-dragonfly", - "libc", -- "winapi", -+ "windows-sys 0.48.0", - ] - - [[package]] -@@ -1366,16 +1405,6 @@ dependencies = [ - "libc", - ] - --[[package]] --name = "error-code" --version = "2.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" --dependencies = [ -- "libc", -- "str-buf", --] -- - [[package]] - name = "event-listener" - version = "2.5.3" -@@ -1442,7 +1471,7 @@ name = "example-emoji-verification" - version = "0.1.0" - dependencies = [ - "anyhow", -- "clap 4.0.18", -+ "clap 4.2.4", - "futures", - "matrix-sdk", - "tokio", -@@ -1495,14 +1524,27 @@ dependencies = [ - "url", - ] - -+[[package]] -+name = "example-persist-session" -+version = "0.1.0" -+dependencies = [ -+ "anyhow", -+ "dirs", -+ "matrix-sdk", -+ "rand 0.8.5", -+ "serde", -+ "serde_json", -+ "tokio", -+ "tracing-subscriber", -+] -+ - [[package]] - name = "example-timeline" - version = "0.1.0" - dependencies = [ - "anyhow", -- "clap 4.0.18", -+ "clap 4.2.4", - "futures", -- "futures-signals", - "matrix-sdk", - "tokio", - "tracing-subscriber", -@@ -1511,13 +1553,35 @@ dependencies = [ - - [[package]] - name = "extension-trait" --version = "1.0.1" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5129068fe3183546eaa0529af88ab0afbcddec2a373db69e94a20b8d5f6c4d74" -+checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.15", -+] -+ -+[[package]] -+name = "eyeball" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1015c5225a75e0ab3d325e934456d92fdd57f440e8c81d09018878d4f651cd46" -+dependencies = [ -+ "futures-core", -+ "readlock", -+] -+ -+[[package]] -+name = "eyeball-im" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "29e6dff0ac9894dcc183064377dfeb4137bcffa9f9ec3dbc10f8e7fba34c0ac7" -+dependencies = [ -+ "futures-core", -+ "imbl", -+ "tokio", -+ "tokio-stream", - ] - - [[package]] -@@ -1531,33 +1595,33 @@ dependencies = [ - ] - - [[package]] --name = "fancy-regex" --version = "0.7.1" -+name = "fallible-iterator" -+version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf" --dependencies = [ -- "bit-set", -- "regex", --] -+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -+ -+[[package]] -+name = "fallible-streaming-iterator" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - - [[package]] - name = "fastrand" --version = "1.8.0" -+version = "1.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" - dependencies = [ - "instant", - ] - - [[package]] --name = "fd-lock" --version = "3.0.6" -+name = "fdeflate" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517" -+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" - dependencies = [ -- "cfg-if", -- "rustix", -- "windows-sys", -+ "simd-adler32", - ] - - [[package]] -@@ -1572,14 +1636,20 @@ dependencies = [ - "winapi", - ] - -+[[package]] -+name = "fixedbitset" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -+ - [[package]] - name = "flate2" --version = "1.0.24" -+version = "1.0.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" - dependencies = [ - "crc32fast", -- "miniz_oxide 0.5.3", -+ "miniz_oxide 0.6.2", - ] - - [[package]] -@@ -1614,9 +1684,9 @@ dependencies = [ - - [[package]] - name = "fs-err" --version = "2.8.1" -+version = "2.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50" -+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" - - [[package]] - name = "fs2" -@@ -1630,15 +1700,25 @@ dependencies = [ - - [[package]] - name = "fs_extra" --version = "1.2.0" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -+ -+[[package]] -+name = "futf" -+version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" -+checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -+dependencies = [ -+ "mac", -+ "new_debug_unreachable", -+] - - [[package]] - name = "futures" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" -+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" - dependencies = [ - "futures-channel", - "futures-core", -@@ -1651,9 +1731,9 @@ dependencies = [ - - [[package]] - name = "futures-channel" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" -+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" - dependencies = [ - "futures-core", - "futures-sink", -@@ -1661,15 +1741,15 @@ dependencies = [ - - [[package]] - name = "futures-core" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" -+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - - [[package]] - name = "futures-executor" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" -+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" - dependencies = [ - "futures-core", - "futures-task", -@@ -1678,15 +1758,15 @@ dependencies = [ - - [[package]] - name = "futures-io" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" -+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - - [[package]] - name = "futures-lite" --version = "1.12.0" -+version = "1.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" - dependencies = [ - "fastrand", - "futures-core", -@@ -1699,41 +1779,26 @@ dependencies = [ - - [[package]] - name = "futures-macro" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" -+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" - dependencies = [ - "proc-macro2", - "quote", -- "syn", --] -- --[[package]] --name = "futures-signals" --version = "0.3.31" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a3acc659ba666cff13fdf65242d16428f2f11935b688f82e4024ad39667a5132" --dependencies = [ -- "discard", -- "futures-channel", -- "futures-core", -- "futures-util", -- "log", -- "pin-project", -- "serde", -+ "syn 2.0.15", - ] - - [[package]] - name = "futures-sink" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" -+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - - [[package]] - name = "futures-task" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" -+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - - [[package]] - name = "futures-timer" -@@ -1743,9 +1808,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - - [[package]] - name = "futures-util" --version = "0.3.24" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" -+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" - dependencies = [ - "futures-channel", - "futures-core", -@@ -1770,9 +1835,9 @@ dependencies = [ - - [[package]] - name = "generic-array" --version = "0.14.6" -+version = "0.14.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" - dependencies = [ - "typenum", - "version_check", -@@ -1793,9 +1858,9 @@ dependencies = [ - - [[package]] - name = "getrandom" --version = "0.2.7" -+version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" - dependencies = [ - "cfg-if", - "js-sys", -@@ -1815,22 +1880,44 @@ dependencies = [ - ] - - [[package]] --name = "gimli" --version = "0.26.2" -+name = "gif" -+version = "0.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -- --[[package]] --name = "glob" --version = "0.3.0" -+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -+dependencies = [ -+ "color_quant", -+ "weezl", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.27.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" -+ -+[[package]] -+name = "glob" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -+ -+[[package]] -+name = "gloo-timers" -+version = "0.2.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "js-sys", -+ "wasm-bindgen", -+] - - [[package]] - name = "gloo-utils" --version = "0.1.5" -+version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "40913a05c8297adca04392f707b1e73b12ba7b8eab7244a4961580b1fd34063c" -+checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5" - dependencies = [ - "js-sys", - "serde", -@@ -1841,9 +1928,9 @@ dependencies = [ - - [[package]] - name = "goblin" --version = "0.5.4" -+version = "0.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" -+checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68" - dependencies = [ - "log", - "plain", -@@ -1852,9 +1939,9 @@ dependencies = [ - - [[package]] - name = "h2" --version = "0.3.14" -+version = "0.3.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" -+checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" - dependencies = [ - "bytes", - "fnv", -@@ -1881,23 +1968,23 @@ version = "0.12.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - dependencies = [ -- "ahash", -+ "ahash 0.7.6", - ] - - [[package]] --name = "heck" --version = "0.3.3" -+name = "hashlink" -+version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -+checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" - dependencies = [ -- "unicode-segmentation", -+ "hashbrown", - ] - - [[package]] - name = "heck" --version = "0.4.0" -+version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" -+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - - [[package]] - name = "hermit-abi" -@@ -1908,6 +1995,21 @@ dependencies = [ - "libc", - ] - -+[[package]] -+name = "hermit-abi" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" -+ - [[package]] - name = "hkdf" - version = "0.12.3" -@@ -1923,18 +2025,32 @@ version = "0.12.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" - dependencies = [ -- "digest 0.10.3", -+ "digest 0.10.6", -+] -+ -+[[package]] -+name = "html5ever" -+version = "0.26.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -+dependencies = [ -+ "log", -+ "mac", -+ "markup5ever", -+ "proc-macro2", -+ "quote", -+ "syn 1.0.109", - ] - - [[package]] - name = "http" --version = "0.2.8" -+version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" - dependencies = [ - "bytes", - "fnv", -- "itoa 1.0.3", -+ "itoa", - ] - - [[package]] -@@ -1948,12 +2064,6 @@ dependencies = [ - "pin-project-lite", - ] - --[[package]] --name = "http-range-header" --version = "0.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" -- - [[package]] - name = "http-types" - version = "2.12.0" -@@ -1962,7 +2072,7 @@ checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" - dependencies = [ - "anyhow", - "async-channel", -- "base64", -+ "base64 0.13.1", - "futures-lite", - "http", - "infer", -@@ -1989,9 +2099,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - - [[package]] - name = "hyper" --version = "0.14.20" -+version = "0.14.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" -+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" - dependencies = [ - "bytes", - "futures-channel", -@@ -2002,7 +2112,7 @@ dependencies = [ - "http-body", - "httparse", - "httpdate", -- "itoa 1.0.3", -+ "itoa", - "pin-project-lite", - "socket2", - "tokio", -@@ -2013,9 +2123,9 @@ dependencies = [ - - [[package]] - name = "hyper-rustls" --version = "0.23.0" -+version = "0.23.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" -+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" - dependencies = [ - "http", - "hyper", -@@ -2024,6 +2134,18 @@ dependencies = [ - "tokio-rustls", - ] - -+[[package]] -+name = "hyper-timeout" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -+dependencies = [ -+ "hyper", -+ "pin-project-lite", -+ "tokio", -+ "tokio-io-timeout", -+] -+ - [[package]] - name = "hyper-tls" - version = "0.5.0" -@@ -2039,23 +2161,27 @@ dependencies = [ - - [[package]] - name = "iana-time-zone" --version = "0.1.47" -+version = "0.1.56" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" -+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" - dependencies = [ - "android_system_properties", - "core-foundation-sys", -+ "iana-time-zone-haiku", - "js-sys", -- "once_cell", - "wasm-bindgen", -- "winapi", -+ "windows", - ] - - [[package]] --name = "ident_case" --version = "1.0.1" -+name = "iana-time-zone-haiku" -+version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -+dependencies = [ -+ "cxx", -+ "cxx-build", -+] - - [[package]] - name = "idna" -@@ -2076,7 +2202,7 @@ dependencies = [ - "bytemuck", - "byteorder", - "color_quant", -- "gif", -+ "gif 0.11.4", - "jpeg-decoder 0.1.22", - "num-iter", - "num-rational 0.3.2", -@@ -2088,20 +2214,42 @@ dependencies = [ - - [[package]] - name = "image" --version = "0.24.3" -+version = "0.24.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964" -+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" - dependencies = [ - "bytemuck", - "byteorder", - "color_quant", -- "gif", -- "jpeg-decoder 0.2.6", -+ "gif 0.12.0", -+ "jpeg-decoder 0.3.0", - "num-rational 0.4.1", - "num-traits", -- "png 0.17.5", -- "scoped_threadpool", -- "tiff 0.7.3", -+ "png 0.17.8", -+ "tiff 0.8.1", -+] -+ -+[[package]] -+name = "imbl" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c2806b69cd9f4664844027b64465eacb444c67c1db9c778e341adff0c25cdb0d" -+dependencies = [ -+ "bitmaps", -+ "imbl-sized-chunks", -+ "rand_core 0.6.4", -+ "rand_xoshiro", -+ "serde", -+ "version_check", -+] -+ -+[[package]] -+name = "imbl-sized-chunks" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076" -+dependencies = [ -+ "bitmaps", - ] - - [[package]] -@@ -2112,13 +2260,13 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - - [[package]] - name = "indexed_db_futures" --version = "0.2.3" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d26ac735f676c52305becf53264b91cea9866a8de61ccbf464405b377b9cbca9" -+checksum = "bfbcff6ae46750b15cc594bfd277b188cbddcfdc1817848f97f03f26f8625b9e" - dependencies = [ - "cfg-if", - "js-sys", -- "uuid 0.8.2", -+ "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -@@ -2126,9 +2274,9 @@ dependencies = [ - - [[package]] - name = "indexmap" --version = "1.9.1" -+version = "1.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" - dependencies = [ - "autocfg", - "hashbrown", -@@ -2137,9 +2285,9 @@ dependencies = [ - - [[package]] - name = "indoc" --version = "1.0.7" -+version = "1.0.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" -+checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - - [[package]] - name = "infer" -@@ -2149,14 +2297,14 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - - [[package]] - name = "inferno" --version = "0.11.7" -+version = "0.11.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9709543bd6c25fdc748da2bed0f6855b07b7e93a203ae31332ac2101ab2f4782" -+checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc" - dependencies = [ -- "ahash", -- "atty", -+ "ahash 0.8.3", - "indexmap", -- "itoa 1.0.3", -+ "is-terminal", -+ "itoa", - "log", - "num-format", - "once_cell", -@@ -2189,80 +2337,47 @@ dependencies = [ - - [[package]] - name = "io-lifetimes" --version = "0.7.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" -- --[[package]] --name = "ipnet" --version = "2.5.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" -- --[[package]] --name = "itertools" --version = "0.10.3" -+version = "1.0.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" - dependencies = [ -- "either", -+ "hermit-abi 0.3.1", -+ "libc", -+ "windows-sys 0.48.0", - ] - - [[package]] --name = "itoa" --version = "0.4.8" -+name = "ipnet" -+version = "2.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" -+checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" - - [[package]] --name = "itoa" --version = "1.0.3" -+name = "is-terminal" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" -- --[[package]] --name = "jack-in" --version = "0.2.0" -+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" - dependencies = [ -- "app_dirs2", -- "dialoguer", -- "eyre", -- "futures", -- "futures-signals", -- "log4rs", -- "matrix-sdk", -- "matrix-sdk-common", -- "matrix-sdk-sled", -- "sanitize-filename-reader-friendly", -- "serde_json", -- "structopt", -- "tokio", -- "tracing", -- "tracing-flame", -- "tracing-subscriber", -- "tui-logger", -- "tuirealm", -+ "hermit-abi 0.3.1", -+ "io-lifetimes", -+ "rustix", -+ "windows-sys 0.48.0", - ] - - [[package]] --name = "jni" --version = "0.19.0" -+name = "itertools" -+version = "0.10.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" - dependencies = [ -- "cesu8", -- "combine", -- "jni-sys", -- "log", -- "thiserror", -- "walkdir", -+ "either", - ] - - [[package]] --name = "jni-sys" --version = "0.3.0" -+name = "itoa" -+version = "1.0.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - - [[package]] - name = "jpeg-decoder" -@@ -2275,18 +2390,18 @@ dependencies = [ - - [[package]] - name = "jpeg-decoder" --version = "0.2.6" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" -+checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" - dependencies = [ - "rayon", - ] - - [[package]] - name = "js-sys" --version = "0.3.60" -+version = "0.3.61" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -+checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" - dependencies = [ - "wasm-bindgen", - ] -@@ -2310,26 +2425,34 @@ dependencies = [ - ] - - [[package]] --name = "lazy-regex" --version = "2.3.0" -+name = "konst" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b6b12f2eb6ed7d39405c5eb25a034b4c106a9ad87a6d9be3298de6c5f32fd57d" -+checksum = "330f0e13e6483b8c34885f7e6c9f19b1a7bd449c673fbb948a51c99d66ef74f4" - dependencies = [ -- "lazy-regex-proc_macros", -- "once_cell", -- "regex", -+ "konst_macro_rules", -+ "konst_proc_macros", - ] - - [[package]] --name = "lazy-regex-proc_macros" --version = "2.3.0" -+name = "konst_macro_rules" -+version = "0.2.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" -+ -+[[package]] -+name = "konst_proc_macros" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "984e109462d46ad18314f10e392c286c3d47bce203088a09012de1015b45b737" -+ -+[[package]] -+name = "kv-log-macro" -+version = "1.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2496e5264069bc726ccf37eb76b9cd89406ae110d836c3f76729f99c8a23293" -+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" - dependencies = [ -- "proc-macro2", -- "quote", -- "regex", -- "syn", -+ "log", - ] - - [[package]] -@@ -2340,31 +2463,57 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.132" -+version = "0.2.142" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" -+checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" - - [[package]] - name = "libloading" --version = "0.7.3" -+version = "0.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" -+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" - dependencies = [ - "cfg-if", - "winapi", - ] - -+[[package]] -+name = "libm" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" -+ -+[[package]] -+name = "libsqlite3-sys" -+version = "0.25.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" -+dependencies = [ -+ "cc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "link-cplusplus" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -+dependencies = [ -+ "cc", -+] -+ - [[package]] - name = "linux-raw-sys" --version = "0.0.46" -+version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" -+checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" - - [[package]] - name = "lock_api" --version = "0.4.8" -+version = "0.4.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" -+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" - dependencies = [ - "autocfg", - "scopeguard", -@@ -2377,40 +2526,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" - dependencies = [ - "cfg-if", -+ "value-bag", - ] - - [[package]] --name = "log-mdc" --version = "0.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" -- --[[package]] --name = "log4rs" --version = "1.1.1" -+name = "log-panics" -+version = "2.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "893eaf59f4bef8e2e94302adf56385db445a0306b9823582b0b8d5a06d8822f3" -+checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" - dependencies = [ -- "anyhow", -- "arc-swap", -- "chrono", -- "derivative", -- "fnv", -+ "backtrace", - "log", -- "log-mdc", -- "parking_lot 0.12.1", -- "thiserror", -- "thread-id", - ] - - [[package]] --name = "lru" --version = "0.8.0" -+name = "mac" -+version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "936d98d2ddd79c18641c6709e7bb09981449694e402d1a0f0f657ea8d61f4a51" --dependencies = [ -- "hashbrown", --] -+checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - - [[package]] - name = "maplit" -@@ -2418,6 +2551,20 @@ version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -+[[package]] -+name = "markup5ever" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -+dependencies = [ -+ "log", -+ "phf 0.10.1", -+ "phf_codegen", -+ "string_cache", -+ "string_cache_codegen", -+ "tendril", -+] -+ - [[package]] - name = "matchers" - version = "0.1.0" -@@ -2428,16 +2575,33 @@ dependencies = [ - ] - - [[package]] --name = "matches" --version = "0.1.9" -+name = "matchit" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -+checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - - [[package]] --name = "matchit" --version = "0.5.0" -+name = "matrix-pickle" -+version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" -+checksum = "b18185b3f64cc8d44840dbf92d92aeb05c1ef97094f51a32c1afd36a4415d225" -+dependencies = [ -+ "matrix-pickle-derive", -+ "thiserror", -+] -+ -+[[package]] -+name = "matrix-pickle-derive" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cef08fbb48d0d5125d3885e422c426b5be84067c63ceb5d8b32f9130143f5b81" -+dependencies = [ -+ "proc-macro-crate", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn 1.0.109", -+] - - [[package]] - name = "matrix-sdk" -@@ -2446,49 +2610,53 @@ dependencies = [ - "anyhow", - "anymap2", - "assert_matches", -- "async-once-cell", - "async-stream", - "async-trait", - "backoff", - "bytes", -- "ctor", -+ "bytesize", -+ "chrono", -+ "ctor 0.2.0", - "dashmap", -- "derive_builder", - "dirs", - "event-listener", -+ "eyeball", -+ "eyeball-im", - "eyre", - "futures", - "futures-core", -- "futures-signals", - "futures-util", -- "getrandom 0.2.7", -+ "getrandom 0.2.9", -+ "gloo-timers", - "http", - "hyper", -- "image 0.24.3", -+ "image 0.24.6", -+ "imbl", - "indexmap", -- "matches", - "matrix-sdk-base", - "matrix-sdk-common", - "matrix-sdk-indexeddb", - "matrix-sdk-sled", - "matrix-sdk-test", - "mime", -+ "mime_guess", - "once_cell", -+ "pin-project-lite", - "rand 0.8.5", - "reqwest", - "ruma", - "serde", -+ "serde_html_form", - "serde_json", - "tempfile", - "thiserror", - "tokio", -- "tokio-stream", - "tower", - "tracing", - "tracing-subscriber", - "url", -+ "uuid", - "wasm-bindgen-test", -- "wasm-timer", - "wiremock", - "zeroize", - ] -@@ -2507,6 +2675,7 @@ dependencies = [ - "regex", - "ruma", - "serde", -+ "serde_html_form", - "serde_json", - "serde_yaml", - "thiserror", -@@ -2522,18 +2691,18 @@ dependencies = [ - name = "matrix-sdk-base" - version = "0.6.1" - dependencies = [ -+ "assert_matches", - "assign", - "async-stream", - "async-trait", -- "ctor", -+ "bitflags 2.2.1", -+ "ctor 0.2.0", - "dashmap", -+ "eyeball", - "futures", -- "futures-channel", - "futures-core", -- "futures-signals", - "futures-util", - "http", -- "lru", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", -@@ -2554,17 +2723,17 @@ dependencies = [ - name = "matrix-sdk-common" - version = "0.6.0" - dependencies = [ -- "async-lock", - "futures-core", - "futures-util", -+ "gloo-timers", - "instant", - "matrix-sdk-test", - "ruma", - "serde", -+ "serde_json", - "tokio", - "wasm-bindgen-futures", - "wasm-bindgen-test", -- "wasm-timer", - ] - - [[package]] -@@ -2573,23 +2742,26 @@ version = "0.6.0" - dependencies = [ - "aes", - "anyhow", -+ "assert_matches", -+ "async-std", - "async-trait", - "atomic", -- "base64", -+ "base64 0.21.0", - "bs58", - "byteorder", - "cfg-if", -+ "ctor 0.2.0", - "ctr", - "dashmap", - "event-listener", -+ "eyeball", - "futures", - "futures-core", -- "futures-signals", - "futures-util", - "hmac", - "http", - "indoc", -- "matches", -+ "itertools", - "matrix-sdk-common", - "matrix-sdk-qrcode", - "matrix-sdk-test", -@@ -2597,13 +2769,16 @@ dependencies = [ - "pbkdf2", - "proptest", - "rand 0.8.5", -+ "rmp-serde", - "ruma", - "serde", - "serde_json", -- "sha2 0.10.3", -+ "sha2 0.10.6", - "thiserror", - "tokio", -+ "tokio-stream", - "tracing", -+ "tracing-subscriber", - "vodozemac", - "zeroize", - ] -@@ -2613,27 +2788,27 @@ name = "matrix-sdk-crypto-ffi" - version = "0.1.0" - dependencies = [ - "anyhow", -- "base64", -+ "assert_matches", -+ "base64 0.21.0", -+ "futures-util", - "hmac", - "http", - "js_int", - "matrix-sdk-common", - "matrix-sdk-crypto", -- "matrix-sdk-sled", -+ "matrix-sdk-sqlite", - "pbkdf2", - "rand 0.8.5", - "ruma", - "serde", - "serde_json", -- "sha2 0.10.3", -+ "sha2 0.10.6", - "tempfile", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "uniffi", -- "uniffi_build", -- "uniffi_macros", - "vodozemac", - "zeroize", - ] -@@ -2644,6 +2819,7 @@ version = "0.1.0-alpha.0" - dependencies = [ - "anyhow", - "console_error_panic_hook", -+ "futures-util", - "http", - "js-sys", - "matrix-sdk-common", -@@ -2668,6 +2844,7 @@ dependencies = [ - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-sled", -+ "matrix-sdk-sqlite", - "napi", - "napi-build", - "napi-derive", -@@ -2683,23 +2860,34 @@ name = "matrix-sdk-ffi" - version = "0.2.0" - dependencies = [ - "anyhow", -+ "base64 0.21.0", - "extension-trait", -+ "eyeball", -+ "eyeball-im", - "futures-core", -- "futures-signals", - "futures-util", -+ "log-panics", - "matrix-sdk", -+ "matrix-sdk-sled", -+ "matrix-sdk-sqlite", -+ "mime", - "once_cell", -+ "opentelemetry", -+ "opentelemetry-otlp", -+ "ruma", - "sanitize-filename-reader-friendly", -- "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tracing", -+ "tracing-android", -+ "tracing-core", -+ "tracing-opentelemetry", - "tracing-subscriber", - "uniffi", -- "uniffi_build", -- "uniffi_macros", -+ "url", -+ "zeroize", - ] - - [[package]] -@@ -2707,11 +2895,11 @@ name = "matrix-sdk-indexeddb" - version = "0.2.0" - dependencies = [ - "anyhow", -+ "assert_matches", - "async-trait", -- "base64", -+ "base64 0.21.0", - "dashmap", -- "derive_builder", -- "getrandom 0.2.7", -+ "getrandom 0.2.9", - "gloo-utils", - "indexed_db_futures", - "js-sys", -@@ -2724,8 +2912,9 @@ dependencies = [ - "serde", - "serde_json", - "thiserror", -+ "tokio", - "tracing", -- "uuid 1.1.2", -+ "uuid", - "wasm-bindgen", - "wasm-bindgen-test", - "web-sys", -@@ -2737,7 +2926,7 @@ version = "0.1.0" - dependencies = [ - "anyhow", - "assign", -- "ctor", -+ "ctor 0.2.0", - "matrix-sdk", - "once_cell", - "tempfile", -@@ -2750,7 +2939,7 @@ dependencies = [ - name = "matrix-sdk-qrcode" - version = "0.4.0" - dependencies = [ -- "base64", -+ "base64 0.21.0", - "byteorder", - "image 0.23.14", - "qrcode", -@@ -2763,10 +2952,10 @@ dependencies = [ - name = "matrix-sdk-sled" - version = "0.2.0" - dependencies = [ -+ "assert_matches", - "async-stream", - "async-trait", - "dashmap", -- "derive_builder", - "fs_extra", - "futures-core", - "futures-util", -@@ -2788,20 +2977,54 @@ dependencies = [ - ] - - [[package]] --name = "matrix-sdk-store-encryption" --version = "0.2.0" -+name = "matrix-sdk-sqlite" -+version = "0.1.0" - dependencies = [ -- "anyhow", -- "blake3", -+ "assert_matches", -+ "async-stream", -+ "async-trait", -+ "ctor 0.2.0", -+ "dashmap", -+ "deadpool-sqlite", -+ "fs_extra", -+ "futures-core", -+ "futures-util", -+ "glob", -+ "matrix-sdk-base", -+ "matrix-sdk-common", -+ "matrix-sdk-crypto", -+ "matrix-sdk-store-encryption", -+ "matrix-sdk-test", -+ "once_cell", -+ "rmp-serde", -+ "ruma", -+ "rusqlite", -+ "serde", -+ "serde_json", -+ "tempfile", -+ "thiserror", -+ "tokio", -+ "tracing", -+ "tracing-subscriber", -+ "vodozemac", -+] -+ -+[[package]] -+name = "matrix-sdk-store-encryption" -+version = "0.2.0" -+dependencies = [ -+ "anyhow", -+ "blake3", - "chacha20poly1305", - "displaydoc", -- "getrandom 0.2.7", -+ "getrandom 0.2.9", - "hmac", - "pbkdf2", - "rand 0.8.5", -+ "rmp-serde", - "serde", - "serde_json", -- "sha2 0.10.3", -+ "sha2 0.10.6", - "thiserror", - "zeroize", - ] -@@ -2826,7 +3049,7 @@ version = "0.3.0" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -2837,27 +3060,27 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - - [[package]] - name = "memmap2" --version = "0.5.7" -+version = "0.5.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" -+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" - dependencies = [ - "libc", - ] - - [[package]] - name = "memoffset" --version = "0.6.5" -+version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" - dependencies = [ - "autocfg", - ] - - [[package]] - name = "mime" --version = "0.3.16" -+version = "0.3.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - - [[package]] - name = "mime_guess" -@@ -2896,36 +3119,52 @@ dependencies = [ - - [[package]] - name = "miniz_oxide" --version = "0.5.3" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -+dependencies = [ -+ "adler", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" -+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" - dependencies = [ - "adler", -+ "simd-adler32", - ] - - [[package]] - name = "mio" --version = "0.8.4" -+version = "0.8.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" - dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", -- "windows-sys", -+ "windows-sys 0.45.0", - ] - -+[[package]] -+name = "multimap" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -+ - [[package]] - name = "napi" --version = "2.9.1" -+version = "2.12.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "743fece4c26c5132f8559080145fde9ba88700c0f1aa30a1ab3e057ab105814d" -+checksum = "69b29acdc6cc5c918c3eabd51d241b1c6dfa8914f3552fcfd76e1d7536934581" - dependencies = [ -- "bitflags", -- "ctor", -+ "bitflags 2.2.1", -+ "ctor 0.2.0", -+ "napi-derive", - "napi-sys", - "once_cell", -- "thread_local", - "tokio", - ] - -@@ -2937,45 +3176,46 @@ checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" - - [[package]] - name = "napi-derive" --version = "2.9.1" -+version = "2.12.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "39f3d8b02ef355898ea98f69082d9a183c8701c836942c2daf3e92364e88a0fa" -+checksum = "af2ac63101a19228b0881694cac07468d642fd10e4f943a9c9feebeebf1a4787" - dependencies = [ - "convert_case", - "napi-derive-backend", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] - name = "napi-derive-backend" --version = "1.0.38" -+version = "1.0.49" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6c35640513eb442fcbd1653a1c112fb6b2cc12b54d82f9c141f5859c721cab36" -+checksum = "0e32b5bc4d803e40b783b0aa3fe488eac8711cfaa4c5c9915293dfd3d0b99925" - dependencies = [ - "convert_case", - "once_cell", - "proc-macro2", - "quote", - "regex", -- "syn", -+ "semver", -+ "syn 1.0.109", - ] - - [[package]] - name = "napi-sys" --version = "2.2.2" -+version = "2.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "529671ebfae679f2ce9630b62dd53c72c56b3eb8b2c852e7e2fa91704ff93d67" -+checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" - dependencies = [ - "libloading", - ] - - [[package]] - name = "native-tls" --version = "0.2.10" -+version = "0.2.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" -+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" - dependencies = [ - "lazy_static", - "libc", -@@ -2990,42 +3230,28 @@ dependencies = [ - ] - - [[package]] --name = "ndk-context" --version = "0.1.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -- --[[package]] --name = "nibble_vec" --version = "0.1.0" -+name = "new_debug_unreachable" -+version = "1.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" --dependencies = [ -- "smallvec", --] -+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - - [[package]] - name = "nix" --version = "0.24.2" -+version = "0.26.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", - "cfg-if", - "libc", -+ "static_assertions", - ] - --[[package]] --name = "nodrop" --version = "0.1.14" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -- - [[package]] - name = "nom" --version = "7.1.1" -+version = "7.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" - dependencies = [ - "memchr", - "minimal-lexical", -@@ -3043,12 +3269,12 @@ dependencies = [ - - [[package]] - name = "num-format" --version = "0.4.0" -+version = "0.4.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" -+checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" - dependencies = [ -- "arrayvec 0.4.12", -- "itoa 0.4.8", -+ "arrayvec", -+ "itoa", - ] - - [[package]] -@@ -3101,32 +3327,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" - dependencies = [ - "autocfg", -+ "libm", - ] - - [[package]] - name = "num_cpus" --version = "1.13.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" --dependencies = [ -- "hermit-abi", -- "libc", --] -- --[[package]] --name = "num_threads" --version = "0.1.6" -+version = "1.15.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" - dependencies = [ -+ "hermit-abi 0.2.6", - "libc", - ] - - [[package]] - name = "object" --version = "0.29.0" -+version = "0.30.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" - dependencies = [ - "memchr", - ] -@@ -3137,7 +3355,7 @@ version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dd6c2c7054110ce4d7b4756d7b7fe507fea9413968ad0ef8f1d043d504aec725" - dependencies = [ -- "getrandom 0.2.7", -+ "getrandom 0.2.9", - "olm-sys", - "serde", - "serde_json", -@@ -3156,9 +3374,9 @@ dependencies = [ - - [[package]] - name = "once_cell" --version = "1.13.1" -+version = "1.17.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" -+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - - [[package]] - name = "oorandom" -@@ -3174,11 +3392,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - - [[package]] - name = "openssl" --version = "0.10.41" -+version = "0.10.51" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" -+checksum = "97ea2d98598bf9ada7ea6ee8a30fb74f9156b63bbe495d64ec2b87c269d2dda3" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", - "cfg-if", - "foreign-types", - "libc", -@@ -3189,13 +3407,13 @@ dependencies = [ - - [[package]] - name = "openssl-macros" --version = "0.1.0" -+version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.15", - ] - - [[package]] -@@ -3206,22 +3424,116 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - - [[package]] - name = "openssl-sys" --version = "0.9.75" -+version = "0.9.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" -+checksum = "992bac49bdbab4423199c654a5515bd2a6c6a23bf03f2dd3bdb7e5ae6259bc69" - dependencies = [ -- "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", - ] - -+[[package]] -+name = "opentelemetry" -+version = "0.18.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -+dependencies = [ -+ "opentelemetry_api", -+ "opentelemetry_sdk", -+] -+ -+[[package]] -+name = "opentelemetry-http" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" -+dependencies = [ -+ "async-trait", -+ "bytes", -+ "http", -+ "opentelemetry_api", -+ "reqwest", -+] -+ -+[[package]] -+name = "opentelemetry-otlp" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" -+dependencies = [ -+ "async-trait", -+ "futures", -+ "futures-util", -+ "http", -+ "opentelemetry", -+ "opentelemetry-http", -+ "opentelemetry-proto", -+ "prost", -+ "reqwest", -+ "thiserror", -+ "tokio", -+ "tonic", -+] -+ -+[[package]] -+name = "opentelemetry-proto" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" -+dependencies = [ -+ "futures", -+ "futures-util", -+ "opentelemetry", -+ "prost", -+ "tonic", -+ "tonic-build", -+] -+ -+[[package]] -+name = "opentelemetry_api" -+version = "0.18.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -+dependencies = [ -+ "fnv", -+ "futures-channel", -+ "futures-util", -+ "indexmap", -+ "js-sys", -+ "once_cell", -+ "pin-project-lite", -+ "thiserror", -+] -+ -+[[package]] -+name = "opentelemetry_sdk" -+version = "0.18.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" -+dependencies = [ -+ "async-trait", -+ "crossbeam-channel", -+ "dashmap", -+ "fnv", -+ "futures-channel", -+ "futures-executor", -+ "futures-util", -+ "once_cell", -+ "opentelemetry_api", -+ "percent-encoding", -+ "rand 0.8.5", -+ "thiserror", -+ "tokio", -+ "tokio-stream", -+] -+ - [[package]] - name = "os_str_bytes" --version = "6.3.0" -+version = "6.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -+checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - - [[package]] - name = "overload" -@@ -3231,9 +3543,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - - [[package]] - name = "parking" --version = "2.0.0" -+version = "2.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - - [[package]] - name = "parking_lot" -@@ -3243,7 +3555,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" - dependencies = [ - "instant", - "lock_api", -- "parking_lot_core 0.8.5", -+ "parking_lot_core 0.8.6", - ] - - [[package]] -@@ -3253,34 +3565,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" - dependencies = [ - "lock_api", -- "parking_lot_core 0.9.3", -+ "parking_lot_core 0.9.7", - ] - - [[package]] - name = "parking_lot_core" --version = "0.8.5" -+version = "0.8.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" - dependencies = [ - "cfg-if", - "instant", - "libc", -- "redox_syscall", -+ "redox_syscall 0.2.16", - "smallvec", - "winapi", - ] - - [[package]] - name = "parking_lot_core" --version = "0.9.3" -+version = "0.9.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" - dependencies = [ - "cfg-if", - "libc", -- "redox_syscall", -+ "redox_syscall 0.2.16", - "smallvec", -- "windows-sys", -+ "windows-sys 0.45.0", - ] - - [[package]] -@@ -3290,15 +3602,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" - dependencies = [ - "base64ct", -- "rand_core 0.6.3", -+ "rand_core 0.6.4", - "subtle", - ] - - [[package]] - name = "paste" --version = "1.0.9" -+version = "1.0.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" -+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - - [[package]] - name = "pbkdf2" -@@ -3306,10 +3618,10 @@ version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" - dependencies = [ -- "digest 0.10.3", -+ "digest 0.10.6", - "hmac", - "password-hash", -- "sha2 0.10.3", -+ "sha2 0.10.6", - ] - - [[package]] -@@ -3318,6 +3630,96 @@ version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -+[[package]] -+name = "petgraph" -+version = "0.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -+dependencies = [ -+ "fixedbitset", -+ "indexmap", -+] -+ -+[[package]] -+name = "phf" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -+dependencies = [ -+ "phf_shared 0.10.0", -+] -+ -+[[package]] -+name = "phf" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -+dependencies = [ -+ "phf_macros", -+ "phf_shared 0.11.1", -+] -+ -+[[package]] -+name = "phf_codegen" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -+dependencies = [ -+ "phf_generator 0.10.0", -+ "phf_shared 0.10.0", -+] -+ -+[[package]] -+name = "phf_generator" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -+dependencies = [ -+ "phf_shared 0.10.0", -+ "rand 0.8.5", -+] -+ -+[[package]] -+name = "phf_generator" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -+dependencies = [ -+ "phf_shared 0.11.1", -+ "rand 0.8.5", -+] -+ -+[[package]] -+name = "phf_macros" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" -+dependencies = [ -+ "phf_generator 0.11.1", -+ "phf_shared 0.11.1", -+ "proc-macro2", -+ "quote", -+ "syn 1.0.109", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -+dependencies = [ -+ "siphasher", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -+dependencies = [ -+ "siphasher", -+] -+ - [[package]] - name = "pin-project" - version = "1.0.12" -@@ -3335,7 +3737,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -3362,9 +3764,9 @@ dependencies = [ - - [[package]] - name = "pkg-config" --version = "0.3.25" -+version = "0.3.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" -+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - - [[package]] - name = "plain" -@@ -3374,9 +3776,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - - [[package]] - name = "plotters" --version = "0.3.3" -+version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "716b4eeb6c4a1d3ecc956f75b43ec2e8e8ba80026413e70a3f41fd3313d3492b" -+checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" - dependencies = [ - "num-traits", - "plotters-backend", -@@ -3406,22 +3808,39 @@ version = "0.16.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", - "crc32fast", -- "deflate 0.8.6", -+ "deflate", - "miniz_oxide 0.3.7", - ] - - [[package]] - name = "png" --version = "0.17.5" -+version = "0.17.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" -+checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", - "crc32fast", -- "deflate 1.0.0", -- "miniz_oxide 0.5.3", -+ "fdeflate", -+ "flate2", -+ "miniz_oxide 0.7.1", -+] -+ -+[[package]] -+name = "polling" -+version = "2.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -+dependencies = [ -+ "autocfg", -+ "bitflags 1.3.2", -+ "cfg-if", -+ "concurrent-queue", -+ "libc", -+ "log", -+ "pin-project-lite", -+ "windows-sys 0.48.0", - ] - - [[package]] -@@ -3437,9 +3856,9 @@ dependencies = [ - - [[package]] - name = "pprof" --version = "0.10.1" -+version = "0.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d6472bfed9475542ac46c518734a8d06d71b0f6cb2c17f904aa301711a57786f" -+checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059" - dependencies = [ - "backtrace", - "cfg-if", -@@ -3459,19 +3878,34 @@ dependencies = [ - - [[package]] - name = "ppv-lite86" --version = "0.2.16" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -+ -+[[package]] -+name = "precomputed-hash" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -+ -+[[package]] -+name = "prettyplease" -+version = "0.1.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -+dependencies = [ -+ "proc-macro2", -+ "syn 1.0.109", -+] - - [[package]] - name = "proc-macro-crate" --version = "1.2.1" -+version = "1.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" - dependencies = [ - "once_cell", -- "thiserror", -- "toml", -+ "toml_edit", - ] - - [[package]] -@@ -3483,7 +3917,7 @@ dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "version_check", - ] - -@@ -3500,20 +3934,20 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.43" -+version = "1.0.56" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" - dependencies = [ - "unicode-ident", - ] - - [[package]] - name = "proptest" --version = "1.0.0" -+version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5" -+checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", - "byteorder", - "lazy_static", - "num-traits", -@@ -3521,30 +3955,62 @@ dependencies = [ - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_xorshift", -- "regex-syntax", -+ "regex-syntax 0.6.29", -+ "unarray", - ] - - [[package]] - name = "prost" --version = "0.11.0" -+version = "0.11.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" -+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" - dependencies = [ - "bytes", - "prost-derive", - ] - - [[package]] --name = "prost-derive" --version = "0.11.0" -+name = "prost-build" -+version = "0.11.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" -+checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" - dependencies = [ -- "anyhow", -+ "bytes", -+ "heck", - "itertools", -- "proc-macro2", -+ "lazy_static", -+ "log", -+ "multimap", -+ "petgraph", -+ "prettyplease", -+ "prost", -+ "prost-types", -+ "regex", -+ "syn 1.0.109", -+ "tempfile", -+ "which", -+] -+ -+[[package]] -+name = "prost-derive" -+version = "0.11.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -+dependencies = [ -+ "anyhow", -+ "itertools", -+ "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", -+] -+ -+[[package]] -+name = "prost-types" -+version = "0.11.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -+dependencies = [ -+ "prost", - ] - - [[package]] -@@ -3553,7 +4019,7 @@ version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", - "memchr", - "unicase", - ] -@@ -3576,32 +4042,22 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - - [[package]] - name = "quick-xml" --version = "0.23.0" -+version = "0.26.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9279fbdacaad3baf559d8cabe0acc3d06e30ea14931af31af79578ac0946decc" -+checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" - dependencies = [ - "memchr", - ] - - [[package]] - name = "quote" --version = "1.0.21" -+version = "1.0.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" - dependencies = [ - "proc-macro2", - ] - --[[package]] --name = "radix_trie" --version = "0.2.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" --dependencies = [ -- "endian-type", -- "nibble_vec", --] -- - [[package]] - name = "rand" - version = "0.7.3" -@@ -3623,7 +4079,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" - dependencies = [ - "libc", - "rand_chacha 0.3.1", -- "rand_core 0.6.3", -+ "rand_core 0.6.4", - ] - - [[package]] -@@ -3643,7 +4099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" - dependencies = [ - "ppv-lite86", -- "rand_core 0.6.3", -+ "rand_core 0.6.4", - ] - - [[package]] -@@ -3657,11 +4113,11 @@ dependencies = [ - - [[package]] - name = "rand_core" --version = "0.6.3" -+version = "0.6.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - dependencies = [ -- "getrandom 0.2.7", -+ "getrandom 0.2.9", - ] - - [[package]] -@@ -3679,26 +4135,33 @@ version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" - dependencies = [ -- "rand_core 0.6.3", -+ "rand_core 0.6.4", -+] -+ -+[[package]] -+name = "rand_xoshiro" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -+dependencies = [ -+ "rand_core 0.6.4", - ] - - [[package]] - name = "rayon" --version = "1.5.3" -+version = "1.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" -+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" - dependencies = [ -- "autocfg", -- "crossbeam-deque", - "either", - "rayon-core", - ] - - [[package]] - name = "rayon-core" --version = "1.9.3" -+version = "1.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" -+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" - dependencies = [ - "crossbeam-channel", - "crossbeam-deque", -@@ -3706,13 +4169,28 @@ dependencies = [ - "num_cpus", - ] - -+[[package]] -+name = "readlock" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed5b7f359207e69e1395440120fa3b07c59bb92c4ec077804cd10d7ebbe4c01a" -+ - [[package]] - name = "redox_syscall" - version = "0.2.16" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -+dependencies = [ -+ "bitflags 1.3.2", - ] - - [[package]] -@@ -3721,20 +4199,20 @@ version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" - dependencies = [ -- "getrandom 0.2.7", -- "redox_syscall", -+ "getrandom 0.2.9", -+ "redox_syscall 0.2.16", - "thiserror", - ] - - [[package]] - name = "regex" --version = "1.6.0" -+version = "1.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -+checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" - dependencies = [ - "aho-corasick", - "memchr", -- "regex-syntax", -+ "regex-syntax 0.7.1", - ] - - [[package]] -@@ -3743,31 +4221,29 @@ version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - dependencies = [ -- "regex-syntax", -+ "regex-syntax 0.6.29", - ] - - [[package]] - name = "regex-syntax" --version = "0.6.27" -+version = "0.6.29" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - - [[package]] --name = "remove_dir_all" --version = "0.5.3" -+name = "regex-syntax" -+version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" --dependencies = [ -- "winapi", --] -+checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" - - [[package]] - name = "reqwest" --version = "0.11.11" -+version = "0.11.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" -+checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" - dependencies = [ -- "base64", -+ "async-compression", -+ "base64 0.21.0", - "bytes", - "encoding_rs", - "futures-core", -@@ -3780,10 +4256,10 @@ dependencies = [ - "hyper-tls", - "ipnet", - "js-sys", -- "lazy_static", - "log", - "mime", - "native-tls", -+ "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", -@@ -3795,6 +4271,7 @@ dependencies = [ - "tokio-native-tls", - "tokio-rustls", - "tokio-socks", -+ "tokio-util", - "tower-service", - "url", - "wasm-bindgen", -@@ -3812,9 +4289,9 @@ checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" - - [[package]] - name = "rgb" --version = "0.8.33" -+version = "0.8.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3b221de559e4a29df3b957eec92bc0de6bc8eaf6ca9cfed43e5e1d67ff65a34" -+checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" - dependencies = [ - "bytemuck", - ] -@@ -3835,10 +4312,31 @@ dependencies = [ - ] - - [[package]] --name = "ruma" --version = "0.7.4" -+name = "rmp" -+version = "0.8.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" -+dependencies = [ -+ "byteorder", -+ "num-traits", -+ "paste", -+] -+ -+[[package]] -+name = "rmp-serde" -+version = "1.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8dc348e3a4a18abc4e97fffa5e2e623f6edd50ba3a1dd5f47eb249fea713b69f" -+checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" -+dependencies = [ -+ "byteorder", -+ "rmp", -+ "serde", -+] -+ -+[[package]] -+name = "ruma" -+version = "0.8.2" -+source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" - dependencies = [ - "assign", - "js_int", -@@ -3847,14 +4345,15 @@ dependencies = [ - "ruma-client-api", - "ruma-common", - "ruma-federation-api", -+ "ruma-push-gateway-api", - ] - - [[package]] - name = "ruma-appservice-api" --version = "0.7.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d4f8cecdd4e2729656fc4126b6b5b218834d4025e0ed0e5063087a0231098a5c" -+version = "0.8.1" -+source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" - dependencies = [ -+ "js_int", - "ruma-common", - "serde", - "serde_json", -@@ -3862,57 +4361,58 @@ dependencies = [ - - [[package]] - name = "ruma-client-api" --version = "0.15.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d1e72bc731b4dc8b569aa83915f13e419144b67110d858c65bb74aa05e2dc4b7" -+version = "0.16.2" -+source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" - dependencies = [ - "assign", - "bytes", - "http", - "js_int", -+ "js_option", - "maplit", -- "percent-encoding", - "ruma-common", - "serde", -+ "serde_html_form", - "serde_json", - ] - - [[package]] - name = "ruma-common" --version = "0.10.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "716889595f4edc3cfeb94d9f122e413f73e37d7d80ea1c14196e1004241a3889" -+version = "0.11.3" -+source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" - dependencies = [ -- "base64", -+ "base64 0.21.0", - "bytes", - "form_urlencoded", -- "getrandom 0.2.7", -+ "getrandom 0.2.9", -+ "html5ever", - "http", - "indexmap", -- "itoa 1.0.3", - "js-sys", - "js_int", - "js_option", -+ "konst", - "percent-encoding", -+ "phf 0.11.1", - "pulldown-cmark", - "rand 0.8.5", - "regex", - "ruma-identifiers-validation", - "ruma-macros", - "serde", -+ "serde_html_form", - "serde_json", - "thiserror", - "tracing", - "url", -- "uuid 1.1.2", -+ "uuid", - "wildmatch", - ] - - [[package]] - name = "ruma-federation-api" --version = "0.6.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9f905d12f6144c7a754bd0339fa6893698c03d03a908abb20cc6eeb4ec7f9466" -+version = "0.7.1" -+source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" - dependencies = [ - "js_int", - "ruma-common", -@@ -3922,9 +4422,8 @@ dependencies = [ - - [[package]] - name = "ruma-identifiers-validation" --version = "0.9.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eabac62d16465a87435579c779d74dceabb93b09e44c766af6085050f3cc4275" -+version = "0.9.1" -+source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" - dependencies = [ - "js_int", - "thiserror", -@@ -3932,9 +4431,8 @@ dependencies = [ - - [[package]] - name = "ruma-macros" --version = "0.10.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f82e91eb61cd86d9287303133ee55b54618eccb75a522cc22a42c15f5bda340" -+version = "0.11.3" -+source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" - dependencies = [ - "once_cell", - "proc-macro-crate", -@@ -3942,35 +4440,60 @@ dependencies = [ - "quote", - "ruma-identifiers-validation", - "serde", -- "syn", -- "toml", -+ "syn 1.0.109", -+ "toml 0.7.3", -+] -+ -+[[package]] -+name = "ruma-push-gateway-api" -+version = "0.7.1" -+source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -+dependencies = [ -+ "js_int", -+ "ruma-common", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] -+name = "rusqlite" -+version = "0.28.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" -+dependencies = [ -+ "bitflags 1.3.2", -+ "fallible-iterator", -+ "fallible-streaming-iterator", -+ "hashlink", -+ "libsqlite3-sys", -+ "smallvec", - ] - - [[package]] - name = "rustc-demangle" --version = "0.1.21" -+version = "0.1.23" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - - [[package]] - name = "rustix" --version = "0.35.9" -+version = "0.37.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada" -+checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", -- "windows-sys", -+ "windows-sys 0.48.0", - ] - - [[package]] - name = "rustls" --version = "0.20.6" -+version = "0.20.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" -+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" - dependencies = [ - "log", - "ring", -@@ -3980,52 +4503,24 @@ dependencies = [ - - [[package]] - name = "rustls-pemfile" --version = "1.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" --dependencies = [ -- "base64", --] -- --[[package]] --name = "rustyline" --version = "10.0.0" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e" -+checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" - dependencies = [ -- "bitflags", -- "cfg-if", -- "clipboard-win", -- "dirs-next", -- "fd-lock", -- "libc", -- "log", -- "memchr", -- "nix", -- "radix_trie", -- "scopeguard", -- "unicode-segmentation", -- "unicode-width", -- "utf8parse", -- "winapi", -+ "base64 0.21.0", - ] - - [[package]] --name = "rustyline-derive" --version = "0.7.0" -+name = "rustversion" -+version = "1.0.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "107c3d5d7f370ac09efa62a78375f94d94b8a33c61d8c278b96683fb4dbf2d8d" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn", --] -+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - - [[package]] - name = "ryu" --version = "1.0.11" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - - [[package]] - name = "same-file" -@@ -4047,19 +4542,18 @@ dependencies = [ - - [[package]] - name = "schannel" --version = "0.1.20" -+version = "0.1.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -+checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" - dependencies = [ -- "lazy_static", -- "windows-sys", -+ "windows-sys 0.42.0", - ] - - [[package]] - name = "scoped-tls" --version = "1.0.0" -+version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" -+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - - [[package]] - name = "scoped_threadpool" -@@ -4073,6 +4567,12 @@ version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -+[[package]] -+name = "scratch" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" -+ - [[package]] - name = "scroll" - version = "0.11.0" -@@ -4090,7 +4590,7 @@ checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -4105,11 +4605,11 @@ dependencies = [ - - [[package]] - name = "security-framework" --version = "2.7.0" -+version = "2.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -+checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" - dependencies = [ -- "bitflags", -+ "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", -@@ -4118,9 +4618,9 @@ dependencies = [ - - [[package]] - name = "security-framework-sys" --version = "2.6.1" -+version = "2.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -+checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" - dependencies = [ - "core-foundation-sys", - "libc", -@@ -4128,63 +4628,75 @@ dependencies = [ - - [[package]] - name = "semver" --version = "1.0.13" -+version = "1.0.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" -+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - dependencies = [ - "serde", - ] - - [[package]] - name = "serde" --version = "1.0.144" -+version = "1.0.160" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" -+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_bytes" --version = "0.11.7" -+version = "0.11.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" -+checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" - dependencies = [ - "serde", - ] - - [[package]] --name = "serde_cbor" --version = "0.11.2" -+name = "serde_derive" -+version = "1.0.160" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" - dependencies = [ -- "half", -- "serde", -+ "proc-macro2", -+ "quote", -+ "syn 2.0.15", - ] - - [[package]] --name = "serde_derive" --version = "1.0.144" -+name = "serde_html_form" -+version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" -+checksum = "53192e38d5c88564b924dbe9b60865ecbb71b81d38c4e61c817cffd3e36ef696" - dependencies = [ -- "proc-macro2", -- "quote", -- "syn", -+ "form_urlencoded", -+ "indexmap", -+ "itoa", -+ "ryu", -+ "serde", - ] - - [[package]] - name = "serde_json" --version = "1.0.85" -+version = "1.0.96" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" -+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" - dependencies = [ -- "itoa 1.0.3", -+ "itoa", - "ryu", - "serde", - ] - -+[[package]] -+name = "serde_path_to_error" -+version = "0.1.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" -+dependencies = [ -+ "serde", -+] -+ - [[package]] - name = "serde_qs" - version = "0.8.5" -@@ -4196,6 +4708,15 @@ dependencies = [ - "thiserror", - ] - -+[[package]] -+name = "serde_spanned" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -+dependencies = [ -+ "serde", -+] -+ - [[package]] - name = "serde_urlencoded" - version = "0.7.1" -@@ -4203,19 +4724,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" - dependencies = [ - "form_urlencoded", -- "itoa 1.0.3", -+ "itoa", - "ryu", - "serde", - ] - - [[package]] - name = "serde_yaml" --version = "0.9.10" -+version = "0.9.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7a09f551ccc8210268ef848f0bab37b306e87b85b2e017b899e7fb815f5aed62" -+checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" - dependencies = [ - "indexmap", -- "itoa 1.0.3", -+ "itoa", - "ryu", - "serde", - "unsafe-libyaml", -@@ -4236,13 +4757,13 @@ dependencies = [ - - [[package]] - name = "sha2" --version = "0.10.3" -+version = "0.10.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "899bf02746a2c92bf1053d9327dadb252b01af1f81f90cdb902411f518bc7215" -+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" - dependencies = [ - "cfg-if", - "cpufeatures", -- "digest 0.10.3", -+ "digest 0.10.6", - ] - - [[package]] -@@ -4256,45 +4777,46 @@ dependencies = [ - - [[package]] - name = "signal-hook" --version = "0.3.14" -+version = "0.3.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" -+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" - dependencies = [ - "libc", - "signal-hook-registry", - ] - - [[package]] --name = "signal-hook-mio" --version = "0.2.3" -+name = "signal-hook-registry" -+version = "1.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" - dependencies = [ - "libc", -- "mio", -- "signal-hook", - ] - - [[package]] --name = "signal-hook-registry" --version = "1.4.0" -+name = "signature" -+version = "1.6.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" --dependencies = [ -- "libc", --] -+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - - [[package]] --name = "signature" --version = "1.6.0" -+name = "simd-adler32" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" -+ -+[[package]] -+name = "siphasher" -+version = "0.3.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0ea32af43239f0d353a7dd75a22d94c329c8cdaafdcb4c1c1335aa10c298a4a" -+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - - [[package]] - name = "slab" --version = "0.4.7" -+version = "0.4.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" - dependencies = [ - "autocfg", - ] -@@ -4316,39 +4838,31 @@ dependencies = [ - ] - - [[package]] --name = "sled-state-inspector" -+name = "sliding-sync-integration-test" - version = "0.1.0" - dependencies = [ -- "atty", -- "clap 3.2.22", -+ "anyhow", -+ "assert_matches", -+ "eyeball", -+ "eyeball-im", - "futures", -- "matrix-sdk-base", -- "matrix-sdk-sled", -- "ruma", -- "rustyline", -- "rustyline-derive", -- "serde", -- "serde_json", -- "syntect", -+ "matrix-sdk", -+ "matrix-sdk-integration-testing", -+ "tokio", -+ "uuid", - ] - --[[package]] --name = "slog" --version = "2.7.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" -- - [[package]] - name = "smallvec" --version = "1.9.0" -+version = "1.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" -+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - - [[package]] - name = "socket2" --version = "0.4.6" -+version = "0.4.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "10c98bba371b9b22a71a9414e420f92ddeb2369239af08200816169d5e2dd7aa" -+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" - dependencies = [ - "libc", - "winapi", -@@ -4381,12 +4895,6 @@ version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - --[[package]] --name = "str-buf" --version = "1.0.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" -- - [[package]] - name = "str_stack" - version = "0.1.0" -@@ -4394,41 +4902,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" - - [[package]] --name = "strsim" --version = "0.8.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -- --[[package]] --name = "strsim" --version = "0.10.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -- --[[package]] --name = "structopt" --version = "0.3.26" -+name = "string_cache" -+version = "0.8.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" - dependencies = [ -- "clap 2.34.0", -- "lazy_static", -- "structopt-derive", -+ "new_debug_unreachable", -+ "once_cell", -+ "parking_lot 0.12.1", -+ "phf_shared 0.10.0", -+ "precomputed-hash", -+ "serde", - ] - - [[package]] --name = "structopt-derive" --version = "0.4.18" -+name = "string_cache_codegen" -+version = "0.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -+checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" - dependencies = [ -- "heck 0.3.3", -- "proc-macro-error", -+ "phf_generator 0.10.0", -+ "phf_shared 0.10.0", - "proc-macro2", - "quote", -- "syn", - ] - -+[[package]] -+name = "strsim" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -+ - [[package]] - name = "subtle" - version = "2.4.1" -@@ -4437,21 +4941,21 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - - [[package]] - name = "symbolic-common" --version = "9.1.1" -+version = "10.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3e555b2c3ebd97b963c8a3e94ce5e5137ba42da4a26687f81c700d8de1c997f0" -+checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737" - dependencies = [ - "debugid", - "memmap2", - "stable_deref_trait", -- "uuid 1.1.2", -+ "uuid", - ] - - [[package]] - name = "symbolic-demangle" --version = "9.1.1" -+version = "10.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "71a1425bccf0a24c68c9faea6c4f1f84b4865a3dd5976454d8a796c80216e38a" -+checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489" - dependencies = [ - "cpp_demangle", - "rustc-demangle", -@@ -4460,9 +4964,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "1.0.99" -+version = "1.0.109" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" - dependencies = [ - "proc-macro2", - "quote", -@@ -4470,129 +4974,88 @@ dependencies = [ - ] - - [[package]] --name = "sync_wrapper" --version = "0.1.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" -- --[[package]] --name = "synstructure" --version = "0.12.6" -+name = "syn" -+version = "2.0.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -- "unicode-xid", -+ "unicode-ident", - ] - - [[package]] --name = "syntect" --version = "5.0.0" -+name = "sync_wrapper" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8" --dependencies = [ -- "bincode", -- "bitflags", -- "fancy-regex", -- "flate2", -- "fnv", -- "lazy_static", -- "once_cell", -- "regex-syntax", -- "serde", -- "serde_derive", -- "serde_json", -- "thiserror", -- "walkdir", --] -+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - - [[package]] - name = "tempfile" --version = "3.3.0" -+version = "3.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" - dependencies = [ - "cfg-if", - "fastrand", -- "libc", -- "redox_syscall", -- "remove_dir_all", -- "winapi", --] -- --[[package]] --name = "termcolor" --version = "1.1.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" --dependencies = [ -- "winapi-util", -+ "redox_syscall 0.3.5", -+ "rustix", -+ "windows-sys 0.45.0", - ] - - [[package]] --name = "terminal_size" --version = "0.1.17" -+name = "tendril" -+version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -+checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" - dependencies = [ -- "libc", -- "winapi", -+ "futf", -+ "mac", -+ "utf-8", - ] - - [[package]] --name = "textwrap" --version = "0.11.0" -+name = "termcolor" -+version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" - dependencies = [ -- "unicode-width", -+ "winapi-util", - ] - - [[package]] - name = "textwrap" --version = "0.15.1" -+version = "0.16.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" -+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - - [[package]] - name = "thiserror" --version = "1.0.33" -+version = "1.0.40" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3d0a539a918745651435ac7db7a18761589a94cd7e94cd56999f828bf73c8a57" -+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.33" -+version = "1.0.40" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c251e90f708e16c49a16f4917dc2131e75222b72edfa9cb7f7c58ae56aae0c09" -+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" - dependencies = [ - "proc-macro2", - "quote", -- "syn", --] -- --[[package]] --name = "thread-id" --version = "4.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" --dependencies = [ -- "libc", -- "redox_syscall", -- "winapi", -+ "syn 2.0.15", - ] - - [[package]] - name = "thread_local" --version = "1.1.4" -+version = "1.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" - dependencies = [ -+ "cfg-if", - "once_cell", - ] - -@@ -4609,20 +5072,20 @@ dependencies = [ - - [[package]] - name = "tiff" --version = "0.7.3" -+version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65" -+checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" - dependencies = [ - "flate2", -- "jpeg-decoder 0.2.6", -+ "jpeg-decoder 0.3.0", - "weezl", - ] - - [[package]] - name = "time" --version = "0.1.44" -+version = "0.1.45" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" - dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", -@@ -4631,13 +5094,29 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.14" -+version = "0.3.20" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" -+checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" - dependencies = [ -- "itoa 1.0.3", -- "libc", -- "num_threads", -+ "itoa", -+ "serde", -+ "time-core", -+ "time-macros", -+] -+ -+[[package]] -+name = "time-core" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" -+ -+[[package]] -+name = "time-macros" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -+dependencies = [ -+ "time-core", - ] - - [[package]] -@@ -4661,44 +5140,53 @@ dependencies = [ - - [[package]] - name = "tinyvec_macros" --version = "0.1.0" -+version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - - [[package]] - name = "tokio" --version = "1.21.2" -+version = "1.27.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" -+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" - dependencies = [ - "autocfg", - "bytes", - "libc", -- "memchr", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "tokio-macros", -- "winapi", -+ "windows-sys 0.45.0", -+] -+ -+[[package]] -+name = "tokio-io-timeout" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -+dependencies = [ -+ "pin-project-lite", -+ "tokio", - ] - - [[package]] - name = "tokio-macros" --version = "1.8.0" -+version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" -+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.15", - ] - - [[package]] - name = "tokio-native-tls" --version = "0.3.0" -+version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" - dependencies = [ - "native-tls", - "tokio", -@@ -4729,20 +5217,21 @@ dependencies = [ - - [[package]] - name = "tokio-stream" --version = "0.1.9" -+version = "0.1.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" -+checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" - dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -+ "tokio-util", - ] - - [[package]] - name = "tokio-util" --version = "0.7.3" -+version = "0.7.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" -+checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" - dependencies = [ - "bytes", - "futures-core", -@@ -4754,46 +5243,110 @@ dependencies = [ - - [[package]] - name = "toml" --version = "0.5.9" -+version = "0.5.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" - dependencies = [ - "serde", - ] - - [[package]] --name = "tower" --version = "0.4.13" -+name = "toml" -+version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -+checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" - dependencies = [ -+ "serde", -+ "serde_spanned", -+ "toml_datetime", -+ "toml_edit", -+] -+ -+[[package]] -+name = "toml_datetime" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "toml_edit" -+version = "0.19.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -+dependencies = [ -+ "indexmap", -+ "serde", -+ "serde_spanned", -+ "toml_datetime", -+ "winnow", -+] -+ -+[[package]] -+name = "tonic" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" -+dependencies = [ -+ "async-stream", -+ "async-trait", -+ "axum", -+ "base64 0.13.1", -+ "bytes", - "futures-core", - "futures-util", -+ "h2", -+ "http", -+ "http-body", -+ "hyper", -+ "hyper-timeout", -+ "percent-encoding", - "pin-project", -- "pin-project-lite", -+ "prost", -+ "prost-derive", - "tokio", -+ "tokio-stream", -+ "tokio-util", -+ "tower", - "tower-layer", - "tower-service", - "tracing", -+ "tracing-futures", - ] - - [[package]] --name = "tower-http" --version = "0.3.4" -+name = "tonic-build" -+version = "0.8.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" -+checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -+dependencies = [ -+ "prettyplease", -+ "proc-macro2", -+ "prost-build", -+ "quote", -+ "syn 1.0.109", -+] -+ -+[[package]] -+name = "tower" -+version = "0.4.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" - dependencies = [ -- "bitflags", -- "bytes", - "futures-core", - "futures-util", -- "http", -- "http-body", -- "http-range-header", -+ "indexmap", -+ "pin-project", - "pin-project-lite", -- "tower", -+ "rand 0.8.5", -+ "slab", -+ "tokio", -+ "tokio-util", - "tower-layer", - "tower-service", -+ "tracing", - ] - - [[package]] -@@ -4810,9 +5363,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - - [[package]] - name = "tracing" --version = "0.1.36" -+version = "0.1.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" -+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" - dependencies = [ - "cfg-if", - "log", -@@ -4821,15 +5374,26 @@ dependencies = [ - "tracing-core", - ] - -+[[package]] -+name = "tracing-android" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12612be8f868a09c0ceae7113ff26afe79d81a24473a393cb9120ece162e86c0" -+dependencies = [ -+ "android_log-sys", -+ "tracing", -+ "tracing-subscriber", -+] -+ - [[package]] - name = "tracing-attributes" --version = "0.1.22" -+version = "0.1.23" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" -+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -4843,14 +5407,13 @@ dependencies = [ - ] - - [[package]] --name = "tracing-flame" --version = "0.2.0" -+name = "tracing-futures" -+version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" -+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" - dependencies = [ -- "lazy_static", -+ "pin-project", - "tracing", -- "tracing-subscriber", - ] - - [[package]] -@@ -4864,11 +5427,25 @@ dependencies = [ - "tracing-core", - ] - -+[[package]] -+name = "tracing-opentelemetry" -+version = "0.18.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" -+dependencies = [ -+ "once_cell", -+ "opentelemetry", -+ "tracing", -+ "tracing-core", -+ "tracing-log", -+ "tracing-subscriber", -+] -+ - [[package]] - name = "tracing-subscriber" --version = "0.3.16" -+version = "0.3.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" -+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" - dependencies = [ - "matchers", - "nu-ansi-term", -@@ -4877,7 +5454,7 @@ dependencies = [ - "sharded-slab", - "smallvec", - "thread_local", -- "time 0.3.14", -+ "time 0.3.20", - "tracing", - "tracing-core", - "tracing-log", -@@ -4885,68 +5462,21 @@ dependencies = [ - - [[package]] - name = "try-lock" --version = "0.2.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -- --[[package]] --name = "tui" --version = "0.18.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "96fe69244ec2af261bced1d9046a6fee6c8c2a6b0228e59e5ba39bc8ba4ed729" --dependencies = [ -- "bitflags", -- "cassowary", -- "crossterm", -- "unicode-segmentation", -- "unicode-width", --] -- --[[package]] --name = "tui-logger" --version = "0.8.0" -+version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5c9564fd9c18a1f9a20fb8613494744778e357aa0cd5c7d85fdf699a4e5b4962" --dependencies = [ -- "chrono", -- "fxhash", -- "lazy_static", -- "log", -- "parking_lot 0.12.1", -- "slog", -- "tui", --] -+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - - [[package]] --name = "tuirealm" --version = "1.7.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0241dbec136199389efb5420fc88dd62cf2543a994547726cabcb76d7e94336" --dependencies = [ -- "bitflags", -- "crossterm", -- "lazy-regex", -- "thiserror", -- "tui", -- "tuirealm_derive", --] -- --[[package]] --name = "tuirealm_derive" --version = "1.0.0" -+name = "typenum" -+version = "1.16.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e0adcdaf59881626555558eae08f8a53003c8a1961723b4d7a10c51599abbc81" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn", --] -+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - - [[package]] --name = "typenum" --version = "1.15.0" -+name = "unarray" -+version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - - [[package]] - name = "unicase" -@@ -4959,95 +5489,124 @@ dependencies = [ - - [[package]] - name = "unicode-bidi" --version = "0.3.8" -+version = "0.3.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" -+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - - [[package]] - name = "unicode-ident" --version = "1.0.3" -+version = "1.0.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" -+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - - [[package]] - name = "unicode-normalization" --version = "0.1.21" -+version = "0.1.22" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" -+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" - dependencies = [ - "tinyvec", - ] - - [[package]] - name = "unicode-segmentation" --version = "1.9.0" -+version = "1.10.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" -+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - - [[package]] - name = "unicode-width" --version = "0.1.9" -+version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - - [[package]] - name = "unicode-xid" --version = "0.2.3" -+version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" -+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - - [[package]] - name = "uniffi" --version = "0.21.0" --source = "git+https://github.com/mozilla/uniffi-rs?rev=779e955f21a70e4aba43a7408f1841dcdf728b32#779e955f21a70e4aba43a7408f1841dcdf728b32" -+version = "0.23.0" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" - dependencies = [ - "anyhow", -- "bytes", - "camino", -- "cargo_metadata", -- "log", -- "once_cell", -- "paste", -- "static_assertions", -+ "clap 3.2.23", -+ "uniffi_bindgen", -+ "uniffi_build", -+ "uniffi_core", - "uniffi_macros", - ] - -+[[package]] -+name = "uniffi-bindgen" -+version = "0.1.0" -+dependencies = [ -+ "uniffi", -+] -+ - [[package]] - name = "uniffi_bindgen" --version = "0.21.0" --source = "git+https://github.com/mozilla/uniffi-rs?rev=779e955f21a70e4aba43a7408f1841dcdf728b32#779e955f21a70e4aba43a7408f1841dcdf728b32" -+version = "0.23.0" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" - dependencies = [ - "anyhow", - "askama", -- "bincode", - "camino", -- "clap 3.2.22", - "fs-err", -+ "glob", - "goblin", -- "heck 0.4.0", -+ "heck", - "once_cell", - "paste", - "serde", - "serde_json", -- "toml", -+ "toml 0.5.11", - "uniffi_meta", -+ "uniffi_testing", - "weedle2", - ] - - [[package]] - name = "uniffi_build" --version = "0.21.0" --source = "git+https://github.com/mozilla/uniffi-rs?rev=779e955f21a70e4aba43a7408f1841dcdf728b32#779e955f21a70e4aba43a7408f1841dcdf728b32" -+version = "0.23.0" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" - dependencies = [ - "anyhow", - "camino", - "uniffi_bindgen", - ] - -+[[package]] -+name = "uniffi_checksum_derive" -+version = "0.23.0" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -+dependencies = [ -+ "quote", -+ "syn 1.0.109", -+] -+ -+[[package]] -+name = "uniffi_core" -+version = "0.23.0" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -+dependencies = [ -+ "anyhow", -+ "bytes", -+ "camino", -+ "cargo_metadata", -+ "log", -+ "once_cell", -+ "paste", -+ "static_assertions", -+] -+ - [[package]] - name = "uniffi_macros" --version = "0.21.0" --source = "git+https://github.com/mozilla/uniffi-rs?rev=779e955f21a70e4aba43a7408f1841dcdf728b32#779e955f21a70e4aba43a7408f1841dcdf728b32" -+version = "0.23.0" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" - dependencies = [ - "bincode", - "camino", -@@ -5056,18 +5615,37 @@ dependencies = [ - "proc-macro2", - "quote", - "serde", -- "syn", -- "toml", -+ "syn 1.0.109", -+ "toml 0.5.11", - "uniffi_build", - "uniffi_meta", - ] - - [[package]] - name = "uniffi_meta" --version = "0.21.0" --source = "git+https://github.com/mozilla/uniffi-rs?rev=779e955f21a70e4aba43a7408f1841dcdf728b32#779e955f21a70e4aba43a7408f1841dcdf728b32" -+version = "0.23.0" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -+dependencies = [ -+ "anyhow", -+ "bytes", -+ "serde", -+ "siphasher", -+ "uniffi_checksum_derive", -+ "uniffi_core", -+] -+ -+[[package]] -+name = "uniffi_testing" -+version = "0.23.0" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" - dependencies = [ -+ "anyhow", -+ "camino", -+ "cargo_metadata", -+ "fs-err", -+ "once_cell", - "serde", -+ "serde_json", - ] - - [[package]] -@@ -5082,9 +5660,9 @@ dependencies = [ - - [[package]] - name = "unsafe-libyaml" --version = "0.2.2" -+version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0" -+checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - - [[package]] - name = "untrusted" -@@ -5105,27 +5683,25 @@ dependencies = [ - ] - - [[package]] --name = "utf8parse" --version = "0.2.0" -+name = "utf-8" -+version = "0.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" -+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - - [[package]] --name = "uuid" --version = "0.8.2" -+name = "utf8parse" -+version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" --dependencies = [ -- "getrandom 0.2.7", --] -+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - - [[package]] - name = "uuid" --version = "1.1.2" -+version = "1.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" -+checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" - dependencies = [ -- "getrandom 0.2.7", -+ "getrandom 0.2.9", -+ "wasm-bindgen", - ] - - [[package]] -@@ -5135,16 +5711,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - - [[package]] --name = "vcpkg" --version = "0.2.15" -+name = "value-bag" -+version = "1.0.0-alpha.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -+checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -+dependencies = [ -+ "ctor 0.1.26", -+ "version_check", -+] - - [[package]] --name = "vec_map" --version = "0.8.2" -+name = "vcpkg" -+version = "0.2.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - - [[package]] - name = "version_check" -@@ -5155,22 +5735,22 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] - name = "vodozemac" - version = "0.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f6f20153a1c82ac5f1243b62e80f067ae608facc415c6ef82f88426a61c79886" -+source = "git+https://github.com/matrix-org/vodozemac?rev=fb609ca1e4df5a7a818490ae86ac694119e41e71#fb609ca1e4df5a7a818490ae86ac694119e41e71" - dependencies = [ - "aes", -- "arrayvec 0.7.2", -- "base64", -+ "arrayvec", -+ "base64 0.13.1", - "cbc", - "ed25519-dalek", - "hkdf", - "hmac", -+ "matrix-pickle", - "pkcs7", - "prost", - "rand 0.7.3", - "serde", - "serde_json", -- "sha2 0.10.3", -+ "sha2 0.10.6", - "subtle", - "thiserror", - "x25519-dalek", -@@ -5185,12 +5765,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - - [[package]] - name = "walkdir" --version = "2.3.2" -+version = "2.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" - dependencies = [ - "same-file", -- "winapi", - "winapi-util", - ] - -@@ -5224,9 +5803,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - - [[package]] - name = "wasm-bindgen" --version = "0.2.83" -+version = "0.2.84" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -+checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" - dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -@@ -5234,24 +5813,24 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-backend" --version = "0.2.83" -+version = "0.2.84" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -+checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" - dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "wasm-bindgen-shared", - ] - - [[package]] - name = "wasm-bindgen-futures" --version = "0.4.33" -+version = "0.4.34" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -+checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" - dependencies = [ - "cfg-if", - "js-sys", -@@ -5261,9 +5840,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro" --version = "0.2.83" -+version = "0.2.84" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -+checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" - dependencies = [ - "quote", - "wasm-bindgen-macro-support", -@@ -5271,28 +5850,28 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro-support" --version = "0.2.83" -+version = "0.2.84" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] - - [[package]] - name = "wasm-bindgen-shared" --version = "0.2.83" -+version = "0.2.84" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" -+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - - [[package]] - name = "wasm-bindgen-test" --version = "0.3.33" -+version = "0.3.34" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "09d2fff962180c3fadf677438054b1db62bee4aa32af26a45388af07d1287e1d" -+checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b" - dependencies = [ - "console_error_panic_hook", - "js-sys", -@@ -5304,9 +5883,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-test-macro" --version = "0.3.33" -+version = "0.3.34" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4683da3dfc016f704c9f82cf401520c4f1cb3ee440f7f52b3d6ac29506a49ca7" -+checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9" - dependencies = [ - "proc-macro2", - "quote", -@@ -5325,26 +5904,11 @@ dependencies = [ - "web-sys", - ] - --[[package]] --name = "wasm-timer" --version = "0.2.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" --dependencies = [ -- "futures", -- "js-sys", -- "parking_lot 0.11.2", -- "pin-utils", -- "wasm-bindgen", -- "wasm-bindgen-futures", -- "web-sys", --] -- - [[package]] - name = "web-sys" --version = "0.3.59" -+version = "0.3.61" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" -+checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" - dependencies = [ - "js-sys", - "wasm-bindgen", -@@ -5362,9 +5926,9 @@ dependencies = [ - - [[package]] - name = "webpki-roots" --version = "0.22.4" -+version = "0.22.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" -+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" - dependencies = [ - "webpki", - ] -@@ -5372,7 +5936,7 @@ dependencies = [ - [[package]] - name = "weedle2" - version = "4.0.0" --source = "git+https://github.com/mozilla/uniffi-rs?rev=779e955f21a70e4aba43a7408f1841dcdf728b32#779e955f21a70e4aba43a7408f1841dcdf728b32" -+source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" - dependencies = [ - "nom", - ] -@@ -5383,6 +5947,17 @@ version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -+[[package]] -+name = "which" -+version = "4.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -+dependencies = [ -+ "either", -+ "libc", -+ "once_cell", -+] -+ - [[package]] - name = "wildmatch" - version = "2.1.1" -@@ -5420,48 +5995,170 @@ version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -+[[package]] -+name = "windows" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -+dependencies = [ -+ "windows-targets 0.48.0", -+] -+ - [[package]] - name = "windows-sys" --version = "0.36.1" -+version = "0.42.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" - dependencies = [ -- "windows_aarch64_msvc", -- "windows_i686_gnu", -- "windows_i686_msvc", -- "windows_x86_64_gnu", -- "windows_x86_64_msvc", -+ "windows_aarch64_gnullvm 0.42.2", -+ "windows_aarch64_msvc 0.42.2", -+ "windows_i686_gnu 0.42.2", -+ "windows_i686_msvc 0.42.2", -+ "windows_x86_64_gnu 0.42.2", -+ "windows_x86_64_gnullvm 0.42.2", -+ "windows_x86_64_msvc 0.42.2", - ] - -+[[package]] -+name = "windows-sys" -+version = "0.45.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -+dependencies = [ -+ "windows-targets 0.42.2", -+] -+ -+[[package]] -+name = "windows-sys" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -+dependencies = [ -+ "windows-targets 0.48.0", -+] -+ -+[[package]] -+name = "windows-targets" -+version = "0.42.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -+dependencies = [ -+ "windows_aarch64_gnullvm 0.42.2", -+ "windows_aarch64_msvc 0.42.2", -+ "windows_i686_gnu 0.42.2", -+ "windows_i686_msvc 0.42.2", -+ "windows_x86_64_gnu 0.42.2", -+ "windows_x86_64_gnullvm 0.42.2", -+ "windows_x86_64_msvc 0.42.2", -+] -+ -+[[package]] -+name = "windows-targets" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -+dependencies = [ -+ "windows_aarch64_gnullvm 0.48.0", -+ "windows_aarch64_msvc 0.48.0", -+ "windows_i686_gnu 0.48.0", -+ "windows_i686_msvc 0.48.0", -+ "windows_x86_64_gnu 0.48.0", -+ "windows_x86_64_gnullvm 0.48.0", -+ "windows_x86_64_msvc 0.48.0", -+] -+ -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.42.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" -+ -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.42.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" -+ - [[package]] - name = "windows_aarch64_msvc" --version = "0.36.1" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.42.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - - [[package]] - name = "windows_i686_gnu" --version = "0.36.1" -+version = "0.48.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - - [[package]] - name = "windows_i686_msvc" --version = "0.36.1" -+version = "0.42.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.42.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - - [[package]] - name = "windows_x86_64_gnu" --version = "0.36.1" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -+ -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.42.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" -+ -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.42.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - - [[package]] - name = "windows_x86_64_msvc" --version = "0.36.1" -+version = "0.48.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -+ -+[[package]] -+name = "winnow" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -+dependencies = [ -+ "memchr", -+] - - [[package]] - name = "winreg" -@@ -5474,13 +6171,13 @@ dependencies = [ - - [[package]] - name = "wiremock" --version = "0.5.14" -+version = "0.5.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cc3c7b7557dbfdad6431b5a51196c9110cef9d83f6a9b26699f35cdc0ae113ec" -+checksum = "bd7b0b5b253ebc0240d6aac6dd671c495c467420577bf634d3064ae7e6fa2b4c" - dependencies = [ - "assert-json-diff", - "async-trait", -- "base64", -+ "base64 0.21.0", - "deadpool", - "futures", - "futures-timer", -@@ -5506,15 +6203,6 @@ dependencies = [ - "zeroize", - ] - --[[package]] --name = "xdg" --version = "2.4.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" --dependencies = [ -- "dirs", --] -- - [[package]] - name = "xshell" - version = "0.1.17" -@@ -5535,9 +6223,11 @@ name = "xtask" - version = "0.1.0" - dependencies = [ - "camino", -- "clap 4.0.18", -+ "clap 4.2.4", -+ "fs_extra", - "serde", - "serde_json", -+ "uniffi", - "uniffi_bindgen", - "xshell", - ] -@@ -5553,12 +6243,11 @@ dependencies = [ - - [[package]] - name = "zeroize_derive" --version = "1.3.2" -+version = "1.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" -+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -- "synstructure", -+ "syn 2.0.15", - ] -diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix -index aa9278a145689..49876143ecb29 100644 ---- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix -+++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix -@@ -2,25 +2,21 @@ - - stdenv.mkDerivation rec { - pname = "matrix-sdk-crypto-nodejs"; -- version = "0.1.0-beta.3"; -+ version = "0.1.0-beta.6"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "matrix-rust-sdk"; - rev = "${pname}-v${version}"; -- hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU="; -+ hash = "sha256-0oLk7yq/XELS0GkeZj7PxY3KKXfzws0djF3KmxYisY0="; - }; - -- patches = [ -- # This is needed because two versions of indexed_db_futures are present (which will fail to vendor, see https://github.com/rust-lang/cargo/issues/10310). -- # (matrix-sdk-crypto-nodejs doesn't use this dependency, we only need to remove it to vendor the dependencies successfully.) -- ./remove-duplicate-dependency.patch -- ]; -- - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { -- "uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0="; -+ "ruma-0.8.2" = "sha256-bKvcElIVugj+gZZhPFPGfCqva4fo1IqW/e9gf+q/Tfw="; -+ "uniffi-0.23.0" = "sha256-4WUp3PQm3ZgqHNMvz9+PBtNAeiq6m4PBViwXpQDglLk="; -+ "vodozemac-0.3.0" = "sha256-tAimsVD8SZmlVybb7HvRffwlNsfb7gLWGCplmwbLIVE="; - }; - }; - -diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch -deleted file mode 100644 -index 4e4dd6308778e..0000000000000 ---- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch -+++ /dev/null -@@ -1,55 +0,0 @@ --diff --git a/Cargo.lock b/Cargo.lock --index 208ef4ff..b5045040 100644 ----- a/Cargo.lock --+++ b/Cargo.lock --@@ -2124,19 +2124,6 @@ dependencies = [ -- "web-sys", -- ] -- ---[[package]] ---name = "indexed_db_futures" ---version = "0.2.3" ---source = "git+https://github.com/Hywan/rust-indexed-db?branch=feat-factory-nodejs#5dab67890cea0ab88b967031adc09179a537d77c" ---dependencies = [ --- "cfg-if", --- "js-sys", --- "uuid 0.8.2", --- "wasm-bindgen", --- "wasm-bindgen-futures", --- "web-sys", ---] --- -- [[package]] -- name = "indexmap" -- version = "1.9.1" --@@ -2726,8 +2713,7 @@ dependencies = [ -- "derive_builder", -- "getrandom 0.2.7", -- "gloo-utils", --- "indexed_db_futures 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", --- "indexed_db_futures 0.2.3 (git+https://github.com/Hywan/rust-indexed-db?branch=feat-factory-nodejs)", --+ "indexed_db_futures", -- "js-sys", -- "matrix-sdk-base", -- "matrix-sdk-common", --diff --git a/crates/matrix-sdk-indexeddb/Cargo.toml b/crates/matrix-sdk-indexeddb/Cargo.toml --index 5b0ef4f4..da73979b 100644 ----- a/crates/matrix-sdk-indexeddb/Cargo.toml --+++ b/crates/matrix-sdk-indexeddb/Cargo.toml --@@ -16,7 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"] -- [features] -- default = ["e2e-encryption"] -- e2e-encryption = ["matrix-sdk-base/e2e-encryption", "dep:matrix-sdk-crypto", "dashmap"] ---experimental-nodejs = ["indexed_db_futures_nodejs"] --+experimental-nodejs = [] -- -- [dependencies] -- anyhow = "1.0.57" --@@ -26,7 +26,6 @@ dashmap = { version = "5.2.0", optional = true } -- derive_builder = "0.11.2" -- gloo-utils = { version = "0.1", features = ["serde"] } -- indexed_db_futures = "0.2.3" ---indexed_db_futures_nodejs = { version = "0.2.3", package = "indexed_db_futures", git = "https://github.com/Hywan/rust-indexed-db", branch = "feat-factory-nodejs", optional = true } -- js-sys = { version = "0.3.58" } -- matrix-sdk-base = { version = "0.6.0", path = "../matrix-sdk-base", features = ["js"] } -- matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", features = ["js"], optional = true } - -From 5f47e9e9139a24598097929b75f07552ee77d0c9 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Thu, 27 Apr 2023 17:35:28 +0200 -Subject: [PATCH 2/2] matrix-hookshot: 3.2.0 -> 4.0.0 - ---- - .../matrix-hookshot/package.json | 25 ++++++++++--------- - .../matrix-synapse/matrix-hookshot/pin.json | 8 +++--- - 2 files changed, 17 insertions(+), 16 deletions(-) - -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -index bba0c179ca7f6..0c4a0956b61e7 100644 ---- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -@@ -1,6 +1,6 @@ - { - "name": "matrix-hookshot", -- "version": "3.2.0", -+ "version": "4.0.0", - "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", - "main": "lib/app.js", - "repository": "https://github.com/matrix-org/matrix-hookshot", -@@ -10,7 +10,7 @@ - "name": "matrix-hookshot-rs" - }, - "engines": { -- "node": ">=16" -+ "node": ">=18" - }, - "scripts": { - "build:web": "vite build", -@@ -30,11 +30,13 @@ - "start:app": "node --require source-map-support/register lib/App/BridgeApp.js", - "start:webhooks": "node --require source-map-support/register lib/App/GithubWebhookApp.js", - "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js", -+ "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js", - "test": "mocha -r ts-node/register tests/init.ts tests/*.ts tests/**/*.ts", - "test:cover": "nyc --reporter=lcov --reporter=text yarn test", - "lint": "yarn run lint:js && yarn run lint:rs", - "lint:js": "eslint -c .eslintrc.js 'src/**/*.ts' 'tests/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx'", - "lint:rs": "cargo fmt --all -- --check", -+ "lint:rs:apply": "cargo fmt --all", - "generate-default-config": "ts-node src/Config/Defaults.ts --config > config.sample.yml", - "validate-config": "ts-node src/Config/Config.ts" - }, -@@ -53,8 +55,8 @@ - "ioredis": "^5.2.3", - "jira-client": "^8.0.0", - "markdown-it": "^12.3.2", -- "matrix-appservice-bridge": "^6.0.0", -- "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.3-element.0", -+ "matrix-appservice-bridge": "^9.0.0", -+ "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1", - "matrix-widget-api": "^1.0.0", - "micromatch": "^4.0.4", - "mime": "^3.0.0", -@@ -63,20 +65,19 @@ - "p-queue": "^6.6.2", - "prom-client": "^14.0.1", - "reflect-metadata": "^0.1.13", -- "rss-parser": "^3.12.0", - "source-map-support": "^0.5.21", - "string-argv": "^0.3.1", - "tiny-typed-emitter": "^2.1.0", -- "vm2": "^3.9.11", -+ "vm2": "^3.9.17", - "winston": "^3.3.3", -- "xml2js": "^0.4.23", -- "yaml": "^1.10.2" -+ "xml2js": "^0.5.0", -+ "yaml": "^2.2.2" - }, - "devDependencies": { - "@codemirror/lang-javascript": "^6.0.2", - "@napi-rs/cli": "^2.2.0", - "@preact/preset-vite": "^2.2.0", -- "@tsconfig/node16": "^1.0.3", -+ "@tsconfig/node18": "^2.0.0", - "@types/ajv": "^1.0.0", - "@types/chai": "^4.2.22", - "@types/cors": "^2.8.12", -@@ -86,10 +87,10 @@ - "@types/micromatch": "^4.0.1", - "@types/mime": "^2.0.3", - "@types/mocha": "^9.0.0", -- "@types/node": "^16", - "@types/node-emoji": "^1.8.1", - "@types/uuid": "^8.3.3", - "@types/xml2js": "^0.4.11", -+ "@types/node": "18", - "@typescript-eslint/eslint-plugin": "^5.4.0", - "@typescript-eslint/parser": "^5.4.0", - "@uiw/react-codemirror": "^4.12.3", -@@ -102,8 +103,8 @@ - "preact": "^10.5.15", - "rimraf": "^3.0.2", - "sass": "^1.51.0", -- "ts-node": "^10.4.0", -- "typescript": "^4.5.2", -+ "ts-node": "^10.9.1", -+ "typescript": "^5.0.4", - "vite": "^4.1.4", - "vite-svg-loader": "^4.0.0" - } -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -index 5de70b56bb5f7..106278288dfff 100644 ---- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -@@ -1,6 +1,6 @@ - { -- "version": "3.2.0", -- "srcHash": "7u3JT7BFoJB95vlpKagMgWzoJg0vPYX4CEoqANW0FL4=", -- "yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz", -- "cargoHash": "CVJoDaQzyMJUaCx7MQg/bQHVicbkmwNpwncLSbWQwbA=" -+ "version": "4.0.0", -+ "srcHash": "imZMYp1bgt5N8hPO6S4V133DoPCQoJ5TnMCG905qT1s=", -+ "yarnHash": "0rnb7i6v7pz2wywjrj0nb2c9am94pbxin1jiykj5p6czmzw289kl", -+ "cargoHash": "ldz5b7bC7qWRMVDixA4d5ls5Y1ONvElruRC+/TgQWr8=" - }