From ae7d79bcef4bbea3842282e1bee0da208ebd1d49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2025 15:15:11 +0000 Subject: [PATCH 01/15] build(deps): bump the rust-dependencies group across 1 directory with 3 updates Bumps the rust-dependencies group with 3 updates in the / directory: [rand](https://github.com/rust-random/rand), [tuic](https://github.com/Itsusinn/tuic) and [tuic-quinn](https://github.com/Itsusinn/tuic). Updates `rand` from 0.8.5 to 0.9.0 - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/rand/compare/0.8.5...0.9.0) Updates `tuic` from v1.4.3 to v1.4.5 - [Release notes](https://github.com/Itsusinn/tuic/releases) - [Commits](https://github.com/Itsusinn/tuic/compare/2a962370a50ca9265b22aee0d299cf4ad573d310...17ee3f702e26aca048495d4c66ad5316bb8eaf98) Updates `tuic-quinn` from v1.4.3 to v1.4.5 - [Release notes](https://github.com/Itsusinn/tuic/releases) - [Commits](https://github.com/Itsusinn/tuic/compare/2a962370a50ca9265b22aee0d299cf4ad573d310...17ee3f702e26aca048495d4c66ad5316bb8eaf98) --- updated-dependencies: - dependency-name: rand dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: tuic dependency-type: direct:production dependency-group: rust-dependencies - dependency-name: tuic-quinn dependency-type: direct:production dependency-group: rust-dependencies ... Signed-off-by: dependabot[bot] --- Cargo.lock | 215 ++++++++++++++++++++++--------------------- clash_lib/Cargo.toml | 2 +- 2 files changed, 109 insertions(+), 108 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab8bc7c9e..163b71c8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -317,7 +317,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "synstructure", ] @@ -329,7 +329,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -353,7 +353,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -375,7 +375,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -386,7 +386,7 @@ checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -556,7 +556,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -640,7 +640,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.96", + "syn 2.0.98", "which", ] @@ -661,7 +661,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -718,7 +718,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -856,9 +856,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "by_address" @@ -943,9 +943,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.10" +version = "1.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" dependencies = [ "shlex", ] @@ -1099,7 +1099,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1201,7 +1201,7 @@ dependencies = [ "public-suffix", "quinn", "quinn-proto", - "rand 0.8.5", + "rand 0.9.0", "regex", "register-count", "ring-compat", @@ -1371,9 +1371,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -1543,7 +1543,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1591,7 +1591,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1613,14 +1613,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] name = "data-encoding" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" +checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" [[package]] name = "defmt" @@ -1642,7 +1642,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1662,7 +1662,7 @@ checksum = "297806318ef30ad066b15792a8372858020ae3ca2e414ee6c2133b1eb9e9e945" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1724,7 +1724,7 @@ dependencies = [ "quote", "sha3", "strum", - "syn 2.0.96", + "syn 2.0.98", "void", ] @@ -1777,7 +1777,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "unicode-xid", ] @@ -1889,7 +1889,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1912,9 +1912,9 @@ checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf" [[package]] name = "dyn-clone" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" +checksum = "feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35" [[package]] name = "dynosaur" @@ -1934,7 +1934,7 @@ checksum = "16c187d1e575ef546d24f0fcd7701cc04abfe6b5e7e2758aabc450b99e835ac3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2043,7 +2043,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2056,7 +2056,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2068,7 +2068,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2346,7 +2346,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2639,9 +2639,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hickory-client" -version = "0.25.0-alpha.4" +version = "0.25.0-alpha.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83536dab9a159b2b5cf2c20c47ecf188cee35316f96be028e63e8e1340d2724d" +checksum = "aba7b17856dc1b69706dcf163cfcf2a768de2e4a15aa41ac2a4b99896c6e4968" dependencies = [ "cfg-if", "data-encoding", @@ -2650,7 +2650,7 @@ dependencies = [ "hickory-proto", "once_cell", "radix_trie", - "rand 0.8.5", + "rand 0.9.0", "thiserror 2.0.11", "tokio", "tracing", @@ -2658,9 +2658,9 @@ dependencies = [ [[package]] name = "hickory-proto" -version = "0.25.0-alpha.4" +version = "0.25.0-alpha.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d063c0692ee669aa6d261988aa19ca5510f1cc40e4f211024f50c888499a35d7" +checksum = "1d00147af6310f4392a31680db52a3ed45a2e0f68eb18e8c3fe5537ecc96d9e2" dependencies = [ "async-recursion", "async-trait", @@ -2681,9 +2681,10 @@ dependencies = [ "once_cell", "pin-project-lite", "quinn", - "rand 0.8.5", + "rand 0.9.0", "ring 0.17.8", "rustls", + "rustls-pki-types", "serde", "thiserror 2.0.11", "time", @@ -3099,7 +3100,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3237,9 +3238,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b31349d02fe60f80bbbab1a9402364cad7460626d6030494b08ac4a2075bf81" +checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb" dependencies = [ "rustversion", ] @@ -3691,7 +3692,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3903,7 +3904,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4066,9 +4067,9 @@ dependencies = [ [[package]] name = "p384" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" dependencies = [ "ecdsa", "elliptic-curve", @@ -4217,7 +4218,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4231,22 +4232,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" +checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" +checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4435,7 +4436,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" dependencies = [ "proc-macro2", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4449,9 +4450,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" +checksum = "090ded312ed32a928fb49cb91ab4db6523ae3767225e61fbf6ceaaec3664ed26" dependencies = [ "autocfg", "equivalent", @@ -4486,7 +4487,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4524,7 +4525,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.96", + "syn 2.0.98", "tempfile", ] @@ -4538,7 +4539,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4601,7 +4602,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "rustls", "socket2 0.5.8", "thiserror 2.0.11", @@ -4619,7 +4620,7 @@ dependencies = [ "getrandom 0.2.15", "rand 0.8.5", "ring 0.17.8", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "rustls", "rustls-pki-types", "slab", @@ -5053,9 +5054,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustc_version" @@ -5113,9 +5114,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" dependencies = [ "web-time", ] @@ -5139,9 +5140,9 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "safelog" @@ -5185,9 +5186,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.3.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e1c91382686d21b5ac7959341fcb9780fa7c03773646995a87c950fa7be640" +checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1" dependencies = [ "sdd", ] @@ -5217,9 +5218,9 @@ dependencies = [ [[package]] name = "sdd" -version = "3.0.5" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478f121bb72bbf63c52c93011ea1791dca40140dfe13f8336c4c5ac952c33aa9" +checksum = "b07779b9b918cc05650cb30f404d4d7835d26df37c235eded8a6832e2fb82cca" [[package]] name = "sec1" @@ -5301,7 +5302,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -5343,7 +5344,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -5394,7 +5395,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -5432,7 +5433,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -5769,7 +5770,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -5791,9 +5792,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.96" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -5814,7 +5815,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -5875,7 +5876,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -5886,7 +5887,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -6007,7 +6008,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -6090,9 +6091,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" dependencies = [ "serde", "serde_spanned", @@ -6111,9 +6112,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ "indexmap 2.7.1", "serde", @@ -7178,7 +7179,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -7270,7 +7271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -7298,7 +7299,7 @@ checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -7435,9 +7436,9 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-normalization" @@ -7560,7 +7561,7 @@ checksum = "d28dd23acb5f2fa7bd2155ab70b960e770596b3bb6395119b40476c3655dfba4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -7589,7 +7590,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -7669,7 +7670,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "wasm-bindgen-shared", ] @@ -7704,7 +7705,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7905,7 +7906,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -7916,7 +7917,7 @@ checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -7927,7 +7928,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -7938,7 +7939,7 @@ checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -8192,9 +8193,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.6.24" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" +checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f" dependencies = [ "memchr", ] @@ -8294,7 +8295,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "synstructure", ] @@ -8325,7 +8326,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -8336,7 +8337,7 @@ checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -8356,7 +8357,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "synstructure", ] @@ -8377,7 +8378,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -8399,5 +8400,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index 5f573c716..eaa8daafa 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -106,7 +106,7 @@ hickory-proto = { version = "0.25.0-alpha.2", features = ["dns-over-rustls", "dn dhcproto = "0.12" ring-compat = { version = "0.8", features = ["aead"] } -rand = "0.8" +rand = "0.9" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing-appender = "0.2" From 6a0416254cae09b8caea6134e34601212c8b91e1 Mon Sep 17 00:00:00 2001 From: cndev0 Date: Mon, 27 Jan 2025 23:38:51 +0800 Subject: [PATCH 02/15] up --- clash_lib/src/app/dns/resolver/enhanced.rs | 6 +++--- clash_lib/src/app/dns/resolver/system_linux.rs | 6 +++--- clash_lib/src/app/dns/resolver/system_non_linux.rs | 6 +++--- clash_lib/src/common/utils.rs | 8 ++++---- clash_lib/src/proxy/converters/hysteria2.rs | 4 ++-- clash_lib/src/proxy/hysteria2/codec.rs | 6 +++--- clash_lib/src/proxy/hysteria2/salamander.rs | 2 +- .../src/proxy/shadowsocks/shadow_tls/connector.rs | 12 ++++++------ clash_lib/src/proxy/shadowsocks/simple_obfs/http.rs | 5 +++-- clash_lib/src/proxy/transport/h2.rs | 4 ++-- clash_lib/src/proxy/wg/device.rs | 4 ++-- clash_lib/src/proxy/wg/mod.rs | 4 ++-- clash_lib/src/proxy/wg/ports.rs | 4 ++-- 13 files changed, 36 insertions(+), 35 deletions(-) diff --git a/clash_lib/src/app/dns/resolver/enhanced.rs b/clash_lib/src/app/dns/resolver/enhanced.rs index 5eb310efb..626e9751e 100644 --- a/clash_lib/src/app/dns/resolver/enhanced.rs +++ b/clash_lib/src/app/dns/resolver/enhanced.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; use futures::{FutureExt, TryFutureExt}; -use rand::prelude::SliceRandom; +use rand::seq::IndexedRandom; use std::{ net, sync::{ @@ -531,7 +531,7 @@ impl ClashResolver for EnhancedResolver { } match self.lookup_ip(host, rr::RecordType::A).await { - Ok(result) => match result.choose(&mut rand::thread_rng()).unwrap() { + Ok(result) => match result.choose(&mut rand::rng()).unwrap() { net::IpAddr::V4(v4) => Ok(Some(*v4)), _ => unreachable!("invalid IP family"), }, @@ -564,7 +564,7 @@ impl ClashResolver for EnhancedResolver { } match self.lookup_ip(host, rr::RecordType::AAAA).await { - Ok(result) => match result.choose(&mut rand::thread_rng()).unwrap() { + Ok(result) => match result.choose(&mut rand::rng()).unwrap() { net::IpAddr::V6(v6) => Ok(Some(*v6)), _ => unreachable!("invalid IP family"), }, diff --git a/clash_lib/src/app/dns/resolver/system_linux.rs b/clash_lib/src/app/dns/resolver/system_linux.rs index 099d18355..3ccc8d14a 100644 --- a/clash_lib/src/app/dns/resolver/system_linux.rs +++ b/clash_lib/src/app/dns/resolver/system_linux.rs @@ -33,7 +33,7 @@ impl ClashResolver for SystemResolver { Ok(response .iter() .filter(|x| self.ipv6() || x.is_ipv4()) - .choose(&mut rand::thread_rng())) + .choose(&mut rand::rng())) } async fn resolve_v4( @@ -42,7 +42,7 @@ impl ClashResolver for SystemResolver { _: bool, ) -> anyhow::Result> { let response = self.inner.ipv4_lookup(host).await?; - Ok(response.iter().map(|x| x.0).choose(&mut rand::thread_rng())) + Ok(response.iter().map(|x| x.0).choose(&mut rand::rng())) } async fn resolve_v6( @@ -51,7 +51,7 @@ impl ClashResolver for SystemResolver { _: bool, ) -> anyhow::Result> { let response = self.inner.ipv6_lookup(host).await?; - Ok(response.iter().map(|x| x.0).choose(&mut rand::thread_rng())) + Ok(response.iter().map(|x| x.0).choose(&mut rand::rng())) } async fn cached_for(&self, _: std::net::IpAddr) -> Option { diff --git a/clash_lib/src/app/dns/resolver/system_non_linux.rs b/clash_lib/src/app/dns/resolver/system_non_linux.rs index 88df66bf4..d137d8e09 100644 --- a/clash_lib/src/app/dns/resolver/system_non_linux.rs +++ b/clash_lib/src/app/dns/resolver/system_non_linux.rs @@ -39,7 +39,7 @@ impl ClashResolver for SystemResolver { } }) .collect::>(); - Ok(response.into_iter().choose(&mut rand::thread_rng())) + Ok(response.into_iter().choose(&mut rand::rng())) } async fn resolve_v4( @@ -54,7 +54,7 @@ impl ClashResolver for SystemResolver { _ => None, }) .collect::>(); - Ok(response.into_iter().choose(&mut rand::thread_rng())) + Ok(response.into_iter().choose(&mut rand::rng())) } async fn resolve_v6( @@ -72,7 +72,7 @@ impl ClashResolver for SystemResolver { _ => None, }) .collect::>(); - Ok(response.into_iter().choose(&mut rand::thread_rng())) + Ok(response.into_iter().choose(&mut rand::rng())) } async fn cached_for(&self, _: std::net::IpAddr) -> Option { diff --git a/clash_lib/src/common/utils.rs b/clash_lib/src/common/utils.rs index f121a1917..526500bdf 100644 --- a/clash_lib/src/common/utils.rs +++ b/clash_lib/src/common/utils.rs @@ -5,7 +5,7 @@ use std::{fmt::Write, num::ParseIntError, path::Path}; use crate::{common::errors::new_io_error, Error}; use rand::{ - distributions::uniform::{SampleRange, SampleUniform}, + distr::uniform::{SampleRange, SampleUniform}, Fill, Rng, }; use sha2::Digest; @@ -16,15 +16,15 @@ where T: SampleUniform, R: SampleRange, { - let mut rng = rand::thread_rng(); - rng.gen_range(range) + let mut rng = rand::rng(); + rng.random_range(range) } pub fn rand_fill(buf: &mut T) where T: Fill + ?Sized, { - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); rng.fill(buf) } diff --git a/clash_lib/src/proxy/converters/hysteria2.rs b/clash_lib/src/proxy/converters/hysteria2.rs index cb587881a..f7f888684 100644 --- a/clash_lib/src/proxy/converters/hysteria2.rs +++ b/clash_lib/src/proxy/converters/hysteria2.rs @@ -40,10 +40,10 @@ impl PortGenrateor { } pub fn get(&self) -> u16 { - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); let len = 1 + self.ports.len() + self.range.iter().map(|r| r.len()).sum::(); - let idx = rng.gen_range(0..len); + let idx = rng.random_range(0..len); match idx { 0 => self.default, idx if idx <= self.ports.len() => self.ports[idx - 1], diff --git a/clash_lib/src/proxy/hysteria2/codec.rs b/clash_lib/src/proxy/hysteria2/codec.rs index ab58609cb..6c83e14e1 100644 --- a/clash_lib/src/proxy/hysteria2/codec.rs +++ b/clash_lib/src/proxy/hysteria2/codec.rs @@ -2,7 +2,7 @@ use std::io::ErrorKind; use bytes::{Buf, BufMut, BytesMut}; use quinn_proto::{coding::Codec, VarInt}; -use rand::distributions::Alphanumeric; +use rand::distr::Alphanumeric; use tokio_util::codec::{Decoder, Encoder}; use crate::session::SocksAddr; @@ -64,8 +64,8 @@ impl Decoder for Hy2TcpCodec { #[inline] pub fn padding(range: std::ops::RangeInclusive) -> Vec { use rand::Rng; - let mut rng = rand::thread_rng(); - let len = rng.gen_range(range) as usize; + let mut rng = rand::rng(); + let len = rng.random_range(range) as usize; rng.sample_iter(Alphanumeric).take(len).collect() } diff --git a/clash_lib/src/proxy/hysteria2/salamander.rs b/clash_lib/src/proxy/hysteria2/salamander.rs index adb0b782f..e3149e081 100644 --- a/clash_lib/src/proxy/hysteria2/salamander.rs +++ b/clash_lib/src/proxy/hysteria2/salamander.rs @@ -42,7 +42,7 @@ impl SalamanderObfs { } fn encrypt(&self, data: &mut [u8]) -> Bytes { - let salt: [u8; 8] = rand::thread_rng().gen(); + let salt: [u8; 8] = rand::rng().random(); let mut res = BytesMut::with_capacity(8 + data.len()); res.put_slice(&salt); diff --git a/clash_lib/src/proxy/shadowsocks/shadow_tls/connector.rs b/clash_lib/src/proxy/shadowsocks/shadow_tls/connector.rs index 909265e04..6f3b0629f 100644 --- a/clash_lib/src/proxy/shadowsocks/shadow_tls/connector.rs +++ b/clash_lib/src/proxy/shadowsocks/shadow_tls/connector.rs @@ -2,7 +2,7 @@ use std::{io, ptr::copy_nonoverlapping, sync::Arc}; use rand::Rng; -use rand::distributions::Distribution; +use rand::distr::Distribution; use tokio::io::{AsyncReadExt, AsyncWrite, AsyncWriteExt}; use tokio_rustls::{client::TlsStream, TlsConnector}; @@ -119,7 +119,7 @@ fn generate_session_id(hmac: &Hmac, buf: &[u8]) -> [u8; TLS_SESSION_ID_SIZE] { } let mut session_id = [0; TLS_SESSION_ID_SIZE]; - rand::thread_rng().fill(&mut session_id[..TLS_SESSION_ID_SIZE - HMAC_SIZE]); + rand::rng().fill(&mut session_id[..TLS_SESSION_ID_SIZE - HMAC_SIZE]); let mut hmac = hmac.to_owned(); hmac.update(&buf[0..SESSION_ID_START]); hmac.update(&session_id); @@ -143,13 +143,13 @@ async fn fake_request( ) -> std::io::Result<()> { const HEADER: &[u8; 207] = b"GET / HTTP/1.1\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36\nAccept: gzip, deflate, br\nConnection: Close\nCookie: sessionid="; const FAKE_REQUEST_LENGTH_RANGE: (usize, usize) = (16, 64); - let cnt = rand::thread_rng() - .gen_range(FAKE_REQUEST_LENGTH_RANGE.0..FAKE_REQUEST_LENGTH_RANGE.1); + let cnt = rand::rng() + .random_range(FAKE_REQUEST_LENGTH_RANGE.0..FAKE_REQUEST_LENGTH_RANGE.1); let mut buffer = Vec::with_capacity(cnt + HEADER.len() + 1); buffer.extend_from_slice(HEADER); - rand::distributions::Alphanumeric - .sample_iter(rand::thread_rng()) + rand::distr::Alphanumeric + .sample_iter(rand::rng()) .take(cnt) .for_each(|c| buffer.push(c)); buffer.push(b'\n'); diff --git a/clash_lib/src/proxy/shadowsocks/simple_obfs/http.rs b/clash_lib/src/proxy/shadowsocks/simple_obfs/http.rs index dc09649ab..37a3b89d0 100644 --- a/clash_lib/src/proxy/shadowsocks/simple_obfs/http.rs +++ b/clash_lib/src/proxy/shadowsocks/simple_obfs/http.rs @@ -3,6 +3,7 @@ use std::pin::Pin; use crate::proxy::AnyStream; use base64::Engine; use bytes::{BufMut, BytesMut}; +use rand::Rng; use tokio::io::{AsyncRead, AsyncWrite}; #[derive(Debug)] @@ -41,8 +42,8 @@ impl AsyncWrite for HTTPObfs { buffer.put_slice( format!( "User-Agent: curl/7.{}.{}\r\n", - rand::random::() % 54, - rand::random::() % 2 + rand::rng().random_range(0..54), + rand::rng().random_range(0..2), ) .as_bytes(), ); diff --git a/clash_lib/src/proxy/transport/h2.rs b/clash_lib/src/proxy/transport/h2.rs index bcc2d0b78..1860ed698 100644 --- a/clash_lib/src/proxy/transport/h2.rs +++ b/clash_lib/src/proxy/transport/h2.rs @@ -4,7 +4,7 @@ use bytes::{Bytes, BytesMut}; use futures::ready; use h2::{RecvStream, SendStream}; use http::Request; -use rand::random; +use rand::Rng; use tokio::io::{AsyncRead, AsyncWrite}; use tracing::error; @@ -20,7 +20,7 @@ pub struct Http2Config { impl Http2Config { fn req(&self) -> std::io::Result> { - let uri_idx = random::() % self.hosts.len(); + let uri_idx = rand::rng().random_range(0..self.hosts.len()); let uri = { http::Uri::builder() .scheme("https") diff --git a/clash_lib/src/proxy/wg/device.rs b/clash_lib/src/proxy/wg/device.rs index a604a0f24..033646c70 100644 --- a/clash_lib/src/proxy/wg/device.rs +++ b/clash_lib/src/proxy/wg/device.rs @@ -8,7 +8,7 @@ use std::{ use bytes::{BufMut, Bytes, BytesMut}; use futures::{SinkExt, StreamExt}; -use rand::seq::SliceRandom; +use rand::seq::IndexedRandom; use smoltcp::{ iface::{Config, Interface, SocketHandle, SocketSet}, phy::Device, @@ -488,7 +488,7 @@ impl DeviceManager { if let Ok(ip) = domain.parse::() { ip } else { - let dns_server = self.dns_servers.choose(&mut rand::thread_rng()); + let dns_server = self.dns_servers.choose(&mut rand::rng()); if let Some(dns_server) = dns_server { let ip = self.look_up_dns(domain, *dns_server).await; if let Some(ip) = ip { diff --git a/clash_lib/src/proxy/wg/mod.rs b/clash_lib/src/proxy/wg/mod.rs index 6c028e025..4fbd22932 100644 --- a/clash_lib/src/proxy/wg/mod.rs +++ b/clash_lib/src/proxy/wg/mod.rs @@ -29,7 +29,7 @@ use async_trait::async_trait; use futures::TryFutureExt; use ipnet::IpNet; -use rand::seq::SliceRandom; +use rand::seq::IndexedRandom; use tokio::sync::OnceCell; use tracing::debug; @@ -268,7 +268,7 @@ impl OutboundHandler for Handler { .dns .as_ref() .unwrap() - .choose(&mut rand::thread_rng()) + .choose(&mut rand::rng()) .unwrap(); inner diff --git a/clash_lib/src/proxy/wg/ports.rs b/clash_lib/src/proxy/wg/ports.rs index 75499dcb6..58de412d5 100644 --- a/clash_lib/src/proxy/wg/ports.rs +++ b/clash_lib/src/proxy/wg/ports.rs @@ -1,7 +1,7 @@ use std::{collections::VecDeque, ops::Range, sync::Arc}; use anyhow::Context; -use rand::{seq::SliceRandom, thread_rng}; +use rand::seq::SliceRandom; const MIN_PORT: u16 = 1025; const MAX_PORT: u16 = 60000; @@ -24,7 +24,7 @@ impl PortPool { pub fn new() -> Self { let mut inner = TcpPortPoolInner::default(); let mut ports: Vec = PORT_RANGE.collect(); - ports.shuffle(&mut thread_rng()); + ports.shuffle(&mut rand::rng()); ports .into_iter() .for_each(|p| inner.queue.push_back(p) as ()); From 4dc384773db52e47dacaebcbb864288c2c8639e8 Mon Sep 17 00:00:00 2001 From: cndev0 Date: Wed, 29 Jan 2025 13:55:40 +0800 Subject: [PATCH 03/15] ci --- Cargo.toml | 28 ++++++++++++++++++++++++++++ Cross.toml | 27 --------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 Cross.toml diff --git a/Cargo.toml b/Cargo.toml index 9454e4546..f9d444672 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,3 +24,31 @@ debug = 1 [patch.crates-io] tokio-rustls = { git = "https://github.com/Watfaq/tokio-rustls.git", rev = "6b9af8ac7bb5abc159d9a67e9ddbf84127559a4a"} rustls = { git = "https://github.com/Watfaq/rustls.git", rev = "a7d217bf235aeb3ca8d123352d90a27c1ca0f41b"} + +[workspace.metadata.cross.build] +pre-build = [ + "apt update", + "apt install -y protobuf-compiler" +] + +[workspace.metadata.cross.build.env] +volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker +passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG", "CLASH_DOCKER_TEST"] + +[workspace.metadata.cross.target.x86_64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" + +[workspace.metadata.cross.target.i686-unknown-linux-gnu] +image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" + +[workspace.metadata.cross.target.aarch64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" + +workspace.metadata.cross.[target.armv7-unknown-linux-gnueabi] +image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" + +[workspace.metadata.cross.target.armv7-unknown-linux-gnueabihf] +image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main" + +[workspace.metadata.cross.target.armv7-unknown-linux-musleabihf] +image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main" diff --git a/Cross.toml b/Cross.toml deleted file mode 100644 index 9e6aea464..000000000 --- a/Cross.toml +++ /dev/null @@ -1,27 +0,0 @@ -[build] -pre-build = [ - "apt update", - "apt install -y protobuf-compiler" -] - -[build.env] -volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker -passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG", "CLASH_DOCKER_TEST"] - -[target.x86_64-unknown-linux-gnu] -image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" - -[target.i686-unknown-linux-gnu] -image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" - -[target.aarch64-unknown-linux-gnu] -image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" - -[target.armv7-unknown-linux-gnueabi] -image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" - -[target.armv7-unknown-linux-gnueabihf] -image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main" - -[target.armv7-unknown-linux-musleabihf] -image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main" From 0a301b1e58c2edf65c357aeb04fdf05c89cab77e Mon Sep 17 00:00:00 2001 From: Yuwei Ba Date: Wed, 29 Jan 2025 13:57:56 +0800 Subject: [PATCH 04/15] Update Cargo.toml Signed-off-by: Yuwei Ba --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f9d444672..5ce341a8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" [workspace.metadata.cross.target.aarch64-unknown-linux-gnu] image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" -workspace.metadata.cross.[target.armv7-unknown-linux-gnueabi] +[workspace.metadata.cross.[target.armv7-unknown-linux-gnueabi] image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" [workspace.metadata.cross.target.armv7-unknown-linux-gnueabihf] From b5269b9749418e2821a191c150c4cb1eb00749a0 Mon Sep 17 00:00:00 2001 From: Yuwei Ba Date: Wed, 29 Jan 2025 13:58:14 +0800 Subject: [PATCH 05/15] Update Cargo.toml Signed-off-by: Yuwei Ba --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5ce341a8b..b25b5ac04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" [workspace.metadata.cross.target.aarch64-unknown-linux-gnu] image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" -[workspace.metadata.cross.[target.armv7-unknown-linux-gnueabi] +[workspace.metadata.cross.target.armv7-unknown-linux-gnueabi] image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" [workspace.metadata.cross.target.armv7-unknown-linux-gnueabihf] From 4533d7e1354bf6306e106b21d1d856aba1dbad70 Mon Sep 17 00:00:00 2001 From: cndev0 Date: Wed, 29 Jan 2025 14:04:07 +0800 Subject: [PATCH 06/15] up --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e0b0667d..706642035 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ env: IMAGE_NAME: "clash-rs" RUST_LOG: "clash=TRACE" RUST_TOOLCHAIN: "nightly-2024-12-20" + CROSS_NO_WARNINGS: "0" # Arm builder https://github.blog/changelog/2024-09-03-github-actions-arm64-linux-and-windows-runners-are-now-generally-available/ jobs: From dc2a893f2f222f5b5e61214987908f8fb4f9163b Mon Sep 17 00:00:00 2001 From: cndev0 Date: Wed, 29 Jan 2025 14:20:38 +0800 Subject: [PATCH 07/15] rm warning --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 706642035..6e0b0667d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,6 @@ env: IMAGE_NAME: "clash-rs" RUST_LOG: "clash=TRACE" RUST_TOOLCHAIN: "nightly-2024-12-20" - CROSS_NO_WARNINGS: "0" # Arm builder https://github.blog/changelog/2024-09-03-github-actions-arm64-linux-and-windows-runners-are-now-generally-available/ jobs: From 72fa797900a3d58e7937a6ada5793504c8f2af68 Mon Sep 17 00:00:00 2001 From: cndev0 Date: Wed, 29 Jan 2025 19:37:07 +0800 Subject: [PATCH 08/15] pre intall cross --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b25b5ac04..1c3179965 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,8 @@ rustls = { git = "https://github.com/Watfaq/rustls.git", rev = "a7d217bf235aeb3c [workspace.metadata.cross.build] pre-build = [ "apt update", - "apt install -y protobuf-compiler" + "apt install -y protobuf-compiler", + "cargo install cross --git https://github.com/cross-rs/cross", ] [workspace.metadata.cross.build.env] From b801cd46c6093afa85e57db488941825d3c20016 Mon Sep 17 00:00:00 2001 From: cndev0 Date: Wed, 29 Jan 2025 19:45:55 +0800 Subject: [PATCH 09/15] f --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1c3179965..9ecf54253 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ rustls = { git = "https://github.com/Watfaq/rustls.git", rev = "a7d217bf235aeb3c [workspace.metadata.cross.build] pre-build = [ "apt update", - "apt install -y protobuf-compiler", + "apt install -y protobuf-compiler", "cargo install cross --git https://github.com/cross-rs/cross", ] From f68b1007beb7cb44e8a7140a8eb38b19da769533 Mon Sep 17 00:00:00 2001 From: dev0 Date: Sun, 9 Feb 2025 17:37:46 +1100 Subject: [PATCH 10/15] up --- Cargo.toml | 29 ----------------------------- Cross.toml | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 Cross.toml diff --git a/Cargo.toml b/Cargo.toml index 9ecf54253..9454e4546 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,32 +24,3 @@ debug = 1 [patch.crates-io] tokio-rustls = { git = "https://github.com/Watfaq/tokio-rustls.git", rev = "6b9af8ac7bb5abc159d9a67e9ddbf84127559a4a"} rustls = { git = "https://github.com/Watfaq/rustls.git", rev = "a7d217bf235aeb3ca8d123352d90a27c1ca0f41b"} - -[workspace.metadata.cross.build] -pre-build = [ - "apt update", - "apt install -y protobuf-compiler", - "cargo install cross --git https://github.com/cross-rs/cross", -] - -[workspace.metadata.cross.build.env] -volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker -passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG", "CLASH_DOCKER_TEST"] - -[workspace.metadata.cross.target.x86_64-unknown-linux-gnu] -image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" - -[workspace.metadata.cross.target.i686-unknown-linux-gnu] -image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" - -[workspace.metadata.cross.target.aarch64-unknown-linux-gnu] -image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" - -[workspace.metadata.cross.target.armv7-unknown-linux-gnueabi] -image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" - -[workspace.metadata.cross.target.armv7-unknown-linux-gnueabihf] -image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main" - -[workspace.metadata.cross.target.armv7-unknown-linux-musleabihf] -image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main" diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 000000000..dbd21aab9 --- /dev/null +++ b/Cross.toml @@ -0,0 +1,28 @@ +[build] +pre-build = [ + "apt update", + "apt install -y protobuf-compiler", + "cargo install cross --git https://github.com/cross-rs/cross", +] + +[build.env] +volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker +passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG", "CLASH_DOCKER_TEST"] + +[target.x86_64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" + +[target.i686-unknown-linux-gnu] +image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" + +[target.aarch64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" + +[target.armv7-unknown-linux-gnueabi] +image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" + +[target.armv7-unknown-linux-gnueabihf] +image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main" + +[target.armv7-unknown-linux-musleabihf] +image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main" From 140a8ec3e7e9f1079151db377fcff56a2aab729f Mon Sep 17 00:00:00 2001 From: dev0 Date: Sun, 9 Feb 2025 17:44:16 +1100 Subject: [PATCH 11/15] Revert "up" This reverts commit 810f48b33dbf803acaa60df5b894d40dc8f3dfea. --- Cargo.toml | 29 +++++++++++++++++++++++++++++ Cross.toml | 28 ---------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 Cross.toml diff --git a/Cargo.toml b/Cargo.toml index 9454e4546..9ecf54253 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,3 +24,32 @@ debug = 1 [patch.crates-io] tokio-rustls = { git = "https://github.com/Watfaq/tokio-rustls.git", rev = "6b9af8ac7bb5abc159d9a67e9ddbf84127559a4a"} rustls = { git = "https://github.com/Watfaq/rustls.git", rev = "a7d217bf235aeb3ca8d123352d90a27c1ca0f41b"} + +[workspace.metadata.cross.build] +pre-build = [ + "apt update", + "apt install -y protobuf-compiler", + "cargo install cross --git https://github.com/cross-rs/cross", +] + +[workspace.metadata.cross.build.env] +volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker +passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG", "CLASH_DOCKER_TEST"] + +[workspace.metadata.cross.target.x86_64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" + +[workspace.metadata.cross.target.i686-unknown-linux-gnu] +image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" + +[workspace.metadata.cross.target.aarch64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" + +[workspace.metadata.cross.target.armv7-unknown-linux-gnueabi] +image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" + +[workspace.metadata.cross.target.armv7-unknown-linux-gnueabihf] +image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main" + +[workspace.metadata.cross.target.armv7-unknown-linux-musleabihf] +image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main" diff --git a/Cross.toml b/Cross.toml deleted file mode 100644 index dbd21aab9..000000000 --- a/Cross.toml +++ /dev/null @@ -1,28 +0,0 @@ -[build] -pre-build = [ - "apt update", - "apt install -y protobuf-compiler", - "cargo install cross --git https://github.com/cross-rs/cross", -] - -[build.env] -volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker -passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG", "CLASH_DOCKER_TEST"] - -[target.x86_64-unknown-linux-gnu] -image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" - -[target.i686-unknown-linux-gnu] -image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" - -[target.aarch64-unknown-linux-gnu] -image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" - -[target.armv7-unknown-linux-gnueabi] -image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" - -[target.armv7-unknown-linux-gnueabihf] -image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main" - -[target.armv7-unknown-linux-musleabihf] -image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main" From f851410e4c2c40592371e11ebcb47634a0ae3e01 Mon Sep 17 00:00:00 2001 From: dev0 Date: Sun, 9 Feb 2025 17:57:34 +1100 Subject: [PATCH 12/15] Revert "Revert "up"" This reverts commit 256721f7ab290a4d01b63fbda1c7ebd8bbdea773. --- Cargo.toml | 29 ----------------------------- Cross.toml | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 Cross.toml diff --git a/Cargo.toml b/Cargo.toml index 9ecf54253..9454e4546 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,32 +24,3 @@ debug = 1 [patch.crates-io] tokio-rustls = { git = "https://github.com/Watfaq/tokio-rustls.git", rev = "6b9af8ac7bb5abc159d9a67e9ddbf84127559a4a"} rustls = { git = "https://github.com/Watfaq/rustls.git", rev = "a7d217bf235aeb3ca8d123352d90a27c1ca0f41b"} - -[workspace.metadata.cross.build] -pre-build = [ - "apt update", - "apt install -y protobuf-compiler", - "cargo install cross --git https://github.com/cross-rs/cross", -] - -[workspace.metadata.cross.build.env] -volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker -passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG", "CLASH_DOCKER_TEST"] - -[workspace.metadata.cross.target.x86_64-unknown-linux-gnu] -image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" - -[workspace.metadata.cross.target.i686-unknown-linux-gnu] -image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" - -[workspace.metadata.cross.target.aarch64-unknown-linux-gnu] -image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" - -[workspace.metadata.cross.target.armv7-unknown-linux-gnueabi] -image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" - -[workspace.metadata.cross.target.armv7-unknown-linux-gnueabihf] -image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main" - -[workspace.metadata.cross.target.armv7-unknown-linux-musleabihf] -image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main" diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 000000000..dbd21aab9 --- /dev/null +++ b/Cross.toml @@ -0,0 +1,28 @@ +[build] +pre-build = [ + "apt update", + "apt install -y protobuf-compiler", + "cargo install cross --git https://github.com/cross-rs/cross", +] + +[build.env] +volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker +passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG", "CLASH_DOCKER_TEST"] + +[target.x86_64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" + +[target.i686-unknown-linux-gnu] +image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" + +[target.aarch64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" + +[target.armv7-unknown-linux-gnueabi] +image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabi:main" + +[target.armv7-unknown-linux-gnueabihf] +image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main" + +[target.armv7-unknown-linux-musleabihf] +image = "ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main" From 3f02b1a3017f9ba6c0ad9d4c6cb0131aeda7b30c Mon Sep 17 00:00:00 2001 From: dev0 Date: Sun, 9 Feb 2025 17:57:53 +1100 Subject: [PATCH 13/15] up --- Cross.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cross.toml b/Cross.toml index dbd21aab9..9e6aea464 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,8 +1,7 @@ [build] pre-build = [ "apt update", - "apt install -y protobuf-compiler", - "cargo install cross --git https://github.com/cross-rs/cross", + "apt install -y protobuf-compiler" ] [build.env] From 4f4fffc8957e6abbd386a173af3e7a15c7a23536 Mon Sep 17 00:00:00 2001 From: dev0 Date: Mon, 10 Feb 2025 01:48:27 +1100 Subject: [PATCH 14/15] up --- Cargo.lock | 257 ++++++++++++++++++++++++++--------------------------- 1 file changed, 128 insertions(+), 129 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 163b71c8b..4180e32af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -317,7 +317,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", "synstructure", ] @@ -329,7 +329,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -353,7 +353,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -375,18 +375,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] name = "async-trait" -version = "0.1.86" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -556,7 +556,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -640,7 +640,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.98", + "syn 2.0.96", "which", ] @@ -661,7 +661,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -718,7 +718,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -856,9 +856,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "by_address" @@ -886,9 +886,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "c2rust-bitfields" @@ -943,9 +943,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.13" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "shlex", ] @@ -1099,7 +1099,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -1371,9 +1371,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.17" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1543,7 +1543,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -1591,7 +1591,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -1613,14 +1613,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] name = "data-encoding" -version = "2.8.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" +checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" [[package]] name = "defmt" @@ -1642,7 +1642,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -1662,7 +1662,7 @@ checksum = "297806318ef30ad066b15792a8372858020ae3ca2e414ee6c2133b1eb9e9e945" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -1724,7 +1724,7 @@ dependencies = [ "quote", "sha3", "strum", - "syn 2.0.98", + "syn 2.0.96", "void", ] @@ -1777,7 +1777,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", "unicode-xid", ] @@ -1889,7 +1889,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -1912,9 +1912,9 @@ checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf" [[package]] name = "dyn-clone" -version = "1.0.18" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "dynosaur" @@ -1934,7 +1934,7 @@ checksum = "16c187d1e575ef546d24f0fcd7701cc04abfe6b5e7e2758aabc450b99e835ac3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -2043,7 +2043,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -2056,7 +2056,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -2068,7 +2068,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -2346,7 +2346,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -2639,9 +2639,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hickory-client" -version = "0.25.0-alpha.5" +version = "0.25.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba7b17856dc1b69706dcf163cfcf2a768de2e4a15aa41ac2a4b99896c6e4968" +checksum = "83536dab9a159b2b5cf2c20c47ecf188cee35316f96be028e63e8e1340d2724d" dependencies = [ "cfg-if", "data-encoding", @@ -2650,7 +2650,7 @@ dependencies = [ "hickory-proto", "once_cell", "radix_trie", - "rand 0.9.0", + "rand 0.8.5", "thiserror 2.0.11", "tokio", "tracing", @@ -2658,9 +2658,9 @@ dependencies = [ [[package]] name = "hickory-proto" -version = "0.25.0-alpha.5" +version = "0.25.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d00147af6310f4392a31680db52a3ed45a2e0f68eb18e8c3fe5537ecc96d9e2" +checksum = "d063c0692ee669aa6d261988aa19ca5510f1cc40e4f211024f50c888499a35d7" dependencies = [ "async-recursion", "async-trait", @@ -2681,10 +2681,9 @@ dependencies = [ "once_cell", "pin-project-lite", "quinn", - "rand 0.9.0", + "rand 0.8.5", "ring 0.17.8", "rustls", - "rustls-pki-types", "serde", "thiserror 2.0.11", "time", @@ -2836,9 +2835,9 @@ checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" [[package]] name = "httparse" -version = "1.10.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2864,9 +2863,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.6.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", @@ -3100,7 +3099,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -3238,9 +3237,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.19" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb" +checksum = "3b31349d02fe60f80bbbab1a9402364cad7460626d6030494b08ac4a2075bf81" dependencies = [ "rustversion", ] @@ -3692,7 +3691,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -3904,7 +3903,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -3918,9 +3917,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot-fused-workaround" @@ -4067,9 +4066,9 @@ dependencies = [ [[package]] name = "p384" -version = "0.13.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ "ecdsa", "elliptic-curve", @@ -4218,7 +4217,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -4232,22 +4231,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.9" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.9" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -4436,7 +4435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" dependencies = [ "proc-macro2", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -4450,9 +4449,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.1.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090ded312ed32a928fb49cb91ab4db6523ae3767225e61fbf6ceaaec3664ed26" +checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" dependencies = [ "autocfg", "equivalent", @@ -4487,7 +4486,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -4525,7 +4524,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.98", + "syn 2.0.96", "tempfile", ] @@ -4539,7 +4538,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -4602,7 +4601,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.1", + "rustc-hash 2.1.0", "rustls", "socket2 0.5.8", "thiserror 2.0.11", @@ -4620,7 +4619,7 @@ dependencies = [ "getrandom 0.2.15", "rand 0.8.5", "ring 0.17.8", - "rustc-hash 2.1.1", + "rustc-hash 2.1.0", "rustls", "rustls-pki-types", "slab", @@ -4953,9 +4952,9 @@ dependencies = [ [[package]] name = "russh" -version = "0.50.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80312b5f2cd37e542093244b369c72b9dbf1ecf4880f8463ba0dbfc949f52fec" +checksum = "016fe9bba877904367d9f12c8599948ba2176d01783f78b20348fb138f2337a8" dependencies = [ "aes", "aes-gcm", @@ -5054,9 +5053,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc_version" @@ -5114,9 +5113,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.11.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" dependencies = [ "web-time", ] @@ -5140,9 +5139,9 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.19" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safelog" @@ -5186,9 +5185,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.3.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1" +checksum = "28e1c91382686d21b5ac7959341fcb9780fa7c03773646995a87c950fa7be640" dependencies = [ "sdd", ] @@ -5218,9 +5217,9 @@ dependencies = [ [[package]] name = "sdd" -version = "3.0.7" +version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07779b9b918cc05650cb30f404d4d7835d26df37c235eded8a6832e2fb82cca" +checksum = "478f121bb72bbf63c52c93011ea1791dca40140dfe13f8336c4c5ac952c33aa9" [[package]] name = "sec1" @@ -5302,7 +5301,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -5316,9 +5315,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" dependencies = [ "itoa", "memchr", @@ -5344,7 +5343,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -5395,7 +5394,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -5433,7 +5432,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -5770,7 +5769,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -5792,9 +5791,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.98" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -5815,7 +5814,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -5876,7 +5875,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -5887,7 +5886,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -6008,7 +6007,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -6091,9 +6090,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.20" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -6112,9 +6111,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.23" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.7.1", "serde", @@ -7179,7 +7178,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -7271,7 +7270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -7299,7 +7298,7 @@ checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -7436,9 +7435,9 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.16" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" +checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243" [[package]] name = "unicode-normalization" @@ -7543,25 +7542,25 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.13.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0" +checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" dependencies = [ - "getrandom 0.3.1", - "rand 0.9.0", + "getrandom 0.2.15", + "rand 0.8.5", "serde", "uuid-macro-internal", ] [[package]] name = "uuid-macro-internal" -version = "1.13.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d28dd23acb5f2fa7bd2155ab70b960e770596b3bb6395119b40476c3655dfba4" +checksum = "f8a86d88347b61a0e17b9908a67efcc594130830bf1045653784358dd023e294" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -7590,7 +7589,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -7670,7 +7669,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", "wasm-bindgen-shared", ] @@ -7705,7 +7704,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7768,9 +7767,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.8" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -7906,7 +7905,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -7917,7 +7916,7 @@ checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -7928,7 +7927,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -7939,7 +7938,7 @@ checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -8193,9 +8192,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.1" +version = "0.6.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f" +checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" dependencies = [ "memchr", ] @@ -8295,7 +8294,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", "synstructure", ] @@ -8326,7 +8325,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -8337,7 +8336,7 @@ checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -8357,7 +8356,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", "synstructure", ] @@ -8378,7 +8377,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] [[package]] @@ -8400,5 +8399,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.96", ] From 2d89047c598f92693170b9d24361e31666d9a928 Mon Sep 17 00:00:00 2001 From: dev0 Date: Mon, 10 Feb 2025 01:50:47 +1100 Subject: [PATCH 15/15] up --- Cargo.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4180e32af..f9fc05716 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -380,9 +380,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.85" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", @@ -886,9 +886,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "c2rust-bitfields" @@ -2835,9 +2835,9 @@ checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "httpdate" @@ -2863,9 +2863,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", @@ -3428,7 +3428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3917,9 +3917,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "oneshot-fused-workaround" @@ -4952,9 +4952,9 @@ dependencies = [ [[package]] name = "russh" -version = "0.50.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016fe9bba877904367d9f12c8599948ba2176d01783f78b20348fb138f2337a8" +checksum = "80312b5f2cd37e542093244b369c72b9dbf1ecf4880f8463ba0dbfc949f52fec" dependencies = [ "aes", "aes-gcm", @@ -5315,9 +5315,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -7542,21 +7542,21 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.12.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" +checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0" dependencies = [ - "getrandom 0.2.15", - "rand 0.8.5", + "getrandom 0.3.1", + "rand 0.9.0", "serde", "uuid-macro-internal", ] [[package]] name = "uuid-macro-internal" -version = "1.12.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a86d88347b61a0e17b9908a67efcc594130830bf1045653784358dd023e294" +checksum = "d28dd23acb5f2fa7bd2155ab70b960e770596b3bb6395119b40476c3655dfba4" dependencies = [ "proc-macro2", "quote", @@ -7767,9 +7767,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.7" +version = "0.26.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" dependencies = [ "rustls-pki-types", ]