diff options
26 files changed, 241 insertions, 196 deletions
diff --git a/Cargo.lock b/Cargo.lock index 5fc912619..015c1f46d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -212,7 +212,7 @@ dependencies = [ "async-signal", "cfg-if", "clap", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more", "fs-mistrust", @@ -276,7 +276,7 @@ dependencies = [ "float-ord", "fs-mistrust", "futures", - "rand 0.9.1", + "rand 0.9.2", "serde", "serde_json", "tokio", @@ -294,7 +294,7 @@ dependencies = [ "anyhow", "async-trait", "cfg-if", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more", "dyn-clone", @@ -307,7 +307,7 @@ dependencies = [ "libc", "once_cell", "postage", - "rand 0.9.1", + "rand 0.9.2", "safelog", "serde", "serde_json", @@ -364,7 +364,7 @@ dependencies = [ "derive_more", "directories", "fs-mistrust", - "rand 0.9.1", + "rand 0.9.2", "safelog", "serde", "strum", @@ -396,7 +396,7 @@ dependencies = [ "fs-mistrust", "paste", "percent-encoding", - "rand 0.9.1", + "rand 0.9.2", "rand_chacha 0.9.0", "serde", "serde_json", @@ -419,14 +419,14 @@ dependencies = [ "asynchronous-codec", "base64ct", "bytes", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "erased-serde", "futures", "futures-await-test", "oneshot-fused-workaround", "pin-project", - "rand 0.9.1", + "rand 0.9.2", "serde", "serde_json", "slotmap-careful", @@ -459,7 +459,7 @@ dependencies = [ "clap", "futures", "pin-project", - "rand 0.9.1", + "rand 0.9.2", "tokio", "tor-basic-utils", "tor-config", @@ -566,7 +566,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -597,9 +597,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.25" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40f6024f3f856663b45fd0c9b6f2024034a702f453549449e0d84a305900dad4" +checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8" dependencies = [ "flate2", "futures-core", @@ -651,9 +651,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3" +checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca" dependencies = [ "async-lock", "cfg-if", @@ -664,17 +664,16 @@ dependencies = [ "polling", "rustix", "slab", - "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "async-lock" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "event-listener-strategy", "pin-project-lite", ] @@ -693,9 +692,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde3f4e40e6021d7acffc90095cbd6dc54cb593903d1de5832f435eb274b85dc" +checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00" dependencies = [ "async-channel 2.5.0", "async-io", @@ -704,17 +703,16 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.4.0", + "event-listener 5.4.1", "futures-lite", "rustix", - "tracing", ] [[package]] name = "async-signal" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7605a4e50d4b06df3898d5a70bf5fde51ed9059b0434b73105193bc27acce0d" +checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1" dependencies = [ "async-io", "async-lock", @@ -725,7 +723,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -1089,9 +1087,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.29" +version = "1.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362" +checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2" dependencies = [ "jobserver", "libc", @@ -1169,9 +1167,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.40" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" +checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882" dependencies = [ "clap_builder", "clap_derive", @@ -1179,9 +1177,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.40" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" +checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966" dependencies = [ "anstream", "anstyle", @@ -1192,9 +1190,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.40" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" +checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" dependencies = [ "heck", "proc-macro2", @@ -1329,9 +1327,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -1628,11 +1626,11 @@ dependencies = [ [[package]] name = "derive-deftly" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55a256deae70e0772adfd583c57c1403c6ddbd1d1f1f84f64e94acaecc25eeb" +checksum = "957bb73a3a9c0bbcac67e129b81954661b3cfcb9e28873d8441f91b54852e77a" dependencies = [ - "derive-deftly-macros 1.1.0", + "derive-deftly-macros 1.2.0", "heck", ] @@ -1656,9 +1654,9 @@ dependencies = [ [[package]] name = "derive-deftly-macros" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47cf90c375e516cf601a57727744bdf7a547680a470a2e8a6580a12288cf0630" +checksum = "9ea41269bd490d251b9eca50ccb43117e641cc68b129849757c15ece88fe0574" dependencies = [ "heck", "indexmap 2.10.0", @@ -1863,9 +1861,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "dynasm" @@ -1920,9 +1918,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ "curve25519-dalek", "ed25519", @@ -2042,9 +2040,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.4.0" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" dependencies = [ "concurrent-queue", "parking", @@ -2057,7 +2055,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "pin-project-lite", ] @@ -2147,7 +2145,7 @@ dependencies = [ "anyhow", "itertools 0.14.0", "pico-args", - "toml_edit", + "toml_edit 0.22.27", ] [[package]] @@ -2346,9 +2344,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" dependencies = [ "fastrand", "futures-core", @@ -2607,7 +2605,7 @@ dependencies = [ "idna", "ipnet", "once_cell", - "rand 0.9.1", + "rand 0.9.2", "ring", "thiserror 2.0.12", "tinyvec", @@ -2757,9 +2755,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" +checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" dependencies = [ "bytes", "futures-channel", @@ -2991,9 +2989,9 @@ checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983" [[package]] name = "io-uring" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" dependencies = [ "bitflags 2.9.1", "cfg-if", @@ -3114,7 +3112,7 @@ version = "0.1.0" dependencies = [ "base32", "clap", - "rand 0.9.1", + "rand 0.9.2", "rand_core 0.9.3", "ssh-key", "tor-basic-utils", @@ -3194,9 +3192,9 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" -version = "0.1.4" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638" +checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" dependencies = [ "bitflags 2.9.1", "libc", @@ -3205,9 +3203,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91632f3b4fb6bd1d72aa3d78f41ffecfcf2b1a6648d8c241dbe7dbfaf4875e15" +checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" dependencies = [ "cc", "pkg-config", @@ -3278,9 +3276,9 @@ checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "memmap2" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28" dependencies = [ "libc", ] @@ -3338,7 +3336,7 @@ dependencies = [ "hashbrown 0.15.4", "metrics", "quanta", - "rand 0.9.1", + "rand 0.9.2", "rand_xoshiro", "sketches-ddsketch", ] @@ -3440,9 +3438,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "notify" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163f59cd3fa0e9ef8c32f242966a7b9994fd7378366099593e0e73077cd8c97" +checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ "bitflags 2.9.1", "inotify", @@ -4005,17 +4003,16 @@ dependencies = [ [[package]] name = "polling" -version = "3.8.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50" +checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", "rustix", - "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -4128,7 +4125,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ - "toml_edit", + "toml_edit 0.22.27", ] [[package]] @@ -4241,9 +4238,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", @@ -4319,9 +4316,9 @@ dependencies = [ [[package]] name = "rangemap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" [[package]] name = "raw-cpuid" @@ -4369,18 +4366,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" dependencies = [ "bitflags 2.9.1", ] [[package]] name = "redox_users" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.16", "libredox", @@ -4538,9 +4535,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de23c3319433716cf134eed225fe9986bc24f63bed9be9f20c329029e672dc7" +checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" dependencies = [ "bitflags 2.9.1", "fallible-iterator", @@ -4553,9 +4550,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustc_version" @@ -4577,15 +4574,15 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" dependencies = [ "bitflags 2.9.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -4600,9 +4597,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.28" +version = "0.23.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643" +checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" dependencies = [ "log", "once_cell", @@ -4672,9 +4669,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" dependencies = [ "ring", "rustls-pki-types", @@ -4784,9 +4781,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sdd" -version = "3.0.8" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21" +checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" [[package]] name = "sec1" @@ -4909,9 +4906,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" dependencies = [ "itoa", "memchr", @@ -4939,6 +4936,15 @@ dependencies = [ ] [[package]] +name = "serde_spanned" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" +dependencies = [ + "serde", +] + +[[package]] name = "serde_test" version = "1.0.177" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5086,9 +5092,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.5" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" dependencies = [ "libc", ] @@ -5201,12 +5207,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.10" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5320,23 +5326,22 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck", "proc-macro2", "quote", - "rustversion", "syn 2.0.104", ] @@ -5570,9 +5575,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.46.1" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", "bytes", @@ -5585,7 +5590,7 @@ dependencies = [ "slab", "socket2", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5634,9 +5639,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", @@ -5653,9 +5658,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", + "toml_edit 0.22.27", ] [[package]] @@ -5668,6 +5673,15 @@ dependencies = [ ] [[package]] +name = "toml_datetime" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" +dependencies = [ + "serde", +] + +[[package]] name = "toml_edit" version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5675,23 +5689,53 @@ checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ "indexmap 2.10.0", "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", "toml_write", "winnow", ] [[package]] +name = "toml_edit" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1dee9dc43ac2aaf7d3b774e2fba5148212bf2bd9374f4e50152ebe9afd03d42" +dependencies = [ + "indexmap 2.10.0", + "serde", + "serde_spanned 1.0.0", + "toml_datetime 0.7.0", + "toml_parser", + "toml_writer", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30" +dependencies = [ + "winnow", +] + +[[package]] name = "toml_write" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] +name = "toml_writer" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" + +[[package]] name = "tor-async-utils" version = "0.32.0" dependencies = [ - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "educe", "futures", "futures-await-test", @@ -5716,7 +5760,7 @@ dependencies = [ "itertools 0.14.0", "libc", "paste", - "rand 0.9.1", + "rand 0.9.2", "rand_chacha 0.9.0", "serde", "serde-value", @@ -5731,7 +5775,7 @@ name = "tor-bytes" version = "0.32.0" dependencies = [ "bytes", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "digest", "educe", "getrandom 0.3.3", @@ -5751,13 +5795,13 @@ dependencies = [ "bitflags 2.9.1", "bytes", "caret", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "educe", "hex", "hex-literal", "paste", - "rand 0.9.1", + "rand 0.9.2", "smallvec", "thiserror 2.0.12", "tor-basic-utils", @@ -5784,7 +5828,7 @@ dependencies = [ "digest", "hex-literal", "humantime", - "rand 0.9.1", + "rand 0.9.2", "thiserror 2.0.12", "tor-bytes", "tor-checkable", @@ -5807,7 +5851,7 @@ dependencies = [ "itertools 0.14.0", "oneshot-fused-workaround", "postage", - "rand 0.9.1", + "rand 0.9.2", "safelog", "serde", "thiserror 2.0.12", @@ -5860,7 +5904,7 @@ dependencies = [ "once_cell", "oneshot-fused-workaround", "pin-project", - "rand 0.9.1", + "rand 0.9.2", "retry-error", "safelog", "serde", @@ -5897,7 +5941,7 @@ version = "0.32.0" dependencies = [ "amplify", "cfg-if", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "educe", "either", @@ -5994,7 +6038,7 @@ dependencies = [ "derive_more", "digest", "educe", - "event-listener 5.4.0", + "event-listener 5.4.1", "filetime", "float_eq", "fs-mistrust", @@ -6009,7 +6053,7 @@ dependencies = [ "oneshot-fused-workaround", "paste", "postage", - "rand 0.9.1", + "rand 0.9.2", "rusqlite", "safelog", "scopeguard", @@ -6099,7 +6143,7 @@ version = "0.32.0" dependencies = [ "amplify", "base64ct", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more", "dyn-clone", @@ -6114,7 +6158,7 @@ dependencies = [ "oneshot-fused-workaround", "pin-project", "postage", - "rand 0.9.1", + "rand 0.9.2", "safelog", "serde", "serde_json", @@ -6145,7 +6189,7 @@ name = "tor-hsclient" version = "0.32.0" dependencies = [ "async-trait", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "educe", "either", @@ -6154,7 +6198,7 @@ dependencies = [ "itertools 0.14.0", "oneshot-fused-workaround", "postage", - "rand 0.9.1", + "rand 0.9.2", "retry-error", "safelog", "slotmap-careful", @@ -6196,7 +6240,7 @@ dependencies = [ "blake2", "cipher", "data-encoding", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "digest", "equix", @@ -6205,7 +6249,7 @@ dependencies = [ "humantime", "itertools 0.14.0", "paste", - "rand 0.9.1", + "rand 0.9.2", "safelog", "serde", "signature", @@ -6226,7 +6270,7 @@ dependencies = [ name = "tor-hsrproxy" version = "0.32.0" dependencies = [ - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "futures", "itertools 0.14.0", @@ -6261,7 +6305,7 @@ dependencies = [ "async-trait", "base64ct", "cfg-if", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more", "digest", @@ -6278,7 +6322,7 @@ dependencies = [ "once_cell", "oneshot-fused-workaround", "postage", - "rand 0.9.1", + "rand 0.9.2", "rand_core 0.9.3", "retry-error", "rmp-serde", @@ -6325,11 +6369,11 @@ dependencies = [ name = "tor-key-forge" version = "0.32.0" dependencies = [ - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "downcast-rs", "paste", - "rand 0.9.1", + "rand 0.9.2", "signature", "ssh-key", "thiserror 2.0.12", @@ -6349,7 +6393,7 @@ dependencies = [ "arrayvec", "cfg-if", "data-encoding", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more", "downcast-rs", @@ -6360,7 +6404,7 @@ dependencies = [ "inventory", "itertools 0.14.0", "paste", - "rand 0.9.1", + "rand 0.9.2", "safelog", "serde", "serde_json", @@ -6392,7 +6436,7 @@ dependencies = [ "base64ct", "by_address", "caret", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more", "hex", @@ -6422,7 +6466,7 @@ dependencies = [ "ctr", "curve25519-dalek", "der-parser", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "digest", "ed25519-dalek", @@ -6431,7 +6475,7 @@ dependencies = [ "hex", "hex-literal", "openssl", - "rand 0.9.1", + "rand 0.9.2", "rand_chacha 0.9.0", "rand_core 0.6.4", "rand_core 0.9.3", @@ -6473,7 +6517,7 @@ name = "tor-memquota" version = "0.32.0" dependencies = [ "cfg-if", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "dyn-clone", "educe", @@ -6481,7 +6525,7 @@ dependencies = [ "itertools 0.14.0", "paste", "pin-project", - "rand 0.9.1", + "rand 0.9.2", "safelog", "serde", "serde_json", @@ -6518,7 +6562,7 @@ dependencies = [ "itertools 0.14.0", "num_enum", "postage", - "rand 0.9.1", + "rand 0.9.2", "serde", "static_assertions", "strum", @@ -6557,7 +6601,7 @@ dependencies = [ "itertools 0.14.0", "memchr", "phf", - "rand 0.9.1", + "rand 0.9.2", "serde", "serde_json", "serde_with", @@ -6591,7 +6635,7 @@ version = "0.32.0" dependencies = [ "amplify", "anyhow", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "filetime", "fs-mistrust", @@ -6633,7 +6677,7 @@ dependencies = [ "criterion", "criterion-cycles-per-byte", "ctr", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more", "digest", @@ -6650,7 +6694,7 @@ dependencies = [ "pin-project", "polyval", "postage", - "rand 0.9.1", + "rand 0.9.2", "rand_core 0.9.3", "regex", "safelog", @@ -6732,7 +6776,7 @@ dependencies = [ name = "tor-relay-crypto" version = "0.32.0" dependencies = [ - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "humantime", "tor-cert", @@ -6748,7 +6792,7 @@ dependencies = [ name = "tor-relay-selection" version = "0.32.0" dependencies = [ - "rand 0.9.1", + "rand 0.9.2", "serde", "tor-basic-utils", "tor-geoip", @@ -6769,7 +6813,7 @@ dependencies = [ "fs-mistrust", "fslock-guard", "hex-literal", - "rand 0.9.1", + "rand 0.9.2", "safelog", "serde", "serde_with", @@ -6791,7 +6835,7 @@ name = "tor-rpcbase" version = "0.32.0" dependencies = [ "assert-impl", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "downcast-rs", "erased-serde", @@ -6850,7 +6894,7 @@ dependencies = [ "amplify", "assert_matches", "async-trait", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "educe", "futures", @@ -6860,7 +6904,7 @@ dependencies = [ "oneshot-fused-workaround", "pin-project", "priority-queue", - "rand 0.9.1", + "rand 0.9.2", "slotmap-careful", "strum", "thiserror 2.0.12", @@ -6881,7 +6925,7 @@ dependencies = [ "anyhow", "arbitrary", "caret", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "educe", "hex-literal", "safelog", @@ -6895,7 +6939,7 @@ dependencies = [ name = "tor-units" version = "0.32.0" dependencies = [ - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more", "float-cmp", "serde", @@ -7045,9 +7089,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trycmd" -version = "0.15.9" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b5cf29388862aac065d6597ac9c8e842d1cc827cb50f7c32f11d29442eaae4" +checksum = "659488a954e37cc663704c169f829952c49b315e2fe5fd375508baffa698f106" dependencies = [ "anstream", "automod", @@ -7058,7 +7102,7 @@ dependencies = [ "serde", "shlex", "snapbox", - "toml_edit", + "toml_edit 0.23.2", ] [[package]] @@ -7433,14 +7477,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" dependencies = [ - "webpki-root-certs 1.0.1", + "webpki-root-certs 1.0.2", ] [[package]] name = "webpki-root-certs" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86138b15b2b7d561bc4469e77027b8dd005a43dc502e9031d1f5afc8ce1f280e" +checksum = "4e4ffd8df1c57e87c325000a3d6ef93db75279dc3a231125aac571650f22b12a" dependencies = [ "rustls-pki-types", ] @@ -7451,14 +7495,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.1", + "webpki-roots 1.0.2", ] [[package]] name = "webpki-roots" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8782dd5a41a24eed3a4f40b606249b3e236ca61adf1f25ea4d45c73de122b502" +checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" dependencies = [ "rustls-pki-types", ] @@ -7639,7 +7683,7 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.2", + "windows-targets 0.53.3", ] [[package]] @@ -7675,10 +7719,11 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.2" +version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" dependencies = [ + "windows-link", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -7838,9 +7883,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" dependencies = [ "memchr", ] diff --git a/crates/arti-client/Cargo.toml b/crates/arti-client/Cargo.toml index f0359fafe..a22e5267f 100644 --- a/crates/arti-client/Cargo.toml +++ b/crates/arti-client/Cargo.toml @@ -158,7 +158,7 @@ __is_experimental = [] anyhow = { version = "1.0.23", optional = true } async-trait = "0.1.54" cfg-if = "1.0.0" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } dyn-clone = { version = "1.0.11", optional = true } diff --git a/crates/arti-rpcserver/Cargo.toml b/crates/arti-rpcserver/Cargo.toml index e99c02d23..ea72834d9 100644 --- a/crates/arti-rpcserver/Cargo.toml +++ b/crates/arti-rpcserver/Cargo.toml @@ -39,7 +39,7 @@ async-trait = "0.1.54" asynchronous-codec = { version = "0.7.0", features = ["json"] } base64ct = "1.5.1" bytes = "1" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } erased-serde = "0.4.2" futures = "0.3.14" diff --git a/crates/arti/Cargo.toml b/crates/arti/Cargo.toml index 6cb616122..8e275b6cd 100644 --- a/crates/arti/Cargo.toml +++ b/crates/arti/Cargo.toml @@ -154,7 +154,7 @@ async-ctrlc = { version = "1.2.0", optional = true } async-signal = { version = "0.2.10", optional = true } cfg-if = "1.0.0" clap = { version = "4.3.24", features = ["string", "wrap_help", "derive"] } -derive-deftly = { version = "~1.1.0", features = ["full", "beta"], optional = true } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"], optional = true } derive_builder = { version = "0.11", package = "derive_builder_fork_arti" } fs-mistrust = { path = "../fs-mistrust", version = "0.10.0" } futures = "0.3.14" diff --git a/crates/tor-async-utils/Cargo.toml b/crates/tor-async-utils/Cargo.toml index be3618465..411cbbfa3 100644 --- a/crates/tor-async-utils/Cargo.toml +++ b/crates/tor-async-utils/Cargo.toml @@ -13,7 +13,7 @@ categories = ["rust-patterns"] repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [dependencies] -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } educe = "0.4.22" futures = "0.3.14" oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.2.3" } diff --git a/crates/tor-bytes/Cargo.toml b/crates/tor-bytes/Cargo.toml index 41cba0a95..1a11e6537 100644 --- a/crates/tor-bytes/Cargo.toml +++ b/crates/tor-bytes/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [dependencies] bytes = "1" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } digest = { version = "0.10.0", features = ["subtle", "mac"] } educe = "0.4.22" safelog = { path = "../safelog", version = "0.4.7" } diff --git a/crates/tor-cell/Cargo.toml b/crates/tor-cell/Cargo.toml index fec543181..18667df62 100644 --- a/crates/tor-cell/Cargo.toml +++ b/crates/tor-cell/Cargo.toml @@ -54,7 +54,7 @@ amplify = { version = "4", default-features = false, features = ["derive"] } bitflags = "2" bytes = "1" caret = { path = "../caret", version = "0.5.3" } -derive-deftly = "1.1.0" +derive-deftly = "1.2.0" derive_more = { version = "2.0.1", features = ["full"] } educe = "0.4.22" paste = "1" diff --git a/crates/tor-config/Cargo.toml b/crates/tor-config/Cargo.toml index a13c1a40e..9fee72f9d 100644 --- a/crates/tor-config/Cargo.toml +++ b/crates/tor-config/Cargo.toml @@ -37,7 +37,7 @@ __is_experimental = [] [dependencies] amplify = { version = "4", default-features = false, features = ["derive"] } cfg-if = "1.0.0" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } educe = "0.4.22" either = "1" diff --git a/crates/tor-dirmgr/Cargo.toml b/crates/tor-dirmgr/Cargo.toml index 0fc6bc875..f17a395d1 100644 --- a/crates/tor-dirmgr/Cargo.toml +++ b/crates/tor-dirmgr/Cargo.toml @@ -78,7 +78,7 @@ oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0. paste = "1" postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] } rand = "0.9.1" -rusqlite = { version = "0.36.0", features = ["time"] } +rusqlite = { version = "0.37.0", features = ["time"] } safelog = { path = "../safelog", version = "0.4.7" } scopeguard = "1" serde = { version = "1.0.103", features = ["derive"] } diff --git a/crates/tor-guardmgr/Cargo.toml b/crates/tor-guardmgr/Cargo.toml index 85fc876f0..ecb1e5d71 100644 --- a/crates/tor-guardmgr/Cargo.toml +++ b/crates/tor-guardmgr/Cargo.toml @@ -60,7 +60,7 @@ __is_experimental = [] [dependencies] amplify = { version = "4", default-features = false, features = ["derive"] } base64ct = "1.5.1" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_builder = { version = "0.11", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } dyn-clone = "1.0.4" diff --git a/crates/tor-hsclient/Cargo.toml b/crates/tor-hsclient/Cargo.toml index 63a31dccf..6f31aacb3 100644 --- a/crates/tor-hsclient/Cargo.toml +++ b/crates/tor-hsclient/Cargo.toml @@ -55,7 +55,7 @@ experimental = ["keymgr", "hs-pow-full"] [dependencies] async-trait = "0.1.54" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } educe = "0.4.22" either = "1" diff --git a/crates/tor-hscrypto/Cargo.toml b/crates/tor-hscrypto/Cargo.toml index 7bdcbc7aa..e06d60452 100644 --- a/crates/tor-hscrypto/Cargo.toml +++ b/crates/tor-hscrypto/Cargo.toml @@ -46,7 +46,7 @@ arrayvec = { version = "0.7.4", optional = true } blake2 = { version = "0.10.6", optional = true } cipher = { version = "0.4.1", features = ["zeroize"], optional = true } data-encoding = "2.3.1" # want MSVC i686 build fix, data-encoding/issues/33 -derive-deftly = { version = "1.1.0", optional = true } +derive-deftly = { version = "1.2.0", optional = true } derive_more = { version = "2.0.1", features = ["full"] } digest = "0.10.0" equix = { path = "../equix", version = "0.2.5", optional = true } diff --git a/crates/tor-hsrproxy/Cargo.toml b/crates/tor-hsrproxy/Cargo.toml index 1974b3c01..784076db5 100644 --- a/crates/tor-hsrproxy/Cargo.toml +++ b/crates/tor-hsrproxy/Cargo.toml @@ -43,7 +43,7 @@ __is_experimental = [] restricted-discovery = ["tor-hsservice/restricted-discovery", "__is_experimental"] [dependencies] -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } futures = "0.3.14" # postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] } diff --git a/crates/tor-hsservice/Cargo.toml b/crates/tor-hsservice/Cargo.toml index 9e783cf34..5d77ebc10 100644 --- a/crates/tor-hsservice/Cargo.toml +++ b/crates/tor-hsservice/Cargo.toml @@ -75,7 +75,7 @@ arrayvec = { version = "0.7.4", features = ["serde"], optional = true } async-trait = "0.1.54" base64ct = "1.5.1" cfg-if = "1.0.0" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } digest = "0.10.0" diff --git a/crates/tor-key-forge/Cargo.toml b/crates/tor-key-forge/Cargo.toml index e654f03c9..a0c1dd323 100644 --- a/crates/tor-key-forge/Cargo.toml +++ b/crates/tor-key-forge/Cargo.toml @@ -25,7 +25,7 @@ __is_nonadditive = [] __is_experimental = [] [dependencies] -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } downcast-rs = "2.0.1" paste = "1" diff --git a/crates/tor-keymgr/Cargo.toml b/crates/tor-keymgr/Cargo.toml index 876a2ee56..7211a88d5 100644 --- a/crates/tor-keymgr/Cargo.toml +++ b/crates/tor-keymgr/Cargo.toml @@ -55,7 +55,7 @@ amplify = { version = "4", default-features = false, features = ["derive"] } arrayvec = "0.7.3" cfg-if = "1.0.0" data-encoding = { version = "2.3.1", optional = true } -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } downcast-rs = "2.0.1" diff --git a/crates/tor-linkspec/Cargo.toml b/crates/tor-linkspec/Cargo.toml index 450a3ccbb..25952f5e8 100644 --- a/crates/tor-linkspec/Cargo.toml +++ b/crates/tor-linkspec/Cargo.toml @@ -34,7 +34,7 @@ __is_experimental = [] base64ct = "1.5.1" by_address = "1" caret = { path = "../caret", version = "0.5.3" } -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } hex = "0.4" diff --git a/crates/tor-llcrypto/Cargo.toml b/crates/tor-llcrypto/Cargo.toml index 995db9f9f..feeb11290 100644 --- a/crates/tor-llcrypto/Cargo.toml +++ b/crates/tor-llcrypto/Cargo.toml @@ -47,7 +47,7 @@ cipher = { version = "0.4.3", optional = true, features = ["zeroize"] } ctr = { version = "0.9", features = ["zeroize"] } curve25519-dalek = "4.1" der-parser = { version = "10", features = ["serialize"] } -derive-deftly = { version = "1.1.0", optional = true } +derive-deftly = { version = "1.2.0", optional = true } derive_more = { version = "2.0.1", features = ["full"] } digest = "0.10.0" ed25519-dalek = { version = "2.1", features = ["batch", "hazmat"] } diff --git a/crates/tor-memquota/Cargo.toml b/crates/tor-memquota/Cargo.toml index 43bc4e826..232d3affe 100644 --- a/crates/tor-memquota/Cargo.toml +++ b/crates/tor-memquota/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [dependencies] cfg-if = "1.0.0" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } dyn-clone = "1.0.17" educe = "0.4.22" diff --git a/crates/tor-persist/Cargo.toml b/crates/tor-persist/Cargo.toml index 2a38da292..cca5788d9 100644 --- a/crates/tor-persist/Cargo.toml +++ b/crates/tor-persist/Cargo.toml @@ -32,7 +32,7 @@ __is_experimental = [] [dependencies] amplify = { version = "4", default-features = false, features = ["derive"], optional = true } -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } filetime = { version = "0.2", default-features = false } fs-mistrust = { path = "../fs-mistrust", version = "0.10.0", features = ["walkdir"] } @@ -54,7 +54,7 @@ void = "1" [dev-dependencies] anyhow = { version = "1.0.23" } -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } humantime = "2" itertools = "0.14.0" tempfile = "3" diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml index 424b78a60..0247af2eb 100644 --- a/crates/tor-proto/Cargo.toml +++ b/crates/tor-proto/Cargo.toml @@ -83,7 +83,7 @@ cfg-if = "1.0.0" cipher = { version = "0.4.1", features = ["zeroize"] } coarsetime = "0.1.20" ctr = { version = "0.9", optional = true, features = ["zeroize"] } -derive-deftly = "1.1.0" +derive-deftly = "1.2.0" derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } digest = "0.10.0" diff --git a/crates/tor-relay-crypto/Cargo.toml b/crates/tor-relay-crypto/Cargo.toml index 44073bdec..8b324118a 100644 --- a/crates/tor-relay-crypto/Cargo.toml +++ b/crates/tor-relay-crypto/Cargo.toml @@ -24,7 +24,7 @@ full = [ ] [dependencies] -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } humantime = "2" tor-cert = { path = "../tor-cert", version = "0.32.0", features = ["encode"] } diff --git a/crates/tor-rpcbase/Cargo.toml b/crates/tor-rpcbase/Cargo.toml index 6875c513e..b5249a83c 100644 --- a/crates/tor-rpcbase/Cargo.toml +++ b/crates/tor-rpcbase/Cargo.toml @@ -12,7 +12,7 @@ categories = ["asynchronous"] repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [dependencies] -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } downcast-rs = "2.0.1" erased-serde = "0.4.2" diff --git a/crates/tor-rtmock/Cargo.toml b/crates/tor-rtmock/Cargo.toml index f1fca790c..df84b4c05 100644 --- a/crates/tor-rtmock/Cargo.toml +++ b/crates/tor-rtmock/Cargo.toml @@ -15,7 +15,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/" amplify = { version = "4", default-features = false, features = ["derive"] } assert_matches = "1.5.0" async-trait = "0.1.54" -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } educe = "0.4.22" futures = "0.3.14" diff --git a/crates/tor-socksproto/Cargo.toml b/crates/tor-socksproto/Cargo.toml index 2e19515d8..2ace08c17 100644 --- a/crates/tor-socksproto/Cargo.toml +++ b/crates/tor-socksproto/Cargo.toml @@ -30,7 +30,7 @@ full = [ amplify = { version = "4", default-features = false, features = ["derive"] } arbitrary = { version = "1.0.1", optional = true, features = ["derive"] } caret = { path = "../caret", version = "0.5.3" } -derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.2.0", features = ["full", "beta"] } educe = "0.4.22" safelog = { path = "../safelog", version = "0.4.7" } subtle = "2" diff --git a/crates/tor-units/Cargo.toml b/crates/tor-units/Cargo.toml index d0871a8b1..158dae5d1 100644 --- a/crates/tor-units/Cargo.toml +++ b/crates/tor-units/Cargo.toml @@ -13,7 +13,7 @@ categories = ["rust-patterns"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -derive-deftly = { version = "1.1.0", optional = true } +derive-deftly = { version = "1.2.0", optional = true } derive_more = { version = "2.0.1", features = ["full"] } serde = { version = "1.0.103", features = ["derive"] } thiserror = "2" |