From 92e5d387558621410add364efc5bcc61026168cd Mon Sep 17 00:00:00 2001 From: ardocrat Date: Wed, 9 Oct 2024 12:58:59 +0300 Subject: [PATCH] build: update grin 5.3.3, arti 0.23.0 (fork arti-hyper crate) and non-egui dependencies --- .gitignore | 1 + Cargo.lock | 2201 ++++++++++++++++++++++++++--------------------- Cargo.toml | 98 +-- src/tor/http.rs | 244 ++++++ src/tor/mod.rs | 4 +- src/tor/tor.rs | 19 +- 6 files changed, 1506 insertions(+), 1061 deletions(-) create mode 100644 src/tor/http.rs diff --git a/.gitignore b/.gitignore index b418e08..cf36354 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.iml +android/.idea android/.gradle android/local.properties android/keystore diff --git a/Cargo.lock b/Cargo.lock index 8d57e2e..e600cdb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,12 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ab_glyph" -version = "0.2.26" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" +checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -108,6 +108,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aead" version = "0.4.3" @@ -221,9 +227,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "amplify" -version = "4.6.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e711289a6cb28171b4f0e6c8019c69ff9476050508dc082167575d458ff74d0" +checksum = "7147b742325842988dd6c793d55f58df3ae36bccf7d9b6e07db10ab035be343d" dependencies = [ "amplify_derive", "amplify_num", @@ -233,21 +239,21 @@ dependencies = [ [[package]] name = "amplify_derive" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759dcbfaf94d838367a86d493ec34ccc8aa6fe365cb7880d6bf89006de24d9c1" +checksum = "2a6309e6b8d89b36b9f959b7a8fa093583b94922a0f6438a24fb08936de4d428" dependencies = [ "amplify_syn", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "amplify_num" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c009c5c4de814911b177e2ea59e4930bb918978ed3cce4900d846a6ceb0838" +checksum = "99bcb75a2982047f733547042fc3968c0f460dfcf7d90b90dea3b2744580e9ad" dependencies = [ "wasm-bindgen", ] @@ -258,8 +264,8 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7736fb8d473c0d83098b5bac44df6a561e20470375cd8bcae30516dc889fd62a" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -325,14 +331,13 @@ checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" [[package]] name = "android_logger" -version = "0.13.3" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" +checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826" dependencies = [ "android_log-sys", - "env_logger 0.10.2", + "env_filter", "log", - "once_cell", ] [[package]] @@ -355,9 +360,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -370,33 +375,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -404,9 +409,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -416,13 +421,13 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arboard" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" dependencies = [ "clipboard-win", "core-graphics 0.23.2", - "image 0.25.1", + "image 0.25.2", "log", "objc2 0.5.2", "objc2-app-kit", @@ -432,12 +437,6 @@ dependencies = [ "x11rb", ] -[[package]] -name = "arc-swap" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" - [[package]] name = "arc-swap" version = "1.7.1" @@ -450,16 +449,16 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -472,15 +471,15 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arti-client" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592446097447aac93b3747e366e508e707389a1233ae7674df37864acd065981" +checksum = "d5a726d39f22ddf0dcf0ea903d900592167d60a32e46f202e83651a1be8c452e" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -489,11 +488,13 @@ dependencies = [ "derive_more", "educe", "fs-mistrust", - "futures 0.3.30", + "futures 0.3.31", "hostname-validator", + "humantime 2.1.0", "humantime-serde", "libc", "postage", + "rand 0.8.5", "safelog", "serde", "thiserror", @@ -511,6 +512,7 @@ dependencies = [ "tor-keymgr", "tor-linkspec", "tor-llcrypto", + "tor-memquota", "tor-netdir", "tor-netdoc", "tor-persist", @@ -521,25 +523,6 @@ dependencies = [ "void", ] -[[package]] -name = "arti-hyper" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fbfdcf58b72f0d80a1b1b6cca0869d267b8ebc46f946bff8fb5692c2cd8e2a" -dependencies = [ - "anyhow", - "arti-client", - "educe", - "hyper 0.14.29", - "pin-project", - "thiserror", - "tls-api", - "tls-api-native-tls", - "tokio 1.38.0", - "tor-error", - "tor-rtcompat", -] - [[package]] name = "as-raw-xcb-connection" version = "1.0.1" @@ -563,9 +546,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "async-fs 2.1.2", "async-net", @@ -573,9 +556,13 @@ dependencies = [ "futures-channel", "futures-util", "rand 0.8.5", + "raw-window-handle 0.6.2", "serde", "serde_repr", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.4", "zbus 4.4.0", ] @@ -615,9 +602,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "flate2", "futures-core", @@ -631,13 +618,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -649,7 +636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ "async-lock 2.8.0", - "autocfg 1.3.0", + "autocfg 1.4.0", "blocking", "futures-lite 1.13.0", ] @@ -672,7 +659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock 2.8.0", - "autocfg 1.3.0", + "autocfg 1.4.0", "cfg-if 1.0.0", "concurrent-queue", "futures-lite 1.13.0", @@ -687,9 +674,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if 1.0.0", @@ -697,11 +684,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -742,7 +729,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "blocking", "futures-lite 2.3.0", ] @@ -766,18 +753,18 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.48.0", ] [[package]] name = "async-process" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "async-signal", "async-task", @@ -785,9 +772,8 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -796,27 +782,27 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.37", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -827,13 +813,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -848,7 +834,7 @@ dependencies = [ "futures-util", "pin-project", "rustc_version", - "tokio 1.38.0", + "tokio 1.40.0", ] [[package]] @@ -857,7 +843,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "futures-sink", "futures-util", "memchr", @@ -950,14 +936,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "av1-grain" @@ -966,7 +952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" dependencies = [ "anyhow", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "log", "nom 7.1.3", "num-rational 0.4.2", @@ -979,22 +965,22 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -1049,6 +1035,15 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + [[package]] name = "bech32" version = "0.7.3" @@ -1085,11 +1080,11 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "regex", "rustc-hash", - "shlex", + "shlex 0.1.1", "which", ] @@ -1152,9 +1147,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.3.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "bitvec" @@ -1184,9 +1179,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -1308,9 +1303,9 @@ checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -1318,9 +1313,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -1342,22 +1337,22 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -1390,9 +1385,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "calloop" @@ -1402,8 +1397,8 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -1416,8 +1411,8 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -1429,7 +1424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop 0.12.4", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] @@ -1441,26 +1436,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop 0.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] [[package]] name = "caret" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac3ae35de516b8ee4bfb6affc72bd6c121d2967206f307c026890f99c7875a0" +checksum = "1df55dc0c84d5a555c4b8b84ecf3cff724df77a7b1a8c4a70cd66a981524cff0" [[package]] name = "cc" -version = "1.0.99" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex 1.3.0", ] [[package]] @@ -1589,7 +1584,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.3", + "libloading 0.8.5", ] [[package]] @@ -1609,9 +1604,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -1683,9 +1678,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "com" @@ -1703,7 +1698,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" dependencies = [ "com_macros_support", - "proc-macro2 1.0.85", + "proc-macro2 1.0.87", "syn 1.0.109", ] @@ -1713,8 +1708,8 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -1724,7 +1719,7 @@ version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "memchr", ] @@ -1751,9 +1746,12 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "convert_case" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "cookie-factory" @@ -1761,7 +1759,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", ] [[package]] @@ -1780,7 +1778,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys 0.8.7", "libc", ] @@ -1792,9 +1800,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1859,9 +1867,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1902,9 +1910,9 @@ dependencies = [ [[package]] name = "croaring-sys" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5260027c04c33d67f405589d9c26e1e991fe062fb165f3094c9836e6c3b17f" +checksum = "3e5fed89265a702f0085844237a7ebbadf8a7c42de6304fddca30a5013f9aecb" dependencies = [ "cc", ] @@ -2074,9 +2082,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -2086,7 +2094,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.3", + "libloading 0.8.5", "winapi 0.3.9", ] @@ -2118,12 +2126,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -2134,24 +2142,24 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "strsim 0.11.1", - "syn 2.0.66", + "syn 2.0.79", ] [[package]] @@ -2161,19 +2169,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core 0.14.4", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", - "quote 1.0.36", - "syn 2.0.66", + "darling_core 0.20.10", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -2234,8 +2242,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -2258,8 +2266,8 @@ dependencies = [ "heck 0.4.1", "itertools 0.11.0", "proc-macro-crate 1.3.1", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "sha3 0.10.8", "strum 0.25.0", "syn 1.0.109", @@ -2268,9 +2276,9 @@ dependencies = [ [[package]] name = "derive-deftly" -version = "0.10.5" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c173dfcd5b92893ab05a8efb18b9522db4db6e0b93db5740f397573c027ce1e" +checksum = "72f9bc3564f74be6c35d49a7efee54380d7946ccc631323067f33fabb9246027" dependencies = [ "derive-deftly-macros", "heck 0.5.0", @@ -2278,19 +2286,19 @@ dependencies = [ [[package]] name = "derive-deftly-macros" -version = "0.10.5" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216fa20211bcd18cc359b75413bfb6cf89f62568fa27bc5fed3778a7a16e17af" +checksum = "e1b84d32b18d9a256d81e4fec2e4cfd0ab6dde5e5ff49be1713ae0adbd0060c2" dependencies = [ "heck 0.5.0", - "indexmap 2.2.6", - "itertools 0.12.1", - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.85", - "quote 1.0.36", + "indexmap 2.6.0", + "itertools 0.13.0", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", + "quote 1.0.37", "sha3 0.10.8", - "strum 0.26.2", - "syn 2.0.66", + "strum 0.26.3", + "syn 2.0.79", "void", ] @@ -2301,8 +2309,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24c1b715c79be6328caa9a5e1a387a196ea503740f0722ec3dd8f67a9e72314d" dependencies = [ "darling 0.14.4", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -2327,17 +2335,32 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.18" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "convert_case", - "proc-macro2 1.0.85", - "quote 1.0.36", - "rustc_version", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", + "unicode-xid 0.2.6", ] +[[package]] +name = "destructure_traitobject" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" + [[package]] name = "detect-desktop-environment" version = "0.2.0" @@ -2463,13 +2486,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -2478,7 +2501,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading 0.8.5", ] [[package]] @@ -2620,8 +2643,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -2641,7 +2664,7 @@ dependencies = [ "glow", "glutin", "glutin-winit", - "image 0.25.1", + "image 0.25.2", "js-sys", "log", "objc2 0.5.2", @@ -2723,7 +2746,7 @@ dependencies = [ "ahash 0.8.11", "egui", "enum-map", - "image 0.25.1", + "image 0.25.2", "log", "mime_guess2", "resvg", @@ -2749,9 +2772,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -2819,9 +2842,9 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -2830,11 +2853,11 @@ version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -2862,9 +2885,9 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -2873,16 +2896,16 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -2916,19 +2939,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -2972,9 +2985,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "event-listener" @@ -3024,7 +3037,7 @@ dependencies = [ "flume 0.11.0", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -3059,15 +3072,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] @@ -3096,21 +3109,21 @@ checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" dependencies = [ "atomic 0.6.0", "serde", - "toml 0.8.14", + "toml 0.8.19", "uncased", "version_check", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] @@ -3124,12 +3137,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -3216,6 +3229,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -3241,9 +3260,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -3269,9 +3288,9 @@ dependencies = [ [[package]] name = "fs-mistrust" -version = "0.7.11" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa843fc37db9fe16a248421fa36454f903dbc2ff722cc613a7e12932ee572c7" +checksum = "2bf84fbaf375e6a485fa126f6335c0cfa7741114aa4f86ba37960a42cd1994b8" dependencies = [ "derive_builder_fork_arti", "dirs 5.0.1", @@ -3315,9 +3334,9 @@ dependencies = [ [[package]] name = "fslock-guard" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9362160cb0ef018384f2bcb89f1c071acaf6cf1f138e6ba198517a8320ac0aa0" +checksum = "dc0ec6829d66d94dd25e4dba799d0c2843356af12b28b41b455086eb1871d67d" dependencies = [ "fslock-arti-fork", "thiserror", @@ -3360,9 +3379,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -3375,9 +3394,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -3385,15 +3404,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -3402,9 +3421,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -3427,7 +3446,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -3436,32 +3455,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -3477,21 +3496,21 @@ dependencies = [ [[package]] name = "g2gen" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2c7625b2fc250dd90b63f7887a6bb0f7ec1d714c8278415bea2669ef20820e" +checksum = "dc3e32f911a41e073b8492473c3595a043e1369ab319a2dbf8c89b1fea06457c" dependencies = [ "g2poly", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 1.0.109", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] name = "g2p" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc36d9bdc3d2da057775a9f4fa7d7b09edab3e0eda7a92cc353358fa63b8519e" +checksum = "1a9afa6efed9af3a5a68ba066429c1497c299d4eafbd948fe630df47a8f2d29f" dependencies = [ "g2gen", "g2poly", @@ -3499,9 +3518,9 @@ dependencies = [ [[package]] name = "g2poly" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" +checksum = "0fd8b261ccf00df8c5cc60c082bb7d7aa64c33a433cfcc091ca244326c924b2c" [[package]] name = "gcc" @@ -3575,9 +3594,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gl_generator" @@ -3604,15 +3623,15 @@ checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -3653,7 +3672,7 @@ dependencies = [ "glutin_glx_sys", "glutin_wgl_sys", "icrate", - "libloading 0.8.3", + "libloading 0.8.5", "objc2 0.4.1", "once_cell", "raw-window-handle 0.5.2", @@ -3761,9 +3780,9 @@ version = "0.2.1" dependencies = [ "android-activity 0.6.0", "android_logger", + "anyhow", "arboard", "arti-client", - "arti-hyper", "backtrace", "chrono", "curve25519-dalek 4.1.3", @@ -3773,9 +3792,9 @@ dependencies = [ "eframe", "egui", "egui_extras", - "env_logger 0.11.3", + "env_logger 0.11.5", "fs-mistrust", - "futures 0.3.30", + "futures 0.3.31", "gif", "grin_api", "grin_chain", @@ -3790,9 +3809,9 @@ dependencies = [ "grin_wallet_impls", "grin_wallet_libwallet", "grin_wallet_util", - "hyper 0.14.29", + "hyper 0.14.30", "hyper-tls 0.5.0", - "image 0.25.1", + "image 0.25.2", "interprocess", "jni", "lazy_static", @@ -3801,6 +3820,7 @@ dependencies = [ "nokhwa", "openssl-sys", "parking_lot 0.12.3", + "pin-project", "qrcode", "qrcodegen", "rand 0.8.5", @@ -3818,10 +3838,11 @@ dependencies = [ "tls-api-native-tls", "tls-api-openssl", "tokio 0.2.25", - "tokio 1.38.0", + "tokio 1.40.0", "tokio-util 0.2.0", - "toml 0.8.14", + "toml 0.8.19", "tor-config", + "tor-error", "tor-hscrypto", "tor-hsrproxy", "tor-hsservice", @@ -3836,13 +3857,13 @@ dependencies = [ [[package]] name = "grin_api" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "371de4435e3681a028a0741e4c4c9fa0be7ec95b86a89fef82e534c7de6e79ca" +checksum = "6443239e75a15c517ce24fe4dd3ef257898ae0224e6b7c993db28794e13ecf3e" dependencies = [ "bytes 0.5.6", "easy-jsonrpc-mw", - "futures 0.3.30", + "futures 0.3.31", "grin_chain", "grin_core", "grin_p2p", @@ -3869,9 +3890,9 @@ dependencies = [ [[package]] name = "grin_chain" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1987d095cb41dffb7f67f4ae97acd0141fc77df28e1af376f8b4ab784d5ab54" +checksum = "cdedcee9e20e0cc8dc1460b37b3951306c774a6aa5788e3f45addc56e60f7fbe" dependencies = [ "bit-vec", "bitflags 1.3.2", @@ -3893,9 +3914,9 @@ dependencies = [ [[package]] name = "grin_config" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f11b7b5af5f06c812cfcaa527c23013408910b6781911d3fb0ae883d6b7b9b4" +checksum = "f592415c070206f7ea44faec8880cd1b8ff205f5f6053f756e3501b3d240cb75" dependencies = [ "dirs 2.0.2", "grin_core", @@ -3910,9 +3931,9 @@ dependencies = [ [[package]] name = "grin_core" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d3887c1090b18862424ed4ad1929f6c9b81709cfcca8bf8b88c928d4af2167" +checksum = "c4fbf242a2a23a6554dd4c430574d2563993cf5f44921f953635e8a177cf2506" dependencies = [ "blake2-rfc", "byteorder", @@ -3937,9 +3958,9 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2864c09ee9ac184a2a580a6f34debd642011a34fd40af6ab26c084b1aea951ac" +checksum = "abeb1c22f48269a0bf463de589f8961d8bbb554def5e5e405710ead9a1b4c71a" dependencies = [ "blake2-rfc", "byteorder", @@ -3960,9 +3981,9 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8968c6b250cc928eb8467c0ed283d53676ae5896f8396d6136b0d2dc5fa77f" +checksum = "e6b0ecc5597244d698ec4e1ea2e7d04c3b209f496db16731a04f06af41572c54" dependencies = [ "bitflags 1.3.2", "bytes 0.5.6", @@ -3983,9 +4004,9 @@ dependencies = [ [[package]] name = "grin_pool" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1828edf8e05010fbd3a19ff6e73740a696fbb681859617805c25eb66480ce0d8" +checksum = "14b758b202f034a03b894e732c716ddece8994fae5d8da1e074b1a9e07219f2b" dependencies = [ "blake2-rfc", "chrono", @@ -4005,7 +4026,7 @@ version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06832645c3d28079245827908045946db48e5d62b4c54b40701c7e21327e2571" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "cc", "libc", "rand 0.5.6", @@ -4016,13 +4037,13 @@ dependencies = [ [[package]] name = "grin_servers" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde13741fc12858b6eb10936bcbe4b7c3b9f79fa7a75a7e083445b76e0bb6547" +checksum = "8444cfbed8ff5371683eb622972136f22dfc6f76b5140b29279a4bbee6a0b58e" dependencies = [ "chrono", "fs2", - "futures 0.3.30", + "futures 0.3.31", "grin_api", "grin_chain", "grin_core", @@ -4047,9 +4068,9 @@ dependencies = [ [[package]] name = "grin_store" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51a81f65738f02e2af799e3b596996a7be3087df8ae478241b41a62c00623840" +checksum = "708e53758263fa17dfd3fc46419ded59a84d07818e1ee7526b0d47ba268f1362" dependencies = [ "byteorder", "croaring", @@ -4067,10 +4088,11 @@ dependencies = [ [[package]] name = "grin_util" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e644f4a7e648c7038226417de9e2101743ce337ad60539a1ec6580571a04ad3" +checksum = "d1433d76d0e95c2ed20e1008e9891adfae64812d1bdc5ec71ed5499dcaca2986" dependencies = [ + "anyhow", "backtrace", "base64 0.12.3", "byteorder", @@ -4089,9 +4111,9 @@ dependencies = [ [[package]] name = "grin_wallet_api" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99b560f3c1257833b5abea1db06ac4736a2501421074768b3dcb775a1a8508e" +checksum = "c6e91d09af566e34c045dc398a862ae947446acf05274193f75511db2972b1ae" dependencies = [ "base64 0.12.3", "chrono", @@ -4115,9 +4137,9 @@ dependencies = [ [[package]] name = "grin_wallet_config" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa93a3be58950ac13dd6d4aa51737e1bbc0befb9f44dfde12e233eb169071b0" +checksum = "d9ba1884188e89acfdb1896e929b1327c77a8c04c9294b5b2cc784fbb207c8e8" dependencies = [ "dirs 2.0.2", "grin_core", @@ -4131,13 +4153,13 @@ dependencies = [ [[package]] name = "grin_wallet_controller" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321061a9ba48b0241d07dd4c2dcf69acd0923d7f7b040265d1d8a224fb9c0ac9" +checksum = "aac2140d873e1c86cc984aac4b01ca001ee62ce71d48ffb62d5820147082db6d" dependencies = [ "chrono", "easy-jsonrpc-mw", - "futures 0.3.30", + "futures 0.3.31", "grin_api", "grin_core", "grin_keychain", @@ -4166,9 +4188,9 @@ dependencies = [ [[package]] name = "grin_wallet_impls" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5630eca4cf5dca99d89753571a112fd13f2b29d8c05faabbaeebec065deb2bf2" +checksum = "478c40acf16a81fe60fb2a4bb6630b85d28e6904f87ddb512749d2e2124f6352" dependencies = [ "base64 0.12.3", "blake2-rfc", @@ -4176,7 +4198,7 @@ dependencies = [ "chrono", "data-encoding", "ed25519-dalek 1.0.1", - "futures 0.3.30", + "futures 0.3.31", "grin_api", "grin_chain", "grin_core", @@ -4206,9 +4228,9 @@ dependencies = [ [[package]] name = "grin_wallet_libwallet" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27b3a75037f69e51bd1b52bb6a4a13d8dd8a764d2477ab944c9e67410d913df" +checksum = "74dfcdeb1b13dfca419d930b83357d72b2b76dfa9b41f3942b13646f57c57b9b" dependencies = [ "age", "base64 0.9.3", @@ -4244,9 +4266,9 @@ dependencies = [ [[package]] name = "grin_wallet_util" -version = "5.3.1" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ffdc9f591de5ba9194e2add286a4c37d04ad5c3f502dada10de8c282b2990c" +checksum = "d253707c5cb3ee35b06f4b688a81e9916a0e37302cf3f7d855e109696cdf0d7c" dependencies = [ "data-encoding", "ed25519-dalek 1.0.1", @@ -4271,9 +4293,9 @@ dependencies = [ [[package]] name = "growable-bloom-filter" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c669fa03050eb3445343f215d62fc1ab831e8098bc9a55f26e9724faff11075c" +checksum = "d174ccb4ba660d431329e7f0797870d0a4281e36353ec4b4a3c5eab6c2cfb6f1" dependencies = [ "serde", "serde_bytes", @@ -4307,16 +4329,16 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "fnv", "futures-core", "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.6.0", "slab", - "tokio 1.38.0", - "tokio-util 0.7.11", + "tokio 1.40.0", + "tokio-util 0.7.12", "tracing", ] @@ -4349,6 +4371,17 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "hashlink" version = "0.9.1" @@ -4367,7 +4400,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "thiserror", "widestring", "winapi 0.3.9", @@ -4486,7 +4519,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "fnv", "itoa 1.0.11", ] @@ -4497,7 +4530,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "fnv", "itoa 1.0.11", ] @@ -4518,16 +4551,16 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "http 0.2.12", "pin-project-lite 0.2.14", ] [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -4592,11 +4625,11 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "futures-channel", "futures-core", "futures-util", @@ -4608,7 +4641,7 @@ dependencies = [ "itoa 1.0.11", "pin-project-lite 0.2.14", "socket2 0.5.7", - "tokio 1.38.0", + "tokio 1.40.0", "tower-service", "tracing", "want", @@ -4679,24 +4712,24 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.6.0", - "hyper 0.14.29", + "bytes 1.7.2", + "hyper 0.14.30", "native-tls", - "tokio 1.38.0", + "tokio 1.40.0", "tokio-native-tls", ] [[package]] name = "i18n-config" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" dependencies = [ + "basic-toml", "log", "serde", "serde_derive", "thiserror", - "toml 0.8.14", "unic-langid", ] @@ -4706,7 +4739,7 @@ version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" dependencies = [ - "arc-swap 1.7.1", + "arc-swap", "fluent", "fluent-langneg", "fluent-syntax", @@ -4735,10 +4768,10 @@ dependencies = [ "i18n-embed", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "strsim 0.10.0", - "syn 2.0.66", + "syn 2.0.79", "unic-langid", ] @@ -4750,19 +4783,19 @@ checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" dependencies = [ "find-crate", "i18n-config", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -4813,15 +4846,15 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.8", "same-file", "walkdir", "winapi-util", @@ -4841,12 +4874,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", @@ -4864,12 +4897,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error 2.0.1", ] [[package]] @@ -4890,22 +4923,42 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "hashbrown 0.12.3", "serde", ] [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + [[package]] name = "inout" version = "0.1.3" @@ -4930,9 +4983,9 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -4945,7 +4998,7 @@ dependencies = [ "futures-core", "libc", "recvmsg", - "tokio 1.38.0", + "tokio 1.40.0", "widestring", "windows-sys 0.52.0", ] @@ -4997,26 +5050,26 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -5036,6 +5089,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.8" @@ -5072,9 +5134,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -5143,7 +5205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", ] @@ -5153,22 +5215,42 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "kurbo" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin 0.9.8", ] [[package]] @@ -5185,9 +5267,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libfuzzer-sys" @@ -5222,9 +5304,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if 1.0.0", "windows-targets 0.52.6", @@ -5255,13 +5337,14 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.7", ] [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -5329,14 +5412,14 @@ dependencies = [ [[package]] name = "local-ip-address" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136ef34e18462b17bf39a7826f8f3bbc223341f8e83822beb8b77db9a3d49696" +checksum = "3669cf5561f8d27e8fc84cc15e58350e70f557d4d65f70e3154e54cd2f8e1782" dependencies = [ "libc", "neli", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -5354,15 +5437,15 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "serde", ] @@ -5375,26 +5458,30 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" -version = "0.12.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d8e6e1d5f89acca713132acc6034f30bad09b961d1338161bdb71c08f6e4fa" +checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6" dependencies = [ - "arc-swap 0.4.8", + "anyhow", + "arc-swap", "chrono", + "derivative", "flate2", "fnv", - "humantime 1.3.0", + "humantime 2.1.0", "libc", "log", "log-mdc", - "parking_lot 0.10.2", + "once_cell", + "parking_lot 0.12.3", + "rand 0.8.5", "serde", - "serde-value 0.6.0", - "serde_derive", + "serde-value", "serde_json", - "serde_yaml", + "serde_yaml 0.9.34+deprecated", + "thiserror", "thread-id", - "typemap", + "typemap-ors", "winapi 0.3.9", ] @@ -5409,11 +5496,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -5461,7 +5548,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if 1.0.0", - "rayon", ] [[package]] @@ -5482,9 +5568,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -5495,7 +5581,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -5504,7 +5590,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -5557,9 +5643,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -5590,8 +5676,8 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1154809406efdb7982841adb6311b3d095b46f78342dd646736122fe6b19e267" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -5608,6 +5694,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", "simd-adler32", ] @@ -5637,10 +5732,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + [[package]] name = "mio-named-pipes" version = "0.1.7" @@ -5691,19 +5799,19 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bit-set", "bitflags 2.6.0", "codespan-reporting", "hexf-parse", - "indexmap 2.2.6", + "indexmap 2.6.0", "log", "num-traits 0.2.19", "rustc-hash", "spirv", "termcolor", "thiserror", - "unicode-xid 0.2.4", + "unicode-xid 0.2.6", ] [[package]] @@ -5727,8 +5835,8 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework 2.11.0", - "security-framework-sys 2.11.0", + "security-framework 2.11.1", + "security-framework-sys 2.12.0", "tempfile", ] @@ -5805,8 +5913,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" dependencies = [ "either", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "serde", "syn 1.0.109", ] @@ -5925,7 +6033,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb9b0e58413cb1b6d041d802be0e921368f3c72525b7ea720089c8aa140d6d49" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "image 0.24.9", "thiserror", ] @@ -5958,11 +6066,28 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "normpath" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.6.0", + "filetime", + "inotify", + "kqueue", + "libc", + "log", + "mio 0.8.11", + "walkdir", + "windows-sys 0.48.0", ] [[package]] @@ -6004,16 +6129,16 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-integer", "num-traits 0.2.19", ] [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits 0.2.19", @@ -6042,7 +6167,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-traits 0.2.19", ] @@ -6058,9 +6183,9 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -6078,7 +6203,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-integer", "num-traits 0.2.19", ] @@ -6089,7 +6214,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-bigint 0.2.6", "num-integer", "num-traits 0.2.19", @@ -6101,7 +6226,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", ] @@ -6121,7 +6246,7 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "libm", ] @@ -6137,23 +6262,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -6166,17 +6291,6 @@ dependencies = [ "objc_exception", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - [[package]] name = "objc-sys" version = "0.2.0-beta.2" @@ -6289,6 +6403,7 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.6.0", "block2 0.5.1", + "dispatch", "libc", "objc2 0.5.2", ] @@ -6327,29 +6442,29 @@ dependencies = [ "cc", ] -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - [[package]] name = "object" -version = "0.36.0" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "oneshot-fused-workaround" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f49cbc8293c5ba37516d29aba392a94a34638367d17d67617cea34e4f9acd05" +dependencies = [ + "futures 0.3.31", +] [[package]] name = "opaque-debug" @@ -6365,9 +6480,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -6384,9 +6499,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -6397,18 +6512,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.1+3.3.1" +version = "300.3.2+3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -6432,15 +6547,6 @@ dependencies = [ "libredox 0.0.2", ] -[[package]] -name = "ordered-float" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" -dependencies = [ - "num-traits 0.2.19", -] - [[package]] name = "ordered-float" version = "2.10.1" @@ -6487,9 +6593,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" dependencies = [ "ttf-parser", ] @@ -6534,9 +6640,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -6580,7 +6686,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -6684,9 +6790,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -6706,22 +6812,22 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -6744,12 +6850,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -6776,21 +6882,21 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -6799,7 +6905,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", @@ -6811,17 +6917,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite 0.2.14", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6849,7 +6955,7 @@ checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1" dependencies = [ "atomic 0.5.3", "crossbeam-queue", - "futures 0.3.30", + "futures 0.3.31", "parking_lot 0.12.3", "pin-project", "static_assertions", @@ -6864,9 +6970,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -6899,13 +7008,13 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.0.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c501afe3a2e25c9bd219aa56ec1e04cdb3fcdd763055be268778c13fa82c1f" +checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "equivalent", - "indexmap 2.2.6", + "indexmap 2.6.0", ] [[package]] @@ -6920,11 +7029,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.22", ] [[package]] @@ -6934,8 +7043,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", "version_check", ] @@ -6946,8 +7055,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "version_check", ] @@ -6962,9 +7071,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -6984,8 +7093,8 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -7017,11 +7126,11 @@ checksum = "5520fbcd7da152a449261c5a533a1c7fad044e9e8aa9528cfec3f464786c7926" [[package]] name = "qrcode" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d" +checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" dependencies = [ - "image 0.25.1", + "image 0.25.2", ] [[package]] @@ -7062,11 +7171,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.85", + "proc-macro2 1.0.87", ] [[package]] @@ -7294,7 +7403,7 @@ checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" dependencies = [ "arbitrary", "arg_enum_proc_macro", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "av1-grain", "bitstream-io", "built", @@ -7323,16 +7432,15 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.5" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error 2.0.1", "rav1e", - "rayon", "rgb", ] @@ -7415,18 +7523,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox 0.1.3", @@ -7435,14 +7543,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -7456,13 +7564,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -7473,9 +7581,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "renderdoc-sys" @@ -7539,9 +7647,9 @@ dependencies = [ [[package]] name = "retry-error" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b960f1dc847b9e4383ca73b4e8002f725b2f562addb9ade88a6ba109b305e96d" +checksum = "77ef93545b13f6dd83a9f98c8a656ccbd7bc2b95a747844346c70f7e6f5a5932" [[package]] name = "rfc6979" @@ -7555,18 +7663,17 @@ dependencies = [ [[package]] name = "rfd" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e" dependencies = [ "ashpd", - "block", - "dispatch", + "block2 0.5.1", "js-sys", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "pollster", "raw-window-handle 0.6.2", "urlencoding", @@ -7578,9 +7685,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -7646,7 +7753,7 @@ dependencies = [ "serde_derive", "thiserror", "url", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] @@ -7657,12 +7764,12 @@ checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rqrr" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0cd0432e6beb2f86aa4c8af1bb5edcf3c9bcb9d4836facc048664205458575" +checksum = "48eaf9c75f2a8f231b09036c115a45a9845313f7faa6a39fa45a2a2bd06a27c7" dependencies = [ "g2p", - "image 0.25.1", + "image 0.25.2", "lru", ] @@ -7689,9 +7796,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ "bitflags 2.6.0", "fallible-iterator", @@ -7719,10 +7826,10 @@ version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "rust-embed-utils", - "syn 2.0.66", + "syn 2.0.79", "walkdir", ] @@ -7757,13 +7864,13 @@ checksum = "8531ce329f57af4dc91cb56f22e17eeb6507f7e80d09c24073fc2c9d334624f1" dependencies = [ "glob", "once_cell", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "rust-i18n-support", "serde", "serde_json", - "serde_yaml", - "syn 2.0.66", + "serde_yaml 0.8.26", + "syn 2.0.79", ] [[package]] @@ -7776,11 +7883,11 @@ dependencies = [ "lazy_static", "normpath", "once_cell", - "proc-macro2 1.0.85", + "proc-macro2 1.0.87", "regex", "serde", "serde_json", - "serde_yaml", + "serde_yaml 0.8.26", "toml 0.7.8", ] @@ -7808,9 +7915,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -7831,9 +7938,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -7894,9 +8001,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safelog" -version = "0.3.7" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1e9cd092ef5e122f1a34f3fe15de8e9685f8f610e31c4c0643976aa5e31737" +checksum = "3939f5e7c65f96a54e7d2a6853e3994d691c95f54f5263916a2d1877dad70789" dependencies = [ "derive_more", "educe", @@ -7941,11 +8048,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8042,15 +8149,15 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", "core-foundation 0.9.4", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "libc", - "security-framework-sys 2.11.0", + "security-framework-sys 2.12.0", ] [[package]] @@ -8065,11 +8172,11 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "libc", ] @@ -8096,23 +8203,13 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-value" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a65a7291a8a568adcae4c10a677ebcedbc6c9cec91c054dee2ce40b0e3290eb" -dependencies = [ - "ordered-float 1.1.1", - "serde", -] - [[package]] name = "serde-value" version = "0.7.0" @@ -8125,22 +8222,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -8154,11 +8251,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa 1.0.11", + "memchr", "ryu", "serde", ] @@ -8169,16 +8267,16 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -8197,15 +8295,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -8215,14 +8313,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ - "darling 0.20.9", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "darling 0.20.10", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -8237,6 +8335,19 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.6.0", + "itoa 1.0.11", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "sha1" version = "0.10.6" @@ -8331,6 +8442,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -8368,7 +8485,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", ] [[package]] @@ -8377,7 +8494,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "thiserror", "time", @@ -8404,7 +8521,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -8435,7 +8552,7 @@ dependencies = [ "libc", "log", "memmap2", - "rustix 0.38.34", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -8460,7 +8577,7 @@ dependencies = [ "libc", "log", "memmap2", - "rustix 0.38.34", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -8648,9 +8765,9 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros 0.26.4", ] @@ -8662,8 +8779,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -8674,10 +8791,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "rustversion", - "syn 2.0.66", + "syn 2.0.79", ] [[package]] @@ -8687,10 +8804,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck 0.5.0", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "rustversion", - "syn 2.0.66", + "syn 2.0.79", ] [[package]] @@ -8732,19 +8849,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.66" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "unicode-ident", ] @@ -8764,7 +8881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "libc", "ntapi", "once_cell", @@ -8781,7 +8898,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.14", + "toml 0.8.19", "version-compare", ] @@ -8793,20 +8910,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -8874,19 +8992,18 @@ version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] name = "thread-id" -version = "3.3.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" dependencies = [ "libc", - "redox_syscall 0.1.57", "winapi 0.3.9", ] @@ -8958,7 +9075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bytemuck", "cfg-if 1.0.0", "log", @@ -8988,9 +9105,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -9012,7 +9129,7 @@ dependencies = [ "pem", "tempfile", "thiserror", - "tokio 1.38.0", + "tokio 1.40.0", "void", "webpki 0.22.4", ] @@ -9028,7 +9145,7 @@ dependencies = [ "thiserror", "tls-api", "tls-api-test", - "tokio 1.38.0", + "tokio 1.40.0", ] [[package]] @@ -9043,7 +9160,7 @@ dependencies = [ "thiserror", "tls-api", "tls-api-test", - "tokio 1.38.0", + "tokio 1.40.0", ] [[package]] @@ -9058,7 +9175,7 @@ dependencies = [ "pem", "test-cert-gen", "tls-api", - "tokio 1.38.0", + "tokio 1.40.0", "untrusted 0.6.2", "webpki 0.22.4", ] @@ -9089,21 +9206,20 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", - "bytes 1.6.0", + "bytes 1.7.2", "libc", - "mio 0.8.11", - "num_cpus", + "mio 1.0.2", "parking_lot 0.12.3", "pin-project-lite 0.2.14", "signal-hook-registry", "socket2 0.5.7", - "tokio-macros 2.3.0", - "windows-sys 0.48.0", + "tokio-macros 2.4.0", + "windows-sys 0.52.0", ] [[package]] @@ -9122,20 +9238,20 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -9145,7 +9261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.38.0", + "tokio 1.40.0", ] [[package]] @@ -9180,7 +9296,7 @@ checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" dependencies = [ "bytes 0.4.12", "either", - "futures 0.3.30", + "futures 0.3.31", "thiserror", "tokio 0.2.25", ] @@ -9225,16 +9341,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", "futures-core", "futures-io", "futures-sink", "pin-project-lite 0.2.14", - "tokio 1.38.0", + "tokio 1.40.0", ] [[package]] @@ -9260,21 +9376,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.22", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -9285,7 +9401,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -9294,35 +9410,26 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" -dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.20", ] [[package]] name = "tor-async-utils" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12afaae386a152b8e82bb6041ab6404b659f198bec7655af301aa3b686d5d81" +checksum = "ef2adb0fa957cad5a1f408e357a4450931366a9d35b78235d72260b6842518ba" dependencies = [ - "futures 0.3.30", + "educe", + "futures 0.3.31", + "oneshot-fused-workaround", "pin-project", "postage", "void", @@ -9330,29 +9437,34 @@ dependencies = [ [[package]] name = "tor-basic-utils" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47792fe0aaac440166bfacc326e418f74b9db821a07f0c5d9d1edc1b9ec39c98" +checksum = "2d080757c5d7404813f936147e3d72f7c035eba541c1422de29acd2242b98f36" dependencies = [ + "derive_more", "hex", + "itertools 0.13.0", "libc", "paste", "rand 0.8.5", "rand_chacha 0.3.1", + "serde", "slab", "thiserror", ] [[package]] name = "tor-bytes" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96e47fc5f649f4041bdea9d30492aae35205cd53ea8b71be50f9b6130802e82c" +checksum = "23db3a71001bc0a3f25b0f6ee824b559d128768275811de0d913369990f9a83b" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.2", + "derive-deftly", "digest 0.10.7", "educe", "getrandom 0.2.15", + "safelog", "thiserror", "tor-error", "tor-llcrypto", @@ -9361,12 +9473,12 @@ dependencies = [ [[package]] name = "tor-cell" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e51af4f36e96fe61833a4d94cf50c252a9958c162c0db2fa7a92ee2f0985c3" +checksum = "637cf998679d463138d9bffe07c55bec1c3ccc43a66e4a587d8952ceaa6ee7d4" dependencies = [ "bitflags 2.6.0", - "bytes 1.6.0", + "bytes 1.7.2", "caret", "derive_more", "educe", @@ -9386,9 +9498,9 @@ dependencies = [ [[package]] name = "tor-cert" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b02ff5433d5b4ff6e9779da4886da52b9e458b6435c61a5f804ebfc09a979f1" +checksum = "437567f6b43fab396478d01ff15ce717587bda41a15f06c4de87f8fee1fefbb0" dependencies = [ "caret", "derive_builder_fork_arti", @@ -9402,15 +9514,16 @@ dependencies = [ [[package]] name = "tor-chanmgr" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffcb97ca0f59f56e765d423564eac7305ed3fc290389341c09df7784d23113bb" +checksum = "bc267bf4aba055859d51c34dcab067c109b89cefed9501409377772cbb296d8b" dependencies = [ "async-trait", "derive_builder_fork_arti", "derive_more", "educe", - "futures 0.3.30", + "futures 0.3.31", + "oneshot-fused-workaround", "postage", "rand 0.8.5", "safelog", @@ -9434,9 +9547,9 @@ dependencies = [ [[package]] name = "tor-checkable" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857c0e77022d70040a0d060054fbe368611df203159068f71636b4fa1f517369" +checksum = "9a052723dc4fc53605232652d75997940cd51abc4cd3ff74daca746c150f5ac7" dependencies = [ "humantime 2.1.0", "signature 2.2.0", @@ -9446,9 +9559,9 @@ dependencies = [ [[package]] name = "tor-circmgr" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7da3dc69ac9ccc42281f850e34f1ce0999f4b0b84e71de6102298eb17b40c1" +checksum = "c00458ecadba3e0f8566f6be9fcf41bd2a50b3f45f0a349057510b2d37322c21" dependencies = [ "amplify", "async-trait", @@ -9459,10 +9572,11 @@ dependencies = [ "downcast-rs", "dyn-clone", "educe", - "futures 0.3.30", + "futures 0.3.31", "humantime-serde", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", + "oneshot-fused-workaround", "pin-project", "rand 0.8.5", "retry-error", @@ -9491,10 +9605,11 @@ dependencies = [ [[package]] name = "tor-config" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddf9074373f65d5d9f870c03c95f025e1ca3881d4c41bf68fe3d2dec78b6fb6" +checksum = "b7281aaa74794b23cf570547ff7706fbca5f8564d421921943420f2c70ddecfa" dependencies = [ + "amplify", "derive-deftly", "derive_builder_fork_arti", "directories", @@ -9502,28 +9617,32 @@ dependencies = [ "either", "figment", "fs-mistrust", - "itertools 0.12.1", + "futures 0.3.31", + "itertools 0.13.0", + "notify", "once_cell", "paste", + "postage", "regex", "serde", - "serde-value 0.7.0", + "serde-value", "serde_ignored", "shellexpand", - "strum 0.26.2", + "strum 0.26.3", "thiserror", - "toml 0.8.14", + "toml 0.8.19", "tor-basic-utils", "tor-error", + "tor-rtcompat", "tracing", "void", ] [[package]] name = "tor-consdiff" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e023575b1a5187644c089aa1430b57f73f539482ce10cdf32bcd370afc91de08" +checksum = "0da0ead1be2509af9558ff9b8004d25e7e4795a3dfa4d78968d8c43d231e76c7" dependencies = [ "digest 0.10.7", "hex", @@ -9533,19 +9652,19 @@ dependencies = [ [[package]] name = "tor-dirclient" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ef78cc758514a4fe5a25fbe8c86e93b08f4f9ac69fe48c8ccf62ae0b729b0e" +checksum = "8b3fb55282536a5aaf998ceaa1d2f5a268119c3b3cf8de741eaf98f5ed5af079" dependencies = [ "async-compression", "base64ct", "derive_more", - "futures 0.3.30", + "futures 0.3.31", "hex", "http 1.1.0", "httparse", "httpdate 1.0.3", - "itertools 0.12.1", + "itertools 0.13.0", "memchr", "thiserror", "tor-circmgr", @@ -9561,9 +9680,9 @@ dependencies = [ [[package]] name = "tor-dirmgr" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7219371bda85128b27c794950f845878e8c351165aade3c01a4efc8d2950a8" +checksum = "d8bf47d53f83a55f4cc61fa77bcd051c283d1a1da60f67e9370d845df3480256" dependencies = [ "async-trait", "base64ct", @@ -9574,13 +9693,14 @@ dependencies = [ "event-listener 5.3.1", "fs-mistrust", "fslock", - "futures 0.3.30", + "futures 0.3.31", "hex", "humantime 2.1.0", "humantime-serde", - "itertools 0.12.1", + "itertools 0.13.0", "memmap2", "once_cell", + "oneshot-fused-workaround", "paste", "postage", "rand 0.8.5", @@ -9589,7 +9709,7 @@ dependencies = [ "scopeguard", "serde", "signature 2.2.0", - "strum 0.26.2", + "strum 0.26.3", "thiserror", "time", "tor-async-utils", @@ -9612,27 +9732,27 @@ dependencies = [ [[package]] name = "tor-error" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6478753496321936ebacba91c34375fd79e29bbe9dfc9a3354d5cb211dfbd33b" +checksum = "d764640168b176da6c44e4d5ceda97db3aca89d6f7e5ee398f454c56ba6a34c2" dependencies = [ - "backtrace", "derive_more", - "futures 0.3.30", + "futures 0.3.31", "once_cell", "paste", "retry-error", "static_assertions", - "strum 0.26.2", + "strum 0.26.3", "thiserror", "tracing", + "void", ] [[package]] name = "tor-guardmgr" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb523b11abd1c3378f727cfa6cb965ba622c02f8ff356c1b3972f81e084f29b" +checksum = "82444165f5f3a2587e4c93258c7a554718a4985780d262ae158a5e24fcbee019" dependencies = [ "amplify", "base64ct", @@ -9641,17 +9761,18 @@ dependencies = [ "derive_more", "dyn-clone", "educe", - "futures 0.3.30", + "futures 0.3.31", "humantime 2.1.0", "humantime-serde", - "itertools 0.12.1", + "itertools 0.13.0", "num_enum", + "oneshot-fused-workaround", "pin-project", "postage", "rand 0.8.5", "safelog", "serde", - "strum 0.26.2", + "strum 0.26.3", "thiserror", "tor-async-utils", "tor-basic-utils", @@ -9672,23 +9793,24 @@ dependencies = [ [[package]] name = "tor-hsclient" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec01e890aaac65e772a54aaa737d353a501839211da7cf604869c2a78b5d3083" +checksum = "38cbc1b44b2513371ff37444959d39d40ed6791c486167e79aa8766f78045fda" dependencies = [ "async-trait", "derive-deftly", "derive_more", "educe", "either", - "futures 0.3.30", - "itertools 0.12.1", + "futures 0.3.31", + "itertools 0.13.0", + "oneshot-fused-workaround", "postage", "rand 0.8.5", "retry-error", "safelog", "slotmap", - "strum 0.26.2", + "strum 0.26.3", "thiserror", "tor-async-utils", "tor-basic-utils", @@ -9713,15 +9835,15 @@ dependencies = [ [[package]] name = "tor-hscrypto" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e919b4b8680fe6e5ddd95744c314c380011d33b68e3dbafc51451d12fd7758c6" +checksum = "eda7d9ec707605c7bdd71c29a94e5cf6c1a61ed42f815b5dd2da3f1546393ca1" dependencies = [ "cipher 0.4.4", "data-encoding", "derive_more", "digest 0.10.7", - "itertools 0.12.1", + "itertools 0.13.0", "paste", "rand 0.8.5", "safelog", @@ -9738,13 +9860,14 @@ dependencies = [ [[package]] name = "tor-hsrproxy" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c436d182996fef5d684b0cd6249a71e3872f63aaa5f356b49d0129d30e7a8a" +checksum = "83b7f33f7ad2ba1817ff4299fa24359df1afd8c12a562d85f25ed07bbc64417c" dependencies = [ "derive-deftly", "derive_builder_fork_arti", - "futures 0.3.30", + "futures 0.3.31", + "oneshot-fused-workaround", "rangemap", "safelog", "serde", @@ -9764,25 +9887,28 @@ dependencies = [ [[package]] name = "tor-hsservice" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b591cb2f43ba5c5c1403c043d7961c20638c70d76fe1230528399cf7a1cf8f93" +checksum = "c1368fe9d6d967b379e0011375f5c7d1cdac77a762c50dd19d0b21cc2775b1cf" dependencies = [ + "amplify", "async-trait", "base64ct", + "cfg-if 1.0.0", "derive-deftly", "derive_builder_fork_arti", "derive_more", "digest 0.10.7", "educe", "fs-mistrust", - "futures 0.3.30", + "futures 0.3.31", "growable-bloom-filter", "hex", "humantime 2.1.0", - "itertools 0.12.1", + "itertools 0.13.0", "k12", "once_cell", + "oneshot-fused-workaround", "postage", "rand 0.8.5", "rand_core 0.6.4", @@ -9790,7 +9916,7 @@ dependencies = [ "safelog", "serde", "serde_with", - "strum 0.26.2", + "strum 0.26.3", "thiserror", "tor-async-utils", "tor-basic-utils", @@ -9817,13 +9943,32 @@ dependencies = [ ] [[package]] -name = "tor-keymgr" -version = "0.19.0" +name = "tor-key-forge" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b14cc41aabd46ae923aaa5e96ad7d8ceb8c320da7a49cee05ee153acdf6f6c" +checksum = "06c2a026f0a21f9870799eb3ac24340bfa71efb6126d9c7294a6d6c401a8ba67" +dependencies = [ + "derive-deftly", + "derive_more", + "downcast-rs", + "paste", + "rand 0.8.5", + "signature 2.2.0", + "ssh-key", + "thiserror", + "tor-error", + "tor-hscrypto", + "tor-llcrypto", +] + +[[package]] +name = "tor-keymgr" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f66ea6684cd1110c8b405443611b1c8f24cca4d8ca05a41ee747ea4479ad4c5c" dependencies = [ "amplify", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "derive-deftly", "derive_builder_fork_arti", "derive_more", @@ -9833,7 +9978,7 @@ dependencies = [ "glob-match", "humantime 2.1.0", "inventory", - "itertools 0.12.1", + "itertools 0.13.0", "rand 0.8.5", "serde", "ssh-key", @@ -9842,17 +9987,19 @@ dependencies = [ "tor-config", "tor-error", "tor-hscrypto", + "tor-key-forge", "tor-llcrypto", "tor-persist", + "tracing", "walkdir", "zeroize", ] [[package]] name = "tor-linkspec" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0bf13a55acd0163b8f227efeac4d00700e0e1bcf8b043b17e2941a88ca6c64" +checksum = "53ccbd9372da197987699399c88695ecd1737c2b0e6267c540a3febdf92b5643" dependencies = [ "base64ct", "by_address", @@ -9861,11 +10008,11 @@ dependencies = [ "derive_builder_fork_arti", "derive_more", "hex", - "itertools 0.12.1", + "itertools 0.13.0", "safelog", "serde", "serde_with", - "strum 0.26.2", + "strum 0.26.3", "thiserror", "tor-basic-utils", "tor-bytes", @@ -9876,9 +10023,9 @@ dependencies = [ [[package]] name = "tor-llcrypto" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a050d7145f3d1209d579f2d62d0da3eeb25e269d5a98ec1ef3c11c72d8eb174" +checksum = "0b0c146b5c77f609dda6992f60940586fee2aa711dab5d59b3ecc7c8c958d787" dependencies = [ "aes", "base64ct", @@ -9901,17 +10048,18 @@ dependencies = [ "simple_asn1", "subtle", "thiserror", + "visibility", "x25519-dalek 2.0.1", "zeroize", ] [[package]] name = "tor-log-ratelim" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339de85e1ffa31035cc24f02366f2ae0cdb5d93eefc9a5487042dea4f6a6ccf6" +checksum = "3a6fada5f9dae169bd0caf2d61932c528e8136790a5a553eac9de30d6290fe7e" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "humantime 2.1.0", "once_cell", "thiserror", @@ -9922,23 +10070,48 @@ dependencies = [ ] [[package]] -name = "tor-netdir" -version = "0.19.0" +name = "tor-memquota" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228eeb225054455c0545a4d5e06d188790e5bd85129eefb9b24c86cb18f22ce2" +checksum = "12551616f15f9d1fb4e37ee14ffc0b6743d0c31affbb4643374f456c0a820073" +dependencies = [ + "derive-deftly", + "derive_more", + "educe", + "futures 0.3.31", + "pin-project", + "serde", + "slotmap", + "static_assertions", + "thiserror", + "tor-async-utils", + "tor-basic-utils", + "tor-config", + "tor-error", + "tor-log-ratelim", + "tor-rtcompat", + "tracing", + "void", +] + +[[package]] +name = "tor-netdir" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d9b832338169a882cb895c79ea60089641749e1c2d6d4f7b8e23cc010185dfa" dependencies = [ "bitflags 2.6.0", "derive_more", "digest 0.10.7", - "futures 0.3.30", + "futures 0.3.31", "hex", "humantime 2.1.0", - "itertools 0.12.1", + "itertools 0.13.0", "num_enum", "rand 0.8.5", "serde", "static_assertions", - "strum 0.26.2", + "strum 0.26.3", "thiserror", "time", "tor-basic-utils", @@ -9955,9 +10128,9 @@ dependencies = [ [[package]] name = "tor-netdoc" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b34733b319ff6aa7a146973647c00120d111aa77da221d28309bacf144e3239" +checksum = "3a5fbfe1444d96e08bb97cdf717a62738e5f1bd5a594c5520a05f683b8a516e3" dependencies = [ "amplify", "base64ct", @@ -9969,7 +10142,7 @@ dependencies = [ "educe", "hex", "humantime 2.1.0", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", "phf", "rand 0.8.5", @@ -9992,15 +10165,16 @@ dependencies = [ "tor-llcrypto", "tor-protover", "tor-units", + "void", "weak-table", "zeroize", ] [[package]] name = "tor-persist" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be17e068b7d71554504245c3e6770c55c245435a42622d2b60b09c13539d93a5" +checksum = "5acf1de8a8ad4817d8ebdf1250bddbe9efa4b25dea0a339ae8dbb1f7d7f28583" dependencies = [ "amplify", "derive-deftly", @@ -10009,43 +10183,48 @@ dependencies = [ "fs-mistrust", "fslock", "fslock-guard", - "itertools 0.12.1", + "futures 0.3.31", + "itertools 0.13.0", + "oneshot-fused-workaround", "paste", "sanitize-filename", "serde", "serde_json", "thiserror", + "tor-async-utils", "tor-basic-utils", "tor-error", "tracing", + "void", ] [[package]] name = "tor-proto" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95024a4b55a2e7f239c171643814ea1b2d5a2eadd0b44dae7b34467982007df" +checksum = "073a996250f73d7a814d9049de321a1f59a710dc18b92a4da8d26f002a5735dd" dependencies = [ "asynchronous-codec", "bitvec", - "bytes 1.6.0", + "bytes 1.7.2", "cipher 0.4.4", "coarsetime", "derive_builder_fork_arti", "derive_more", "digest 0.10.7", "educe", - "futures 0.3.30", + "futures 0.3.31", "hkdf 0.12.4", "hmac 0.12.1", + "oneshot-fused-workaround", "pin-project", "rand 0.8.5", "rand_core 0.6.4", "safelog", "subtle", "thiserror", - "tokio 1.38.0", - "tokio-util 0.7.11", + "tokio 1.40.0", + "tokio-util 0.7.12", "tor-async-utils", "tor-basic-utils", "tor-bytes", @@ -10070,9 +10249,9 @@ dependencies = [ [[package]] name = "tor-protover" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31af5dd9523db6727fc24defef908f77a7b2698cd143af6987f6bd5cc47aed0b" +checksum = "ae806e57efcbd59694fd3c3c8100bc7dabc2dfd0bda70f122c7489fc0e889704" dependencies = [ "caret", "thiserror", @@ -10080,15 +10259,17 @@ dependencies = [ [[package]] name = "tor-ptmgr" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f753345a4b3b064fa6f6e10343c4326b4508bcb010a29090897e3367f25ac99" +checksum = "f39c4bf3755836028983c2e4b115cdd8ea03c838e76e6951e8e6151e3bb12fbf" dependencies = [ "async-trait", + "cfg-if 1.0.0", "derive_builder_fork_arti", "fs-mistrust", - "futures 0.3.30", - "itertools 0.12.1", + "futures 0.3.31", + "itertools 0.13.0", + "oneshot-fused-workaround", "serde", "thiserror", "tor-async-utils", @@ -10104,9 +10285,9 @@ dependencies = [ [[package]] name = "tor-relay-selection" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd23d7db7d25c7682c81147c8acf6a6bc9824029ebe575b5610784201aa6326" +checksum = "9ca1a4d767cd52ee8723dfe9dc3ec640b7a37527e009bc0860301a1aad249871" dependencies = [ "rand 0.8.5", "serde", @@ -10118,9 +10299,9 @@ dependencies = [ [[package]] name = "tor-rtcompat" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6655852504f1defe01a1c1cd5b681ce5d81af5cfb8c18adb26b9d2155fdd1d7c" +checksum = "df693852fb9a1c1a8bca1673fa3a8e1bca929fb2753165b1efce70f9381323b0" dependencies = [ "async-native-tls", "async-trait", @@ -10128,37 +10309,38 @@ dependencies = [ "coarsetime", "derive_more", "educe", - "futures 0.3.30", + "futures 0.3.31", "native-tls", "paste", "pin-project", "thiserror", - "tokio 1.38.0", - "tokio-util 0.7.11", + "tokio 1.40.0", + "tokio-util 0.7.12", + "tor-error", "tracing", + "void", ] [[package]] name = "tor-rtmock" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f69e39720387c6a66a07eb95a04bbbe63993bfe9be94fb8f5a39f39e190160" +checksum = "8f540f59b3194f4ad697d6ffa13013e2b92e1058cd1b3beb9c8a500d2b805a92" dependencies = [ "amplify", "async-trait", - "backtrace", "derive-deftly", "derive_more", "educe", - "futures 0.3.30", + "futures 0.3.31", "humantime 2.1.0", - "itertools 0.12.1", + "itertools 0.13.0", + "oneshot-fused-workaround", "pin-project", "priority-queue", "slotmap", - "strum 0.26.2", + "strum 0.26.3", "thiserror", - "tor-async-utils", "tor-error", "tor-rtcompat", "tracing", @@ -10168,9 +10350,9 @@ dependencies = [ [[package]] name = "tor-socksproto" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b05f853360120f8d075ab59b7400c0df15f3533bf26554669c8f09ba71dc7b1" +checksum = "308849623b9aa2a604c42a68081f7956ea6d4b5f378dd94ef0a36f05e86399ff" dependencies = [ "caret", "subtle", @@ -10181,9 +10363,9 @@ dependencies = [ [[package]] name = "tor-units" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae68a36e67c399141035fba00dea9c0a34cdc094a260faf2b03565cbcf9e7ca" +checksum = "de60d366ac1128f4cd3e1bae601a3d0393cd0c4e9e0e05eee605d28a8a5ce704" dependencies = [ "derive_more", "thiserror", @@ -10191,9 +10373,9 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -10213,9 +10395,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -10284,16 +10466,10 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.79", ] -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - [[package]] name = "try-lock" version = "0.2.5" @@ -10302,9 +10478,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.21.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" [[package]] name = "type-map" @@ -10317,17 +10493,20 @@ dependencies = [ [[package]] name = "typed-index-collections" -version = "3.1.0" +version = "3.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183496e014253d15abbe6235677b1392dba2d40524c88938991226baa38ac7c4" +checksum = "8d844b11f547a6fb9dee7ed073d9860174917a072aabe05df6ee60dbe79e7afa" +dependencies = [ + "serde", +] [[package]] -name = "typemap" -version = "0.3.3" +name = "typemap-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" dependencies = [ - "unsafe-any", + "unsafe-any-ors", ] [[package]] @@ -10386,36 +10565,36 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" @@ -10425,9 +10604,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" @@ -10440,14 +10619,20 @@ dependencies = [ ] [[package]] -name = "unsafe-any" -version = "0.4.2" +name = "unsafe-any-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" dependencies = [ - "traitobject", + "destructure_traitobject", ] +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "untrusted" version = "0.6.2" @@ -10559,9 +10744,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "v4l" @@ -10620,19 +10805,19 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "visibility" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3fd98999db9227cf28e59d83e1f120f42bc233d4b152e8fab9bc87d5bb1e0f8" +checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -10709,17 +10894,17 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -10733,7 +10918,7 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", "wasm-bindgen-macro-support", ] @@ -10743,9 +10928,9 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -10764,7 +10949,7 @@ checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.37", "scoped-tls", "smallvec", "wayland-sys", @@ -10777,7 +10962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] @@ -10795,11 +10980,11 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.3" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "wayland-client", "xcursor", ] @@ -10873,9 +11058,9 @@ version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ - "proc-macro2 1.0.85", + "proc-macro2 1.0.87", "quick-xml", - "quote 1.0.36", + "quote 1.0.37", ] [[package]] @@ -10918,12 +11103,12 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" +checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923" dependencies = [ "block2 0.5.1", - "core-foundation 0.9.4", + "core-foundation 0.10.0", "home", "jni", "log", @@ -10975,7 +11160,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "cfg-if 1.0.0", "cfg_aliases 0.1.1", "document-features", @@ -10997,17 +11182,17 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59e0d5fc509601c69e4e1fa06c1eb3c4c9f12956a5e30c79b61ef1c1be7daf0" +checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", "document-features", - "indexmap 2.2.6", + "indexmap 2.6.0", "log", "naga", "once_cell", @@ -11024,12 +11209,12 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa24c3889f885a3fb9133b454c8418bfcfaadcfe4ed3be96ac80e76703b863b" +checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "ash", "bit-set", "bitflags 2.6.0", @@ -11046,7 +11231,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "log", "metal 0.28.0", "naga", @@ -11123,11 +11308,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -11187,8 +11372,8 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -11198,8 +11383,8 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -11230,6 +11415,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -11438,7 +11632,7 @@ dependencies = [ "raw-window-handle 0.5.2", "raw-window-handle 0.6.2", "redox_syscall 0.3.5", - "rustix 0.38.34", + "rustix 0.38.37", "sctk-adwaita", "smithay-client-toolkit 0.18.1", "smol_str", @@ -11468,9 +11662,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -11532,9 +11726,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "x11rb-protocol", ] @@ -11580,18 +11774,18 @@ dependencies = [ [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -11615,9 +11809,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xmlwriter" @@ -11627,9 +11821,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xxhash-rust" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "xz2" @@ -11699,9 +11893,9 @@ dependencies = [ "async-broadcast 0.7.1", "async-executor", "async-fs 2.1.2", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", - "async-process 2.2.3", + "async-process 2.3.0", "async-recursion", "async-task", "async-trait", @@ -11735,8 +11929,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "regex", "syn 1.0.109", "zvariant_utils 1.0.1", @@ -11748,10 +11942,10 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", "zvariant_utils 2.1.0", ] @@ -11779,22 +11973,23 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -11812,9 +12007,9 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] [[package]] @@ -11830,27 +12025,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.11+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", @@ -11873,9 +12068,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] @@ -11915,8 +12110,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", "zvariant_utils 1.0.1", ] @@ -11927,10 +12122,10 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", "zvariant_utils 2.1.0", ] @@ -11940,8 +12135,8 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", + "proc-macro2 1.0.87", + "quote 1.0.37", "syn 1.0.109", ] @@ -11951,7 +12146,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", + "proc-macro2 1.0.87", + "quote 1.0.37", + "syn 2.0.79", ] diff --git a/Cargo.toml b/Cargo.toml index d675def..e378fd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,25 +25,25 @@ codegen-units = 1 panic = "abort" [dependencies] -log = "0.4" +log = "0.4.22" ## node -openssl-sys = { version = "0.9.82", features = ["vendored"] } -grin_api = "5.3.1" -grin_chain = "5.3.1" -grin_config = "5.3.1" -grin_core = "5.3.1" -grin_p2p = "5.3.1" -grin_servers = "5.3.1" -grin_keychain = "5.3.1" -grin_util = "5.3.1" +openssl-sys = { version = "0.9.103", features = ["vendored"] } +grin_api = "5.3.3" +grin_chain = "5.3.3" +grin_config = "5.3.3" +grin_core = "5.3.3" +grin_p2p = "5.3.3" +grin_servers = "5.3.3" +grin_keychain = "5.3.3" +grin_util = "5.3.3" ## wallet -grin_wallet_impls = "5.3.1" -grin_wallet_api = "5.3.1" -grin_wallet_libwallet = "5.3.1" -grin_wallet_util = "5.3.1" -grin_wallet_controller = "5.3.1" +grin_wallet_impls = "5.3.3" +grin_wallet_api = "5.3.3" +grin_wallet_libwallet = "5.3.3" +grin_wallet_util = "5.3.3" +grin_wallet_controller = "5.3.3" ## ui egui = { version = "0.28.1", default-features = false } @@ -51,45 +51,47 @@ egui_extras = { version = "0.28.1", features = ["image", "svg"] } rust-i18n = "2.3.1" ## other -backtrace = "0.3" -thiserror = "1.0.58" -futures = "0.3" +anyhow = "1.0.89" +pin-project = "1.1.6" +backtrace = "0.3.74" +thiserror = "1.0.64" +futures = "0.3.31" dirs = "5.0.1" -sys-locale = "0.3.0" -chrono = "0.4.31" -parking_lot = "0.12.1" -lazy_static = "1.4.0" -toml = "0.8.2" -serde = "1.0.170" -local-ip-address = "0.6.1" -url = "2.4.0" +sys-locale = "0.3.1" +chrono = "0.4.38" +parking_lot = "0.12.3" +lazy_static = "1.5.0" +toml = "0.8.19" +serde = "1.0.210" +local-ip-address = "0.6.3" +url = "2.5.2" rand = "0.8.5" -serde_derive = "1.0.197" -serde_json = "1.0.115" -tokio = { version = "1.37.0", features = ["full"] } -image = "0.25.1" -rqrr = "0.7.1" +serde_derive = "1.0.210" +serde_json = "1.0.128" +tokio = { version = "1.40.0", features = ["full"] } +image = "0.25.2" +rqrr = "0.8.0" qrcodegen = "1.8.0" -qrcode = "0.14.0" +qrcode = "0.14.1" ur = "0.4.1" gif = "0.13.1" rkv = { version = "0.19.0", features = ["lmdb"] } ## tor -arti-client = { version = "0.19.0", features = ["pt-client", "static", "onion-service-service", "onion-service-client"] } -tor-rtcompat = { version = "0.19.0", features = ["static"] } -tor-config = "0.19.0" -fs-mistrust = "0.7.9" -tor-hsservice = "0.19.0" -tor-hsrproxy = "0.19.0" -tor-keymgr = "0.19.0" -tor-llcrypto = "0.19.0" -tor-hscrypto = "0.19.0" -arti-hyper = "0.19.0" -sha2 = "0.10.0" +arti-client = { version = "0.23.0", features = ["pt-client", "static", "onion-service-service", "onion-service-client"] } +tor-rtcompat = { version = "0.23.0", features = ["static"] } +tor-config = "0.23.0" +fs-mistrust = "0.8.0" +tor-hsservice = "0.23.0" +tor-hsrproxy = "0.23.0" +tor-keymgr = "0.23.0" +tor-llcrypto = "0.23.0" +tor-hscrypto = "0.23.0" +tor-error = "0.23.0" +sha2 = "0.10.8" ed25519-dalek = "2.1.1" -curve25519-dalek = "4.1.2" -hyper = { version = "0.14.28", features = ["full"] } +curve25519-dalek = "4.1.3" +hyper = { version = "0.14.29", features = ["full"] } hyper-tls = "0.5.0" tls-api = "0.9.0" tls-api-native-tls = "0.9.0" @@ -113,18 +115,18 @@ env_logger = "0.11.3" winit = { version = "0.29.15" } eframe = { version = "0.28.1", features = ["wgpu", "glow"] } arboard = "3.2.0" -rfd = "0.14.1" +rfd = "0.15.0" dark-light = "1.1.1" interprocess = { version = "2.2.1", features = ["tokio"] } [target.'cfg(target_os = "android")'.dependencies] -android_logger = "0.13.1" +android_logger = "0.14.1" jni = "0.21.1" android-activity = { version = "0.6.0", features = ["game-activity"] } wgpu = "0.20.1" winit = { version = "0.29.15", features = ["android-game-activity"] } eframe = { version = "0.28.1", features = ["wgpu", "android-game-activity"] } -[patch.crates-io] +#[patch.crates-io] ### patch grin store #grin_store = { path = "../grin-store" } \ No newline at end of file diff --git a/src/tor/http.rs b/src/tor/http.rs new file mode 100644 index 0000000..cd1825b --- /dev/null +++ b/src/tor/http.rs @@ -0,0 +1,244 @@ +use std::future::Future; +use std::io::Error; +use std::pin::Pin; +use std::sync::Arc; +use std::task::{Context, Poll}; + +use arti_client::{DataStream, IntoTorAddr, TorClient}; +use hyper::client::connect::{Connected, Connection}; +use hyper::http::uri::Scheme; +use hyper::http::Uri; +use hyper::service::Service; +use pin_project::pin_project; +use thiserror::Error; +use tls_api::TlsConnector as TlsConn; // This is different from tor_rtcompat::TlsConnector +use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; +use tor_config::deps::educe::Educe; +use tor_rtcompat::Runtime; + +/// Error making or using http connection +/// +/// This error ends up being passed to hyper and bundled up into a [`hyper::Error`] +#[derive(Error, Clone, Debug)] +#[non_exhaustive] +pub enum ConnectionError { + /// Unsupported URI scheme + #[error("unsupported URI scheme in {uri:?}")] + UnsupportedUriScheme { + /// URI + uri: Uri, + }, + + /// Missing hostname + #[error("Missing hostname in {uri:?}")] + MissingHostname { + /// URI + uri: Uri, + }, + + /// Tor connection failed + #[error("Tor connection failed")] + Arti(#[from] arti_client::Error), + + /// TLS connection failed + #[error("TLS connection failed")] + TLS(#[source] Arc), +} + +/// We implement this for form's sake +impl tor_error::HasKind for ConnectionError { + #[rustfmt::skip] + fn kind(&self) -> tor_error::ErrorKind { + use ConnectionError as CE; + use tor_error::ErrorKind as EK; + match self { + CE::UnsupportedUriScheme{..} => EK::NotImplemented, + CE::MissingHostname{..} => EK::BadApiUsage, + CE::Arti(e) => e.kind(), + CE::TLS(_) => EK::RemoteProtocolViolation, + } + } +} + +/// **Main entrypoint**: `hyper` connector to make HTTP\[S] connections via Tor, using Arti. +/// +/// An `ArtiHttpConnector` combines an Arti Tor client, and a TLS implementation, +/// in a form that can be provided to hyper +/// (e.g. to [`hyper::client::Builder`]'s `build` method) +/// so that hyper can speak HTTP and HTTPS to origin servers via Tor. +/// +/// TC is the TLS to used *across* Tor to connect to the origin server. +/// For example, it could be a [`tls_api_native_tls::TlsConnector`]. +/// This is a different Rust type to the TLS used *by* Tor to connect to relays etc. +/// It might even be a different underlying TLS implementation +/// (although that is usually not a particularly good idea). +#[derive(Educe)] +#[educe(Clone)] // #[derive(Debug)] infers an unwanted bound TC: Clone +pub struct ArtiHttpConnector { + /// The client + client: TorClient, + + /// TLS for using across Tor. + tls_conn: Arc, +} + +// #[derive(Clone)] infers a TC: Clone bound + +impl ArtiHttpConnector { + /// Make a new `ArtiHttpConnector` using an Arti `TorClient` object. + pub fn new(client: TorClient, tls_conn: TC) -> Self { + let tls_conn = tls_conn.into(); + Self { client, tls_conn } + } +} + +/// Wrapper type that makes an Arti `DataStream` implement necessary traits to be used as +/// a `hyper` connection object (mainly `Connection`). +/// +/// This might represent a bare HTTP connection across Tor, +/// or it might represent an HTTPS connection through Tor to an origin server, +/// `TC::TlsStream` as the TLS layer. +/// +/// An `ArtiHttpConnection` is constructed by hyper's use of the [`ArtiHttpConnector`] +/// implementation of [`hyper::service::Service`], +/// and then used by hyper as the transport for hyper's HTTP implementation. +#[pin_project] +pub struct ArtiHttpConnection { + /// The stream + #[pin] + inner: MaybeHttpsStream, +} + +/// The actual stream; might be TLS, might not +#[pin_project(project = MaybeHttpsStreamProj)] +enum MaybeHttpsStream { + /// http + Http(Pin>), // Tc:TlsStream is generally boxed; box this one too + + /// https + Https(#[pin] TC::TlsStream), +} + +impl Connection for ArtiHttpConnection { + fn connected(&self) -> Connected { + Connected::new() + } +} + +// These trait implementations just defer to the inner `DataStream`; the wrapper type is just +// there to implement the `Connection` trait. +impl AsyncRead for ArtiHttpConnection { + fn poll_read( + self: Pin<&mut Self>, + cx: &mut Context<'_>, + buf: &mut ReadBuf<'_>, + ) -> Poll> { + match self.project().inner.project() { + MaybeHttpsStreamProj::Http(ds) => ds.as_mut().poll_read(cx, buf), + MaybeHttpsStreamProj::Https(t) => t.poll_read(cx, buf), + } + } +} + +impl AsyncWrite for ArtiHttpConnection { + fn poll_write( + self: Pin<&mut Self>, + cx: &mut Context<'_>, + buf: &[u8], + ) -> Poll> { + match self.project().inner.project() { + MaybeHttpsStreamProj::Http(ds) => ds.as_mut().poll_write(cx, buf), + MaybeHttpsStreamProj::Https(t) => t.poll_write(cx, buf), + } + } + + fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { + match self.project().inner.project() { + MaybeHttpsStreamProj::Http(ds) => ds.as_mut().poll_flush(cx), + MaybeHttpsStreamProj::Https(t) => t.poll_flush(cx), + } + } + + fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { + match self.project().inner.project() { + MaybeHttpsStreamProj::Http(ds) => ds.as_mut().poll_shutdown(cx), + MaybeHttpsStreamProj::Https(t) => t.poll_shutdown(cx), + } + } +} + +#[derive(Debug, Clone, Copy, Eq, PartialEq)] +/// Are we doing TLS? +enum UseTls { + /// No + Bare, + + /// Yes + Tls, +} + +/// Convert uri to http\[s\] host and port, and whether to do tls +fn uri_to_host_port_tls(uri: Uri) -> Result<(String, u16, UseTls), ConnectionError> { + let use_tls = { + // Scheme doesn't derive PartialEq so can't be matched on + let scheme = uri.scheme(); + if scheme == Some(&Scheme::HTTP) { + UseTls::Bare + } else if scheme == Some(&Scheme::HTTPS) { + UseTls::Tls + } else { + return Err(ConnectionError::UnsupportedUriScheme { uri }); + } + }; + let host = match uri.host() { + Some(h) => h, + _ => return Err(ConnectionError::MissingHostname { uri }), + }; + let port = uri.port().map(|x| x.as_u16()).unwrap_or(match use_tls { + UseTls::Tls => 443, + UseTls::Bare => 80, + }); + + Ok((host.to_owned(), port, use_tls)) +} + +impl Service for ArtiHttpConnector { + type Response = ArtiHttpConnection; + type Error = ConnectionError; + #[allow(clippy::type_complexity)] + type Future = Pin> + Send>>; + + fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll> { + Poll::Ready(Ok(())) + } + + fn call(&mut self, req: Uri) -> Self::Future { + // `TorClient` objects can be cloned cheaply (the cloned objects refer to the same + // underlying handles required to make Tor connections internally). + // We use this to avoid the returned future having to borrow `self`. + let client = self.client.clone(); + let tls_conn = self.tls_conn.clone(); + Box::pin(async move { + // Extract the host and port to connect to from the URI. + let (host, port, use_tls) = uri_to_host_port_tls(req)?; + // Initiate a new Tor connection, producing a `DataStream` if successful. + let addr = (&host as &str, port) + .into_tor_addr() + .map_err(arti_client::Error::from)?; + let ds = client.connect(addr).await?; + + let inner = match use_tls { + UseTls::Tls => { + let conn = tls_conn + .connect_impl_tls_stream(&host, ds) + .await + .map_err(|e| ConnectionError::TLS(e.into()))?; + MaybeHttpsStream::Https(conn) + } + UseTls::Bare => MaybeHttpsStream::Http(Box::new(ds).into()), + }; + + Ok(ArtiHttpConnection { inner }) + }) + } +} diff --git a/src/tor/mod.rs b/src/tor/mod.rs index 3a3429b..5f4067c 100644 --- a/src/tor/mod.rs +++ b/src/tor/mod.rs @@ -19,4 +19,6 @@ mod tor; pub use tor::Tor; mod types; -pub use types::*; \ No newline at end of file +pub use types::*; + +mod http; \ No newline at end of file diff --git a/src/tor/tor.rs b/src/tor/tor.rs index b080916..0161696 100644 --- a/src/tor/tor.rs +++ b/src/tor/tor.rs @@ -24,7 +24,6 @@ use std::time::Duration; use arti_client::config::{CfgPath, TorClientConfigBuilder}; use arti_client::{TorClient, TorClientConfig}; -use arti_hyper::ArtiHttpConnector; use curve25519_dalek::digest::Digest; use ed25519_dalek::hazmat::ExpandedSecretKey; use fs_mistrust::Mistrust; @@ -56,7 +55,7 @@ use tor_rtcompat::Runtime; use tls_api_native_tls::TlsConnector; #[cfg(all(target_vendor = "apple", target_arch = "aarch64"))] use tls_api_openssl::TlsConnector; - +use crate::tor::http::ArtiHttpConnector; use crate::tor::TorConfig; lazy_static! { @@ -314,8 +313,8 @@ impl Tor { let mut w_services = TOR_SERVER_STATE.starting_services.write(); w_services.remove(&service_id); - // Check again after 15 seconds. - Duration::from_millis(15000) + // Check again after 50 seconds. + Duration::from_millis(50000) } Err(_) => { // Restart service on 3rd error. @@ -409,10 +408,10 @@ impl Tor { hs_nickname: &HsNickname, ) -> tor_keymgr::Result<()> { let arti_store = - ArtiNativeKeystore::from_path_and_mistrust(TorConfig::keystore_path(), &mistrust)?; + ArtiNativeKeystore::from_path_and_mistrust(TorConfig::keystore_path(), mistrust)?; let key_manager = KeyMgrBuilder::default() - .default_store(Box::new(arti_store)) + .primary_store(Box::new(arti_store)) .build() .unwrap(); @@ -427,13 +426,15 @@ impl Tor { key_manager.insert( HsIdKey::from(expanded_kp.public().clone()), &HsIdPublicKeySpecifier::new(hs_nickname.clone()), - KeystoreSelector::Default, + KeystoreSelector::Primary, + true )?; key_manager.insert( HsIdKeypair::from(expanded_kp), &HsIdKeypairSpecifier::new(hs_nickname.clone()), - KeystoreSelector::Default, + KeystoreSelector::Primary, + true )?; Ok(()) } @@ -444,7 +445,7 @@ impl Tor { builder.bridges().bridges().push(bridge); } - // Now configure an snowflake transport. (Requires the "pt-client" feature) + // Now configure a snowflake transport. (Requires the "pt-client" feature) let mut transport = TransportConfigBuilder::default(); transport .protocols(vec!["snowflake".parse().unwrap()])