From 16810961f03981318e48a014808b5ead00688d3f Mon Sep 17 00:00:00 2001 From: Robin Hundt <24554122+robinhundt@users.noreply.github.com> Date: Mon, 25 Mar 2024 17:03:35 +0100 Subject: [PATCH 1/3] Update dependencies --- Cargo.lock | 545 ++++++++++++------ Cargo.toml | 2 +- crates/bitpolymul-sys/Cargo.toml | 2 +- crates/seec-bitmatrix/Cargo.toml | 8 +- crates/seec-channel-macros/Cargo.toml | 4 +- crates/seec-channel/Cargo.toml | 26 +- crates/seec-macros/Cargo.toml | 4 +- crates/seec/Cargo.toml | 34 +- .../seec/src/circuit/circuit_connections.rs | 1 - crates/seec/src/circuit/static_layers.rs | 2 - crates/zappot/Cargo.toml | 57 +- crates/zappot/src/util/aes_rng.rs | 1 - crates/zappot/src/util/tokio_rayon.rs | 2 +- 13 files changed, 424 insertions(+), 264 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fff20e6..8a01875 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -71,9 +71,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -119,9 +119,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "arrayref" @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", @@ -174,11 +174,37 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "aws-lc-rs" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df33e4a55b03f8780ba55041bc7be91a2a8ec8c03517b0379d2d6c96d2c30d95" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ede3d6e360a48436fee127cb81710834407b1ec0c48a001cc29dec9005f73e" +dependencies = [ + "bindgen", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -195,6 +221,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "bincode" version = "1.3.3" @@ -204,6 +236,29 @@ dependencies = [ "serde", ] +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -227,9 +282,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitpolymul" @@ -271,9 +326,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -302,24 +357,24 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", @@ -334,9 +389,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cast" @@ -355,11 +410,17 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "libc", + "nom", ] [[package]] @@ -405,11 +466,22 @@ dependencies = [ "inout", ] +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" -version = "4.4.18" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", @@ -417,9 +489,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -429,9 +501,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ "heck", "proc-macro2", @@ -441,9 +513,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmake" @@ -541,9 +613,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -600,9 +672,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -642,9 +714,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" +checksum = "ff4dc7287237dd438b926a81a1a5605dad33d286870e5eee2db17bf2bcd9e92a" dependencies = [ "cc", "cxxbridge-flags", @@ -654,9 +726,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" +checksum = "f47c6c8ad7c1a10d3ef0fe3ff6733f4db0d78f08ef0b13121543163ef327058b" dependencies = [ "cc", "codespan-reporting", @@ -669,15 +741,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" +checksum = "701a1ac7a697e249cdd8dc026d7a7dafbfd0dbcd8bd24ec55889f2bc13dd6287" [[package]] name = "cxxbridge-macro" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" +checksum = "b404f596046b0bb2d903a9c786b875a126261b52b7c3a64bbb66382c41c771df" dependencies = [ "proc-macro2", "quote", @@ -713,6 +785,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "educe" version = "0.5.11" @@ -727,9 +805,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "enum-ordinalize" @@ -759,9 +837,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7" +checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" dependencies = [ "serde", ] @@ -778,15 +856,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fiat-crypto" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" [[package]] name = "fixedbitset" @@ -810,6 +888,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" @@ -933,11 +1017,17 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "half" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -955,15 +1045,15 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -977,11 +1067,20 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1000,12 +1099,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", + "libc", "windows-sys 0.52.0", ] @@ -1035,9 +1134,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1045,7 +1144,7 @@ dependencies = [ [[package]] name = "keyed_arena" version = "0.5.0" -source = "git+https://github.com/GaloisInc/swanky.git#ca5d6b755abce97fb14713de699eb4217bcb0341" +source = "git+https://github.com/GaloisInc/swanky.git#6b0ed1ad5a2982bcab74adbc51d42c74413afcb0" dependencies = [ "bumpalo", "crossbeam-queue", @@ -1057,12 +1156,28 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "libc" version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.4", +] + [[package]] name = "libm" version = "0.2.8" @@ -1106,15 +1221,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ "hashbrown", ] @@ -1167,15 +1282,21 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", "windows-sys 0.48.0", ] +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + [[package]] name = "ndarray" version = "0.15.6" @@ -1224,9 +1345,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] @@ -1239,11 +1360,10 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -1275,9 +1395,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -1305,7 +1425,7 @@ dependencies = [ [[package]] name = "ocelot" version = "0.5.0" -source = "git+https://github.com/GaloisInc/swanky.git#ca5d6b755abce97fb14713de699eb4217bcb0341" +source = "git+https://github.com/GaloisInc/swanky.git#6b0ed1ad5a2982bcab74adbc51d42c74413afcb0" dependencies = [ "arrayvec", "blake3", @@ -1367,6 +1487,12 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "petgraph" version = "0.6.4" @@ -1381,18 +1507,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", @@ -1457,11 +1583,21 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1474,7 +1610,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.2", + "bitflags 2.5.0", "lazy_static", "num-traits", "rand", @@ -1554,9 +1690,9 @@ dependencies = [ [[package]] name = "rangemap" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" [[package]] name = "rawpointer" @@ -1566,9 +1702,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1595,13 +1731,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -1616,9 +1752,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1657,16 +1793,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1675,6 +1812,12 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc_version" version = "0.4.0" @@ -1686,11 +1829,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -1699,12 +1842,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1" dependencies = [ + "aws-lc-rs", "log", - "ring", + "once_cell", "rustls-pki-types", "rustls-webpki", "subtle", @@ -1726,19 +1870,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" dependencies = [ - "base64", + "base64 0.21.7", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" +checksum = "868e20fada228fefaf6b652e00cc73623d54f8171e7352c18bb281571f2d92da" [[package]] name = "rustls-webpki" @@ -1746,6 +1890,7 @@ version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -1771,9 +1916,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -1808,7 +1953,7 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "scuttlebutt" version = "0.5.0" -source = "git+https://github.com/GaloisInc/swanky.git#ca5d6b755abce97fb14713de699eb4217bcb0341" +source = "git+https://github.com/GaloisInc/swanky.git#6b0ed1ad5a2982bcab74adbc51d42c74413afcb0" dependencies = [ "bytemuck", "curve25519-dalek-ng", @@ -1857,7 +2002,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "base64", + "base64 0.22.0", "bincode", "bitvec", "bytemuck", @@ -1968,24 +2113,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -1994,9 +2139,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -2005,9 +2150,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.31" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap", "itoa", @@ -2036,6 +2181,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -2056,21 +2207,21 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" dependencies = [ "serde", ] [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2081,9 +2232,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "subtle" @@ -2099,9 +2250,9 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "syn" -version = "2.0.48" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2", "quote", @@ -2116,9 +2267,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", @@ -2137,18 +2288,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", @@ -2157,9 +2308,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2238,9 +2389,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -2412,9 +2563,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -2430,9 +2581,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", "serde", @@ -2447,7 +2598,7 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vectoreyes" version = "0.5.0" -source = "git+https://github.com/GaloisInc/swanky.git#ca5d6b755abce97fb14713de699eb4217bcb0341" +source = "git+https://github.com/GaloisInc/swanky.git#6b0ed1ad5a2982bcab74adbc51d42c74413afcb0" dependencies = [ "aes", "bytemuck", @@ -2473,9 +2624,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2489,9 +2640,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2499,9 +2650,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -2514,9 +2665,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2524,9 +2675,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -2537,20 +2688,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2597,7 +2760,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -2617,17 +2780,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -2638,9 +2801,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -2650,9 +2813,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -2662,9 +2825,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -2674,9 +2837,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -2686,9 +2849,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -2698,9 +2861,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -2710,9 +2873,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "wyz" diff --git a/Cargo.toml b/Cargo.toml index 7583f7e..16bd26c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ exclude = ["libs"] [workspace.dependencies] # Use a workspace.forked remoc version which changes the default options for bincode to use varint encoding remoc = { git = "https://github.com/robinhundt/remoc", rev = "c052a35b2e8fe78daeb06f4686b1d3f29dab7005", default-features = false, features = ["rch", "codec-bincode"]} -clap = { version = "4.4.18", features = ["derive"]} +clap = { version = "4.5.3", features = ["derive"]} [profile.debug-release] inherits = "release" diff --git a/crates/bitpolymul-sys/Cargo.toml b/crates/bitpolymul-sys/Cargo.toml index f9e309f..3d8a0ff 100644 --- a/crates/bitpolymul-sys/Cargo.toml +++ b/crates/bitpolymul-sys/Cargo.toml @@ -10,4 +10,4 @@ links = "bitpolymul" [build-dependencies] -cc = "1.0.83" +cc = "1.0.90" diff --git a/crates/seec-bitmatrix/Cargo.toml b/crates/seec-bitmatrix/Cargo.toml index 87bef7a..840018f 100644 --- a/crates/seec-bitmatrix/Cargo.toml +++ b/crates/seec-bitmatrix/Cargo.toml @@ -13,13 +13,13 @@ rustversion = "1.0.14" [dependencies] bitvec = "1.0.1" -bytemuck = { version = "1.14.1", features = ["extern_crate_alloc"]} +bytemuck = { version = "1.15.0", features = ["extern_crate_alloc"]} cfg-if = "1.0.0" rand = "0.8.5" -serde = { version = "1.0.196", features = ["derive"]} -rayon = { version = "1.8.1", optional = true} +serde = { version = "1.0.197", features = ["derive"]} +rayon = { version = "1.10.0", optional = true} [dev-dependencies] proptest = "1.4.0" ndarray = "0.15.6" -num-traits = "0.2.17" +num-traits = "0.2.18" diff --git a/crates/seec-channel-macros/Cargo.toml b/crates/seec-channel-macros/Cargo.toml index 45f06d5..149b21e 100644 --- a/crates/seec-channel-macros/Cargo.toml +++ b/crates/seec-channel-macros/Cargo.toml @@ -10,6 +10,6 @@ proc-macro = true [dependencies] md5 = "0.7.0" -syn = { version = "2.0.48"} +syn = { version = "2.0.55"} quote = "1.0.35" -proc-macro2 = "1.0.78" +proc-macro2 = "1.0.79" diff --git a/crates/seec-channel/Cargo.toml b/crates/seec-channel/Cargo.toml index f200cd9..cde9886 100644 --- a/crates/seec-channel/Cargo.toml +++ b/crates/seec-channel/Cargo.toml @@ -6,14 +6,14 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-trait = "0.1.77" +async-trait = "0.1.79" async-stream = "0.3.5" -bytes = "1.5.0" +bytes = "1.6.0" futures = "0.3.30" -pin-project = "1.1.4" -serde = { version = "1.0.196"} -erased-serde = "0.4.2" -thiserror = "1.0.56" +pin-project = "1.1.5" +serde = { version = "1.0.197"} +erased-serde = "0.4.4" +thiserror = "1.0.58" tokio = { version = "1.36.0", features = ["macros", "net"]} tokio-serde = { version = "0.9.0", features = ["bincode"]} tokio-util = { version = "0.7.10", features = ["codec"]} @@ -21,17 +21,17 @@ tracing = { version = "0.1.40" } remoc = { workspace = true } seec-channel-macros = {path = "../seec-channel-macros"} once_cell = "1.19.0" -indexmap = { version = "2.2.2", features = ["serde"]} -serde_json = "1.0.113" -tokio-rustls = "0.25.0" -rustls = "0.22.2" -rustls-pemfile = "2.0.0" +indexmap = { version = "2.2.6", features = ["serde"]} +serde_json = "1.0.114" +tokio-rustls = "0.26.0" +rustls = "0.23.4" +rustls-pemfile = "2.1.1" rustls-native-certs = "0.7.0" [dev-dependencies] criterion = { version = "0.5.1", features = ["async_tokio"] } -serde = { version = "1.0.196", features = ["derive"]} -serde_json = "1.0.113" +serde = { version = "1.0.197", features = ["derive"]} +serde_json = "1.0.114" tokio = { version = "1.36.0", features = ["rt-multi-thread", "time"]} diff --git a/crates/seec-macros/Cargo.toml b/crates/seec-macros/Cargo.toml index 56c9f88..9254630 100644 --- a/crates/seec-macros/Cargo.toml +++ b/crates/seec-macros/Cargo.toml @@ -9,6 +9,6 @@ edition = "2021" proc-macro = true [dependencies] -syn = { version = "2.0.48"} +syn = { version = "2.0.55"} quote = "1.0.35" -proc-macro2 = "1.0.78" +proc-macro2 = "1.0.79" diff --git a/crates/seec/Cargo.toml b/crates/seec/Cargo.toml index a069b0a..0b60977 100644 --- a/crates/seec/Cargo.toml +++ b/crates/seec/Cargo.toml @@ -28,35 +28,35 @@ required-features = ["bench-api"] [dependencies] -ahash = "0.8.7" -async-trait = "0.1.77" +ahash = "0.8.11" +async-trait = "0.1.79" async-stream = "0.3.5" bitvec = { version = "1.0.1", features = ["serde"]} -bytemuck = { version = "1.14.1", features = ["derive"]} +bytemuck = { version = "1.15.0", features = ["derive"]} bincode = { version = "1.3.3"} tokio = { version = "1.36.0", features = ["full"]} futures = "0.3.30" -thiserror = "1.0.56" -pin-project = "1.1.4" +thiserror = "1.0.58" +pin-project = "1.1.5" nom = "7.1.3" petgraph = { version = "0.6.4", features = ["serde-1"]} -smallvec = { version = "1.13.1", features = ["union", "const_generics", "serde"]} +smallvec = { version = "1.13.2", features = ["union", "const_generics", "serde"]} itertools = "0.12.1" tokio-serde = { version = "0.9.0", features = ["bincode"]} tokio-util = { version = "0.7.10", features = ["codec"]} -serde = { version = "1.0.196", features = ["derive"]} +serde = { version = "1.0.197", features = ["derive"]} tracing = "0.1.40" itoa = "1.0.10" tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"], optional = true} -anyhow = { version = "1.0.79", optional = true} +anyhow = { version = "1.0.81", optional = true} funty = { version = "2.0.0", optional = true} parking_lot = { version = "0.12.1", features = ["arc_lock"]} -rayon = "1.8.1" +rayon = "1.10.0" rand = { version = "0.8.5", features = ["std"]} rand_chacha = "0.3.1" -num-integer = "0.1.45" -num-traits = "0.2.17" -rangemap = "1.4.0" +num-integer = "0.1.46" +num-traits = "0.2.18" +rangemap = "1.5.1" once_cell = "1.19.0" seec-macros = {path = "../seec-macros"} seec-channel = {path = "../seec-channel"} @@ -64,11 +64,11 @@ remoc = { workspace = true } zappot = {path = "../zappot"} typemap = "0.3.3" seec-bitmatrix = {path = "../seec-bitmatrix"} -either = "1.9.0" +either = "1.10.0" flatbuffers = "23.5.26" [dev-dependencies] -aes = "0.8.3" +aes = "0.8.4" cbc = { version = "0.1.2", features = ["alloc", "block-padding"]} hex = "0.4.3" hex-literal = "0.4.1" @@ -76,10 +76,10 @@ seec = {path = ".", features = ["_integration_tests"]} bincode = "1.3.3" clap = { workspace = true } tracing-appender = "0.2.3" -base64 = "0.21.7" -serde_yaml = "0.9.31" +base64 = "0.22.0" +serde_yaml = "0.9.34" criterion = "0.5" -serde_json = "1.0.113" +serde_json = "1.0.114" [[bench]] name = "bench_main" diff --git a/crates/seec/src/circuit/circuit_connections.rs b/crates/seec/src/circuit/circuit_connections.rs index ffe9340..2260d92 100644 --- a/crates/seec/src/circuit/circuit_connections.rs +++ b/crates/seec/src/circuit/circuit_connections.rs @@ -4,7 +4,6 @@ use crate::{GateId, SubCircuitGate}; use petgraph::adj::IndexType; use serde::{Deserialize, Serialize}; use smallvec::SmallVec; -use std::cmp::{Eq, Ord}; use std::collections::{BTreeMap, Bound, HashMap}; use std::fmt::Debug; use std::hash::Hash; diff --git a/crates/seec/src/circuit/static_layers.rs b/crates/seec/src/circuit/static_layers.rs index c00b823..a0a39a7 100644 --- a/crates/seec/src/circuit/static_layers.rs +++ b/crates/seec/src/circuit/static_layers.rs @@ -5,8 +5,6 @@ use crate::protocols::Gate; use crate::{GateId, SubCircuitGate}; use either::Either; use serde::{Deserialize, Serialize}; -use std::cmp::Eq; -use std::cmp::Ord; use std::collections::HashMap; use std::hash::Hash; use std::num::NonZeroUsize; diff --git a/crates/zappot/Cargo.toml b/crates/zappot/Cargo.toml index b3a077e..22f11f9 100644 --- a/crates/zappot/Cargo.toml +++ b/crates/zappot/Cargo.toml @@ -16,49 +16,50 @@ silent-ot-ex-conv-code = ["libote", "silent-ot"] silent-ot-libote-codes = ["silent-ot-silver-code", "silent-ot-ea-code", "silent-ot-ex-conv-code"] [dependencies] -aes = "0.8.3" -async-trait = "0.1.77" -aligned-vec = {path = "../aligned-vec", optional = true} -bitpolymul = {path = "../bitpolymul", optional = true} +aes = "0.8.4" +async-trait = "0.1.79" +aligned-vec = { path = "../aligned-vec", optional = true } +bitpolymul = { path = "../bitpolymul", optional = true } bitvec = "1.0.1" -bytemuck = { version = "1.14.1", features = ["derive", "extern_crate_alloc"]} -crossbeam-channel = "0.5.11" -curve25519-dalek = { version = "4.1.1", features = ["serde","rand_core","precomputed-tables"]} -futures = { version = "0.3.30", features = ["executor"]} +bytemuck = { version = "1.15.0", features = ["derive", "extern_crate_alloc"] } +crossbeam-channel = "0.5.12" +curve25519-dalek = { version = "4.1.2", features = ["serde", "rand_core", "precomputed-tables"] } +futures = { version = "0.3.30", features = ["executor"] } rand = "0.8.5" rand_core = "0.6.4" -rayon = "1.8.1" -serde = { version = "1.0.196", features = ["derive"]} +rayon = "1.10.0" +serde = { version = "1.0.197", features = ["derive"] } blake2 = "0.10.6" -generic-array = { version = "0.14.7", features = ["serde"]} -pin-project = "1.1.4" -seec-channel = {path = "../seec-channel"} -num-integer = "0.1.45" -num-traits = "0.2.17" -num-prime = {git = "https://github.com/robinhundt/num-prime.git"} +# this currently needs to be kept at 0.14.7, as aes and blake depend on this version +generic-array = { version = "0.14.7", features = ["serde"] } +pin-project = "1.1.5" +seec-channel = { path = "../seec-channel" } +num-integer = "0.1.46" +num-traits = "0.2.18" +num-prime = { git = "https://github.com/robinhundt/num-prime.git" } once_cell = "1.19.0" -tokio = { version = "1.36.0", features = ["sync", "macros", "net"]} -tokio-serde = { version = "0.9.0", features = ["bincode"]} -tokio-util = { version = "0.7.10", features = ["codec"]} -ndarray = { version = "0.15.6", features = ["rayon"]} -thiserror = "1.0.56" +tokio = { version = "1.36.0", features = ["sync", "macros", "net"] } +tokio-serde = { version = "0.9.0", features = ["bincode"] } +tokio-util = { version = "0.7.10", features = ["codec"] } +ndarray = { version = "0.15.6", features = ["rayon"] } +thiserror = "1.0.58" tracing = "0.1.40" remoc = { workspace = true } libote = { path = "../../libs/libote-rs", optional = true } -seec-bitmatrix = {path = "../seec-bitmatrix", features = ["rayon"]} +seec-bitmatrix = { path = "../seec-bitmatrix", features = ["rayon"] } [dev-dependencies] -criterion = { version = "0.5.1", features = ["async_tokio"]} -clap = { version = "4.4.18", features = ["derive"]} -tokio = { version = "1.36.0", features = ["full"]} +criterion = { version = "0.5.1", features = ["async_tokio"] } +clap = { version = "4.5.3", features = ["derive"] } +tokio = { version = "1.36.0", features = ["full"] } ocelot = { git = "https://github.com/GaloisInc/swanky.git" } scuttlebutt = { git = "https://github.com/GaloisInc/swanky.git" } -rand_core_5_1 = { version = "0.5.1", package = "rand_core"} -tracing-subscriber = { version = "0.3.18", features = ["env-filter"]} +rand_core_5_1 = { version = "0.5.1", package = "rand_core" } +tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } [build-dependencies] -cc = "1.0.83" +cc = "1.0.90" [[bench]] name = "bench_main" diff --git a/crates/zappot/src/util/aes_rng.rs b/crates/zappot/src/util/aes_rng.rs index 9703d52..a8fdeac 100644 --- a/crates/zappot/src/util/aes_rng.rs +++ b/crates/zappot/src/util/aes_rng.rs @@ -148,7 +148,6 @@ impl From for AesRng { #[cfg(test)] mod tests { use super::*; - use rand::Rng; #[test] fn test_generate() { diff --git a/crates/zappot/src/util/tokio_rayon.rs b/crates/zappot/src/util/tokio_rayon.rs index 01f3343..dbe34d5 100644 --- a/crates/zappot/src/util/tokio_rayon.rs +++ b/crates/zappot/src/util/tokio_rayon.rs @@ -131,7 +131,7 @@ mod private { #[cfg(test)] mod tests { use super::*; - use rayon::{ThreadPool, ThreadPoolBuilder}; + use rayon::ThreadPoolBuilder; fn build_thread_pool() -> ThreadPool { ThreadPoolBuilder::new().num_threads(1).build().unwrap() From 7f8271be51542bf57622b98f697723ea89775186 Mon Sep 17 00:00:00 2001 From: Robin Hundt <24554122+robinhundt@users.noreply.github.com> Date: Mon, 25 Mar 2024 17:07:44 +0100 Subject: [PATCH 2/3] Update CI nightly toolchain --- .github/workflows/pull_request.yml | 6 +++--- .github/workflows/push.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9e878d8..6901a4b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -21,7 +21,7 @@ jobs: - os: "macos-14" exclude: "--exclude 'bitpolymul*'" features: "aby2,bench-api,silent-ot,silent-ot-libote-codes" - os: ["ubuntu-latest", "windows-latest", "macos-14"] + os: [ "ubuntu-latest", "windows-latest", "macos-14" ] steps: - name: Check out repository uses: actions/checkout@v4 @@ -31,7 +31,7 @@ jobs: uses: dtolnay/rust-toolchain@master id: toolchain with: - toolchain: nightly-2024-01-12 + toolchain: nightly-2024-03-19 - name: Override default toolchain run: rustup override set ${{steps.toolchain.outputs.name}} - run: cargo --version @@ -55,7 +55,7 @@ jobs: uses: dtolnay/rust-toolchain@master id: toolchain with: - toolchain: nightly-2024-01-12 + toolchain: nightly-2024-03-19 components: "clippy, rustfmt" - name: Override default toolchain run: rustup override set ${{steps.toolchain.outputs.name}} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cde756d..dee3ce4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,6 +1,6 @@ name: Push -on: ["push"] +on: [ "push" ] env: CARGO_TERM_COLOR: always @@ -17,7 +17,7 @@ jobs: uses: dtolnay/rust-toolchain@master id: toolchain with: - toolchain: nightly-2024-01-12 + toolchain: nightly-2024-03-19 - name: Override default toolchain run: rustup override set ${{steps.toolchain.outputs.name}} - run: cargo --version From aeeb9caee4c98272e182f9010e6dbdb4b077e4b3 Mon Sep 17 00:00:00 2001 From: Robin Hundt <24554122+robinhundt@users.noreply.github.com> Date: Mon, 25 Mar 2024 17:15:54 +0100 Subject: [PATCH 3/3] Clippy fixup --- crates/seec/src/mul_triple/boolean/silent_ot.rs | 1 - crates/seec/src/parse/bristol.rs | 5 +++-- crates/seec/src/parse/mod.rs | 6 ++---- crates/zappot/src/silent_ot/mod.rs | 2 -- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/crates/seec/src/mul_triple/boolean/silent_ot.rs b/crates/seec/src/mul_triple/boolean/silent_ot.rs index 03b5752..8ebaba1 100644 --- a/crates/seec/src/mul_triple/boolean/silent_ot.rs +++ b/crates/seec/src/mul_triple/boolean/silent_ot.rs @@ -173,7 +173,6 @@ impl MTProvider for SilentMtProvider { #[cfg(test)] mod tests { use super::*; - use rand::rngs::OsRng; #[tokio::test] async fn silent_mts() { diff --git a/crates/seec/src/parse/bristol.rs b/crates/seec/src/parse/bristol.rs index c8a3736..aceaa54 100644 --- a/crates/seec/src/parse/bristol.rs +++ b/crates/seec/src/parse/bristol.rs @@ -113,11 +113,12 @@ pub fn circuit(input: &str) -> Result> Ok(Circuit { header, gates }) } -pub fn array<'a, F: 'a, O: Default + Copy, const N: usize>( +pub fn array<'a, F, O, const N: usize>( element: F, ) -> impl FnMut(&'a str) -> IResult<&'a str, [O; N]> where - F: Fn(&'a str) -> IResult<&'a str, O>, + O: Default + Copy, + F: Fn(&'a str) -> IResult<&'a str, O> + 'a, { move |i: &str| { let mut buf = [O::default(); N]; diff --git a/crates/seec/src/parse/mod.rs b/crates/seec/src/parse/mod.rs index 3d7dde5..6fd2196 100644 --- a/crates/seec/src/parse/mod.rs +++ b/crates/seec/src/parse/mod.rs @@ -24,11 +24,9 @@ fn integer_ws<'a, E: ParseError<&'a str> + FromExternalError<&'a str, ParseIntEr /// A combinator that takes a parser `inner` and produces a parser that also consumes both leading and /// trailing whitespace, returning the output of `inner`. /// Source: https://docs.rs/nom/latest/nom/recipes/index.html#wrapper-combinators-that-eat-whitespace-before-and-after-a-parser -fn ws<'a, F: 'a, O, E: ParseError<&'a str>>( - inner: F, -) -> impl FnMut(&'a str) -> IResult<&'a str, O, E> +fn ws<'a, F, O, E: ParseError<&'a str>>(inner: F) -> impl FnMut(&'a str) -> IResult<&'a str, O, E> where - F: Fn(&'a str) -> IResult<&'a str, O, E>, + F: Fn(&'a str) -> IResult<&'a str, O, E> + 'a, { delimited(multispace0, inner, multispace0) } diff --git a/crates/zappot/src/silent_ot/mod.rs b/crates/zappot/src/silent_ot/mod.rs index 79bc894..7268ad6 100644 --- a/crates/zappot/src/silent_ot/mod.rs +++ b/crates/zappot/src/silent_ot/mod.rs @@ -918,8 +918,6 @@ async fn pprf_channel( mod test { use super::*; use crate::silent_ot::pprf::tests::fake_base; - - use bitvec::slice::BitSlice; use rand::rngs::StdRng; use rand_core::SeedableRng;