diff --git a/Cargo.lock b/Cargo.lock index b815f2b8..7cde5b23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -205,9 +205,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arc-swap" @@ -249,7 +249,7 @@ dependencies = [ "rand", "safelog", "serde", - "thiserror", + "thiserror 1.0.69", "tor-async-utils", "tor-basic-utils", "tor-chanmgr", @@ -638,7 +638,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "tower-service", @@ -1048,7 +1048,7 @@ dependencies = [ "smoltcp", "socket2 0.5.7", "tempfile", - "thiserror", + "thiserror 2.0.3", "tokio", "tokio-rustls", "tokio-test", @@ -1461,7 +1461,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1610,7 +1610,7 @@ dependencies = [ "hex", "ipnet", "rand", - "thiserror", + "thiserror 1.0.69", "trust-dns-proto", "url", ] @@ -1998,7 +1998,7 @@ dependencies = [ "once_cell", "pwd-grp", "serde", - "thiserror", + "thiserror 1.0.69", "walkdir", ] @@ -2392,7 +2392,7 @@ dependencies = [ "once_cell", "radix_trie", "rand", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -2414,7 +2414,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tracing", @@ -2451,7 +2451,7 @@ dependencies = [ "rustls", "rustls-pemfile", "serde", - "thiserror", + "thiserror 1.0.69", "time", "tinyvec", "tokio", @@ -2477,7 +2477,7 @@ dependencies = [ "lru-cache", "parking_lot", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -2498,7 +2498,7 @@ dependencies = [ "rand", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -2522,7 +2522,7 @@ dependencies = [ "rustls", "serde", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-rustls", "tracing", @@ -2550,7 +2550,7 @@ dependencies = [ "prefix-trie", "rustls", "serde", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tokio-rustls", @@ -2793,6 +2793,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -2830,6 +2948,27 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -3059,9 +3198,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libloading" @@ -3113,6 +3252,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "lock_api" version = "0.4.12" @@ -3355,7 +3500,7 @@ dependencies = [ "cc", "futures", "log", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -3367,7 +3512,7 @@ checksum = "433419f898328beca4f2c6c73a1b52540658d92b0a99f0269330457e0fd998d5" dependencies = [ "cc", "libc", - "thiserror", + "thiserror 1.0.69", "winapi", ] @@ -3562,7 +3707,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3587,7 +3732,7 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk", "prost", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", ] @@ -3626,7 +3771,7 @@ dependencies = [ "percent-encoding", "rand", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -3914,7 +4059,7 @@ dependencies = [ "parking_lot", "pin-project", "static_assertions", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4118,7 +4263,7 @@ dependencies = [ "derive-adhoc", "libc", "paste", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4157,7 +4302,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2 0.5.7", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -4174,7 +4319,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "slab", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tracing", ] @@ -4293,7 +4438,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4486,9 +4631,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" dependencies = [ "bitflags 2.6.0", "errno", @@ -4559,7 +4704,7 @@ dependencies = [ "educe", "either", "fluid-let", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4618,9 +4763,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -4793,9 +4938,9 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" dependencies = [ "futures", "log", @@ -4807,9 +4952,9 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", @@ -4879,7 +5024,7 @@ dependencies = [ "shadowsocks-crypto", "socket2 0.5.7", "spin 0.9.8", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-tfo", "url", @@ -4959,7 +5104,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -5202,6 +5347,17 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "tap" version = "1.0.1" @@ -5210,9 +5366,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -5229,18 +5385,38 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.67" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] name = "thiserror-impl" -version = "1.0.67" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" dependencies = [ "proc-macro2", "quote", @@ -5301,6 +5477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", + "zerovec", ] [[package]] @@ -5330,9 +5507,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -5538,7 +5715,7 @@ dependencies = [ "rand", "rand_chacha", "slab", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5551,7 +5728,7 @@ dependencies = [ "digest", "educe", "getrandom", - "thiserror", + "thiserror 1.0.69", "tor-error", "tor-llcrypto", "zeroize", @@ -5571,7 +5748,7 @@ dependencies = [ "paste", "rand", "smallvec", - "thiserror", + "thiserror 1.0.69", "tor-basic-utils", "tor-bytes", "tor-cert", @@ -5591,7 +5768,7 @@ dependencies = [ "caret", "derive_more", "digest", - "thiserror", + "thiserror 1.0.69", "tor-bytes", "tor-checkable", "tor-llcrypto", @@ -5613,7 +5790,7 @@ dependencies = [ "rand", "safelog", "serde", - "thiserror", + "thiserror 1.0.69", "tor-async-utils", "tor-basic-utils", "tor-cell", @@ -5638,7 +5815,7 @@ checksum = "d875e93e91977a7c2a1d6ba662d7a3f7d47fcfbad9b93c3a97c2ceb9acf7d29f" dependencies = [ "humantime", "signature", - "thiserror", + "thiserror 1.0.69", "tor-llcrypto", ] @@ -5668,7 +5845,7 @@ dependencies = [ "safelog", "serde", "static_assertions", - "thiserror", + "thiserror 1.0.69", "tor-async-utils", "tor-basic-utils", "tor-chanmgr", @@ -5714,7 +5891,7 @@ dependencies = [ "serde_ignored", "shellexpand", "strum 0.26.3", - "thiserror", + "thiserror 1.0.69", "toml", "tor-basic-utils", "tor-error", @@ -5731,7 +5908,7 @@ checksum = "9aac77a0ec434b8ffeb1d67618e4dd0aeb1abd723ed5a34542575482b3dec1fc" dependencies = [ "digest", "hex", - "thiserror", + "thiserror 1.0.69", "tor-llcrypto", ] @@ -5751,7 +5928,7 @@ dependencies = [ "httpdate", "itertools 0.13.0", "memchr", - "thiserror", + "thiserror 1.0.69", "tor-circmgr", "tor-error", "tor-hscrypto", @@ -5795,7 +5972,7 @@ dependencies = [ "serde", "signature", "strum 0.26.3", - "thiserror", + "thiserror 1.0.69", "time", "tor-async-utils", "tor-basic-utils", @@ -5828,7 +6005,7 @@ dependencies = [ "retry-error", "static_assertions", "strum 0.26.3", - "thiserror", + "thiserror 1.0.69", "tracing", "void", ] @@ -5858,7 +6035,7 @@ dependencies = [ "safelog", "serde", "strum 0.26.3", - "thiserror", + "thiserror 1.0.69", "tor-async-utils", "tor-basic-utils", "tor-config", @@ -5895,7 +6072,7 @@ dependencies = [ "safelog", "slotmap", "strum 0.26.3", - "thiserror", + "thiserror 1.0.69", "tor-async-utils", "tor-basic-utils", "tor-bytes", @@ -5932,7 +6109,7 @@ dependencies = [ "safelog", "signature", "subtle", - "thiserror", + "thiserror 1.0.69", "tor-basic-utils", "tor-bytes", "tor-error", @@ -5961,7 +6138,7 @@ dependencies = [ "rand", "serde", "ssh-key", - "thiserror", + "thiserror 1.0.69", "tor-basic-utils", "tor-config", "tor-error", @@ -5990,7 +6167,7 @@ dependencies = [ "serde", "serde_with", "strum 0.26.3", - "thiserror", + "thiserror 1.0.69", "tor-basic-utils", "tor-bytes", "tor-config", @@ -6024,7 +6201,7 @@ dependencies = [ "signature", "simple_asn1", "subtle", - "thiserror", + "thiserror 1.0.69", "visibility", "x25519-dalek", "zeroize", @@ -6039,7 +6216,7 @@ dependencies = [ "futures", "humantime", "once_cell", - "thiserror", + "thiserror 1.0.69", "tor-error", "tor-rtcompat", "tracing", @@ -6064,7 +6241,7 @@ dependencies = [ "serde", "static_assertions", "strum 0.26.3", - "thiserror", + "thiserror 1.0.69", "time", "tor-basic-utils", "tor-error", @@ -6103,7 +6280,7 @@ dependencies = [ "signature", "smallvec", "subtle", - "thiserror", + "thiserror 1.0.69", "time", "tinystr", "tor-basic-utils", @@ -6140,7 +6317,7 @@ dependencies = [ "sanitize-filename", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tor-async-utils", "tor-basic-utils", "tor-error", @@ -6172,7 +6349,7 @@ dependencies = [ "rand_core", "safelog", "subtle", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "tor-async-utils", @@ -6204,7 +6381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88cf099c5c91216c7d0a6b2d4c67bb18f0786ad8c8273063d6a45c51b49b40c2" dependencies = [ "caret", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6237,7 +6414,7 @@ dependencies = [ "paste", "pin-project", "rustls-pki-types", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "tor-error", @@ -6264,7 +6441,7 @@ dependencies = [ "priority-queue", "slotmap", "strum 0.26.3", - "thiserror", + "thiserror 1.0.69", "tor-error", "tor-rtcompat", "tracing", @@ -6280,7 +6457,7 @@ checksum = "e2ea008c29b34604d49f25540e4d72b3bdce0d1021aa82f85e790262280804f0" dependencies = [ "caret", "subtle", - "thiserror", + "thiserror 1.0.69", "tor-bytes", "tor-error", ] @@ -6292,7 +6469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c549e18390341623fb8ee988b2622d9b8fa11727d66717c9331156f84e54b09d" dependencies = [ "derive_more", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6387,7 +6564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", "time", "tracing-subscriber", ] @@ -6530,7 +6707,7 @@ dependencies = [ "lazy_static", "rand", "smallvec", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tracing", "url", @@ -6544,26 +6721,26 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tuic" -version = "1.3.1" -source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.3.2#dea187c83da1c769668dfe1f1f12c6bf1e3e9521" +version = "1.3.4" +source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.3.4#333f80df681ed2f8ecc1d8b18efe585c148fc77c" dependencies = [ "bytes", "futures-util", "parking_lot", "register-count", - "thiserror", + "thiserror 1.0.69", "uuid", ] [[package]] name = "tuic-quinn" -version = "1.3.1" -source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.3.2#dea187c83da1c769668dfe1f1f12c6bf1e3e9521" +version = "1.3.4" +source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.3.4#333f80df681ed2f8ecc1d8b18efe585c148fc77c" dependencies = [ "bytes", "futures-util", "quinn", - "thiserror", + "thiserror 1.0.69", "tuic", "uuid", ] @@ -6579,7 +6756,7 @@ dependencies = [ "ioctl-sys", "libc", "log", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "wintun", @@ -6599,7 +6776,7 @@ dependencies = [ "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", "utf-8", ] @@ -6709,12 +6886,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna 1.0.3", "percent-encoding", "serde", ] @@ -6725,6 +6902,18 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -6899,7 +7088,7 @@ dependencies = [ "rustls", "rustls-pemfile", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "webpki-roots", @@ -7266,10 +7455,22 @@ dependencies = [ "c2rust-bitfields", "libloading", "log", - "thiserror", + "thiserror 1.0.69", "windows 0.51.1", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -7301,6 +7502,30 @@ dependencies = [ "untrusted 0.7.1", ] +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -7322,6 +7547,27 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + [[package]] name = "zeroize" version = "1.8.1" @@ -7341,3 +7587,25 @@ dependencies = [ "quote", "syn 2.0.87", ] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index d9cef9d0..0afd0e88 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -37,7 +37,7 @@ rustls-pemfile = "2" webpki-roots = "0.26" # Error handing & logging -thiserror = "1" +thiserror = "2" anyhow = "1" opentelemetry = "0.26" opentelemetry_sdk = { version = "0.26", default-features = false, features = ["trace", "rt-tokio"] } @@ -121,8 +121,8 @@ arti-client = { version = "0.22", optional = true, default-features = false, fea tor-rtcompat = { version = "0.22", optional = true, default-features = false } # tuic -tuic = { tag = "v1.3.2", optional = true, git = "https://github.com/Itsusinn/tuic.git" } -tuic-quinn = { tag = "v1.3.2", optional = true, git = "https://github.com/Itsusinn/tuic.git" } +tuic = { tag = "v1.3.4", optional = true, git = "https://github.com/Itsusinn/tuic.git" } +tuic-quinn = { tag = "v1.3.4", optional = true, git = "https://github.com/Itsusinn/tuic.git" } register-count = { version = "0.1", optional = true } quinn = { version = "0.11", default-features = false, features = ["futures-io", "runtime-tokio", "rustls"] } @@ -140,12 +140,12 @@ criterion = { version = "0.5", features = ["html_reports", "async_tokio"], optio memory-stats = "1.0.0" [dev-dependencies] -tempfile = "3.13" +tempfile = "3.14" mockall = "0.13.0" tokio-test = "0.4.4" axum-macros = "0.4.2" bollard = "0.17" -serial_test = "3.1" +serial_test = "3.2" env_logger = "0.11" [build-dependencies] @@ -155,7 +155,7 @@ prost-build = "0.13" unix-udp-sock = { git = "https://github.com/Watfaq/unix-udp-sock.git", rev = "cd3e4eca43e6f3be82a2703c3d711b7e18fbfd18"} [target.'cfg(macos)'.dependencies] -security-framework = "3.0.0" +security-framework = "3.0.1" [target.'cfg(windows)'.dependencies] windows = { version = "0.58", features = [