diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1234a3c7..215a36e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.68.2, stable, nightly] + rust: [1.71.1, stable, nightly] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master @@ -59,7 +59,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - - run: cargo install --locked --version "0.5.0" cargo-about + - run: cargo install --locked --version "0.6.6" cargo-about - run: cargo about generate --workspace --output-file "${{ runner.temp }}/licenses.html" about.hbs - id: license_diff run: | diff --git a/Cargo.lock b/Cargo.lock index 56881b95..f6f9116d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,30 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] [[package]] name = "aho-corasick" @@ -41,15 +53,71 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", + "once_cell", + "windows-sys 0.59.0", +] + +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] @@ -65,22 +133,22 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-nitro-enclaves-cose" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce1d9954a5cb2841ad8ab206a050cd07ed34200ea6aafb7fa73a33771aaf48c" +checksum = "b8a94047bd9c3717c6ca3a145504c0e26b64a5e2d9eb9559b187748433fbc382" dependencies = [ "openssl", "serde", "serde_bytes", "serde_cbor", "serde_repr", - "serde_with 1.14.0", + "serde_with", ] [[package]] @@ -92,7 +160,7 @@ dependencies = [ "aws-nitro-enclaves-cose", "byteorder", "chrono", - "clap", + "clap 3.2.25", "crc", "hex", "num-derive 0.3.3", @@ -106,43 +174,35 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" 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" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.69.4" +version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "cexpr", "clang-sys", "itertools", - "lazy_static", - "lazycell", "log", "prettyplease", "proc-macro2", @@ -150,8 +210,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.58", - "which", + "syn 2.0.96", ] [[package]] @@ -162,9 +221,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" [[package]] name = "block-buffer" @@ -181,7 +240,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c" dependencies = [ - "base64 0.22.0", + "base64", "bollard-stubs", "bytes", "futures-core", @@ -216,7 +275,7 @@ checksum = "709d9aa1c37abb89d40f19f5d0ad6f0d88cb1581264e571c9350fc5bb89cf1c5" dependencies = [ "serde", "serde_repr", - "serde_with 3.7.0", + "serde_with", ] [[package]] @@ -239,15 +298,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.0.92" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" +dependencies = [ + "shlex", +] [[package]] name = "cexpr" @@ -266,9 +328,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -276,14 +338,41 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half 2.4.1", ] [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -298,13 +387,34 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags 1.3.2", - "clap_lex", + "clap_lex 0.2.4", "indexmap 1.9.3", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap", ] +[[package]] +name = "clap" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.6.0", + "strsim 0.10.0", +] + [[package]] name = "clap_lex" version = "0.2.4" @@ -314,12 +424,24 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + [[package]] name = "command-executer" version = "0.1.0" dependencies = [ "byteorder", - "clap", + "clap 4.4.18", "log", "nix 0.26.4", "num", @@ -331,15 +453,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -355,28 +477,69 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "ctor" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.96", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.96", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.96", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deranged" @@ -397,6 +560,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "driver-bindings" version = "0.1.0" @@ -415,18 +589,18 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "enclave_build" version = "0.1.0" dependencies = [ "aws-nitro-enclaves-image-format", - "base64 0.22.0", + "base64", "bollard", - "clap", + "clap 4.4.18", "flate2", "futures", "log", @@ -440,16 +614,25 @@ dependencies = [ "url", ] +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] @@ -473,37 +656,37 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "fastrand" -version = "2.0.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -557,9 +740,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -572,9 +755,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -582,15 +765,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -599,38 +782,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -656,9 +839,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -667,15 +850,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "half" @@ -683,6 +866,16 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -691,15 +884,33 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] [[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" @@ -716,6 +927,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -724,9 +941,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hickory-proto" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +checksum = "447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5" dependencies = [ "async-trait", "cfg-if", @@ -735,7 +952,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.4.0", + "idna", "ipnet", "once_cell", "rand", @@ -748,9 +965,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4" dependencies = [ "cfg-if", "futures-util", @@ -767,15 +984,6 @@ dependencies = [ "tracing", ] -[[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 = "hostname" version = "0.3.1" @@ -789,9 +997,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -800,9 +1008,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -810,12 +1018,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -823,9 +1031,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "humantime" @@ -835,9 +1043,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.2.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", @@ -869,9 +1077,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -882,7 +1090,6 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] @@ -904,9 +1111,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -926,33 +1133,148 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.3.0" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "yoke", + "zerofrom", + "zerovec", ] [[package]] -name = "idna" -version = "0.4.0" +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", ] +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", ] [[package]] @@ -968,12 +1290,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.2", "serde", ] @@ -1013,71 +1335,83 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.7.0", + "libc", + "redox_syscall", ] [[package]] @@ -1088,15 +1422,21 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "litemap" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1104,9 +1444,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "lru-cache" @@ -1125,9 +1465,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1155,22 +1495,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1180,7 +1520,8 @@ dependencies = [ "aws-nitro-enclaves-image-format", "bindgen", "chrono", - "clap", + "ciborium", + "clap 4.4.18", "driver-bindings", "eif_loader", "enclave_build", @@ -1196,7 +1537,6 @@ dependencies = [ "openssl", "page_size", "serde", - "serde_cbor", "serde_json", "sha2", "signal-hook", @@ -1309,7 +1649,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] @@ -1323,9 +1663,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -1346,9 +1686,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1365,18 +1705,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -1386,11 +1726,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "cfg-if", "foreign-types", "libc", @@ -1407,14 +1747,14 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -1440,9 +1780,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1450,15 +1790,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -1467,31 +1807,11 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1501,9 +1821,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "powerfmt" @@ -1513,25 +1833,28 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" dependencies = [ "proc-macro2", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -1544,9 +1867,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -1583,18 +1906,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.7.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -1604,9 +1927,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1615,9 +1938,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "resolv-conf" @@ -1631,34 +1954,40 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.7.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -1668,18 +1997,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -1690,28 +2019,29 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ - "half", + "half 1.8.3", "serde", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -1724,7 +2054,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] @@ -1741,30 +2071,34 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.14.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ - "serde", -] - -[[package]] -name = "serde_with" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" -dependencies = [ - "base64 0.21.7", + "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", + "serde_with_macros", "time", ] +[[package]] +name = "serde_with_macros" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "serde_yaml" version = "0.8.26" @@ -1808,9 +2142,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -1832,20 +2166,32 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "syn" version = "1.0.109" @@ -1859,20 +2205,31 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "tar" -version = "0.4.40" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -1881,14 +2238,16 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1908,22 +2267,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] @@ -1937,9 +2296,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -1958,19 +2317,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" dependencies = [ "tinyvec_macros", ] @@ -1983,69 +2352,44 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", ] -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2053,20 +2397,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -2083,38 +2427,41 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "url" -version = "2.5.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "vcpkg" version = "0.2.15" @@ -2123,9 +2470,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vmm-sys-util" @@ -2152,18 +2499,18 @@ name = "vsock-proxy" version = "1.0.1" dependencies = [ "chrono", - "clap", + "clap 4.4.18", "ctor", "env_logger", "hickory-resolver", - "idna 0.3.0", + "idna", "log", "nix 0.26.4", "rand", "tempfile", "threadpool", "vsock", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -2183,34 +2530,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2218,33 +2566,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" dependencies = [ - "either", - "home", - "once_cell", - "rustix", + "unicode-ident", ] [[package]] @@ -2271,11 +2610,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -2290,7 +2629,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -2308,7 +2647,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2328,17 +2676,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "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", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -2349,9 +2698,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2361,9 +2710,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2373,9 +2722,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2385,9 +2740,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2397,9 +2752,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -2409,9 +2764,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2421,9 +2776,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winreg" @@ -2435,11 +2790,23 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "xattr" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" dependencies = [ "libc", "linux-raw-sys", @@ -2454,3 +2821,102 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ "linked-hash-map", ] + +[[package]] +name = "yaml-rust2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" +dependencies = [ + "arraydeque", + "encoding_rs", + "hashlink", +] + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] diff --git a/Cargo.toml b/Cargo.toml index 66961022..cb73debf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,12 +4,12 @@ version = "1.3.4" authors = ["The AWS Nitro Enclaves Team "] edition = "2018" license = "Apache-2.0" -rust-version = "1.68" +rust-version = "1.71" [dependencies] serde = { version = ">=1.0", features = ["derive"] } chrono = "0.4" -clap = "3.2" +clap = "~4.4" inotify = "0.10" serde_json = "1.0" nix = "0.26" @@ -18,7 +18,7 @@ libc = { version = ">=0.2.69" } flexi_logger = "0.25" page_size = "0.6" signal-hook = "0.3" -serde_cbor = "0.11" +ciborium = "0.2" driver-bindings = { path = "./driver-bindings" } aws-nitro-enclaves-image-format = "0.2" eif_loader = { path = "./eif_loader" } diff --git a/Makefile b/Makefile index a65c37ec..1d19e222 100644 --- a/Makefile +++ b/Makefile @@ -259,7 +259,7 @@ update-third-party-licenses-rust-crates-html: build-setup build-container -v "$$(readlink -f ${OBJ_PATH})":/nitro_build \ $(CONTAINER_TAG) bin/bash -c \ 'source /root/.cargo/env && \ - cargo about generate \ + cargo +stable about generate \ --manifest-path=/nitro_src/Cargo.toml \ /nitro_src/about.hbs > /nitro_src/$(RUST_CRATES_LICENSE_FILE)' diff --git a/README.md b/README.md index 94396892..2d99df93 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![msrv] -[msrv]: https://img.shields.io/badge/MSRV-1.68.2-blue +[msrv]: https://img.shields.io/badge/MSRV-1.71.1-blue ## Nitro Enclaves Command Line Interface (Nitro CLI) diff --git a/SPECS/aws-nitro-enclaves-cli.spec b/SPECS/aws-nitro-enclaves-cli.spec index 33737129..8d95292e 100644 --- a/SPECS/aws-nitro-enclaves-cli.spec +++ b/SPECS/aws-nitro-enclaves-cli.spec @@ -31,8 +31,8 @@ Source0: aws-nitro-enclaves-cli.tar.gz Source1: nitro-cli-dependencies.tar.gz BuildRequires: openssl-devel -BuildRequires: rust >= 1.68 -BuildRequires: cargo >= 1.68 +BuildRequires: rust >= 1.71 +BuildRequires: cargo >= 1.71 BuildRequires: make BuildRequires: llvm BuildRequires: clang diff --git a/THIRD_PARTY_LICENSES_RUST_CRATES.html b/THIRD_PARTY_LICENSES_RUST_CRATES.html index 6d688421..1df7b201 100644 --- a/THIRD_PARTY_LICENSES_RUST_CRATES.html +++ b/THIRD_PARTY_LICENSES_RUST_CRATES.html @@ -44,11 +44,11 @@

Third Party Licenses

Overview of licenses:

All license text:

@@ -57,7 +57,7 @@

All license text:

Apache License 2.0

Used by:

@@ -241,10 +241,7 @@ 
Used by:

                 
Apache License 2.0

                 
Used by:

                 
                 
                                  Apache License
@@ -429,7 +426,9 @@ 
Used by:

                 
Apache License 2.0

                 
Used by:

                 
                 
                                  Apache License
@@ -838,7 +837,7 @@ 
Used by:

                 
Apache License 2.0

                 
Used by:

                 
                 
                                  Apache License
@@ -1441,7 +1440,14 @@ 
Used by:

                 
Apache License 2.0

                 
Used by:

                 
                 
                                 Apache License
                            Version 2.0, January 2004
@@ -1631,7 +1637,7 @@ 
Used by:

       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 Tomasz "Soveu" Marx
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1644,16 +1650,13 @@ 
Used by:

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
 

             
             
  • 
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                     Apache License
                            Version 2.0, January 2004
@@ -1835,7 +1838,7 @@ 
    Used by:
    
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -1843,7 +1846,7 @@ 
    Used by:
    
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1862,10 +1865,16 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                     Apache License
@@ -2285,22 +2294,205 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
+                
                                  Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
    
+            
    • 
+            
  • 
+                
    Apache License 2.0
    
+                
    Used by:
    
+                
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -2484,15 +2676,15 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -2910,7 +3102,7 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -3328,7 +3520,7 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -3746,57 +3938,55 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                  Apache License
@@ -4217,7 +4407,7 @@ 
    Apache License 2.0
    
                 
    Used by:
    
                 
      
                     
    • block-buffer 0.9.0
      • 
-                    
    • cpufeatures 0.2.12
      • 
+                    
    • cpufeatures 0.2.16
      • 
                     
    • digest 0.9.0
      • 
                     
    • opaque-debug 0.3.1
      • 
                     
    • sha2 0.9.9
      • 
@@ -4429,12 +4619,11 @@ 
      Used by:
      
                 
      Apache License 2.0
      
                 
      Used by:
      
                 
                 
                                    Apache License
                         Version 2.0, January 2004
-                     https://www.apache.org/licenses/LICENSE-2.0
+                     https://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -4639,67 +4828,276 @@ 
      Used by:
      
                 
      Apache License 2.0
      
                 
      Used by:
      
                 
-                
                                    Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
+                
                                    Apache License
+                        Version 2.0, January 2004
+                     https://www.apache.org/licenses/LICENSE-2.0
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
      
+            
+            
    • 
+                
      Apache License 2.0
      
+                
      Used by:
      
+                
+                
                                    Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
    designated in writing by the copyright owner as "Not a Contribution."
 
    "Contributor" shall mean Licensor and any individual or Legal Entity
@@ -4792,516 +5190,130 @@ 
      Used by:
      
    PARTICULAR PURPOSE. You are solely responsible for determining the
    appropriateness of using or redistributing the Work and assume any
    risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
      
-            
      • 
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
-                
      # Contributing
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
-
      
-            
      • 
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
-                
      Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
      
-            
      • 
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
-                
      Copyright 2011-2017 Google Inc.
-          2013 Jack Lloyd
-          2013-2014 Steven Fackler
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
      
-            
      • 
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
-                
      Copyright 2015 Nicholas Allegra (comex).
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
      
-            
      • 
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
-                
      Licensed under the Apache License, Version 2.0
-<LICENSE-APACHE or
-http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-at your option. All files in the project carrying such
-notice may not be copied, modified, or distributed except
-according to those terms.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
 
      
             
      • 
             
    • 
                 
      Apache License 2.0
      
                 
      Used by:
      
                 
-                
      MIT OR Apache-2.0
      
-            
      • 
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
-                
      MIT OR Apache-2.0
-
      
-            
      • 
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
-                
      Minimal-lexical is dual licensed under the Apache 2.0 license as well as the MIT
-license. See the LICENCE-MIT and the LICENCE-APACHE files for the licenses.
-
----
-
-`src/bellerophon.rs` is loosely based off the Golang implementation,
-found [here](https://github.com/golang/go/blob/b10849fbb97a2244c086991b4623ae9f32c212d0/src/strconv/extfloat.go).
-That code (used if the `compact` feature is enabled) is subject to a
-[3-clause BSD license](https://github.com/golang/go/blob/b10849fbb97a2244c086991b4623ae9f32c212d0/LICENSE):
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
      
-            
      • 
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
-                
      Rust-chrono is dual-licensed under The MIT License [1] and
-Apache 2.0 License [2]. Copyright (c) 2014--2017, Kang Seonghoon and
-contributors.
-
-Nota Bene: This is same as the Rust Project's own license.
-
-
-[1]: <http://opensource.org/licenses/MIT>, which is reproduced below:
-
-~~~~
-The MIT License (MIT)
-
-Copyright (c) 2014, Kang Seonghoon.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-~~~~
-
-
-[2]: <http://www.apache.org/licenses/LICENSE-2.0>, which is reproduced below:
-
-~~~~
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
+                
      Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
 1. Definitions.
 
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
 
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
 
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
 
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
 
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
 
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
 
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
 
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
 
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
 
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
 
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
 
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
 
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
 
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
 
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
 
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
 
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
 
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
 
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
 
 END OF TERMS AND CONDITIONS
 
 APPENDIX: How to apply the Apache License to your work.
 
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
 
 Copyright [yyyy] [name of copyright owner]
 
@@ -5309,15 +5321,75 @@ 
      Used by:
      
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-	http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
      
+            
      • 
+            
    • 
+                
      Apache License 2.0
      
+                
      Used by:
      
+                
+                
      Copyright 2011-2017 Google Inc.
+          2013 Jack Lloyd
+          2013-2014 Steven Fackler
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-~~~~
+
      
+            
      • 
+            
    • 
+                
      Apache License 2.0
      
+                
      Used by:
      
+                
+                
      Copyright 2015 Nicholas Allegra (comex).
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
      
+            
      • 
+            
    • 
+                
      Apache License 2.0
      
+                
      Used by:
      
+                
+                
      MIT OR Apache-2.0
      
+            
      • 
+            
    • 
+                
      Apache License 2.0
      
+                
      Used by:
      
+                
+                
      MIT OR Apache-2.0
 
      
             
      • 
             
    • 
@@ -5359,7 +5431,7 @@ 
      Used by:
      
                 
      BSD 3-Clause "New" or "Revised" License
      
                 
      Used by:
      
                 
                 
      BSD 3-Clause License
 
@@ -5437,7 +5509,7 @@ 
      Used by:
      
                 
      ISC License
      
                 
      Used by:
      
                 
                 
      Copyright © 2015, Simonas Kazlauskas
 
@@ -5457,7 +5529,7 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      Copyright (c) 2014 Alex Crichton
 
@@ -5490,7 +5562,7 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      Copyright (c) 2014 Carl Lerche and other MIO contributors
 
@@ -5545,7 +5617,7 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      Copyright (c) 2014-2021 Sean McArthur
 
@@ -5559,33 +5631,6 @@ 
      Used by:
      
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
      
-            
      • 
-            
    • 
-                
      MIT License
      
-                
      Used by:
      
-                
-                
      Copyright (c) 2015 fangyuanziti
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -5681,7 +5726,7 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      Copyright (c) 2018 Carl Lerche
 
@@ -5804,11 +5849,9 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
-                
      Copyright (c) 2019 Tokio Contributors
+                
      Copyright (c) 2019 Hyper Contributors
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -5839,11 +5882,10 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
-                
      Copyright (c) 2019 Tower Contributors
+                
      Copyright (c) 2019 Tokio Contributors
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -5874,37 +5916,42 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
-                
      Copyright (c) 2023 Sean McArthur
+                
      Copyright (c) 2019 Tower Contributors
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
 
      
             
      • 
             
    • 
                 
      MIT License
      
                 
      Used by:
      
                 
-                
      Copyright (c) 2023 Tokio Contributors
+                
      Copyright (c) 2019-2024 Sean McArthur & Hyper Contributors
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -5929,6 +5976,48 @@ 
      Used by:
      
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
+
      
+            
      • 
+            
    • 
+                
      MIT License
      
+                
      Used by:
      
+                
+                
      Copyright (c) 2023 Sean McArthur
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
      
+            
      • 
+            
    • 
+                
      MIT License
      
+                
      Used by:
      
+                
+                
      Copyright 2016 Nika Layzell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
      
             
      • 
             
    • 
@@ -5964,25 +6053,68 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      MIT License
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) 2017 Ted Driggs
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
      
+            
      • 
+            
    • 
+                
      MIT License
      
+                
      Used by:
      
+                
+                
      MIT License
+
+Copyright (c) Tokio Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
      
             
      • 
             
    • 
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -6043,7 +6175,7 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      The MIT License (MIT)
 
@@ -6074,7 +6206,7 @@ 
      Used by:
      
                 
                 
      The MIT License (MIT)
@@ -6135,6 +6267,7 @@ 
      MIT License
      
                 
      Used by:
      
                 
                 
      The MIT License (MIT)
 
@@ -6224,7 +6357,7 @@ 
      Used by:
      
                 
                 
      This project is dual-licensed under the Unlicense and MIT licenses.
@@ -6233,33 +6366,69 @@ 
      Used by:
      
 
      
             
      • 
             
    • 
-                
      Unicode License Agreement - Data Files and Software (2016)
      
+                
      Unicode License v3
      
                 
      Used by:
      
                 
-                
      UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
-
-Unicode Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/.
-
-Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
-
-NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+                
      UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that either
-
-     (a) this copyright and permission notice appear with all copies of the Data Files or Software, or
-     (b) this copyright and permission notice appear in associated Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+Copyright © 1991-2023 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
 
      
             
      • 
         
    
diff --git a/about.toml b/about.toml
index 512c2cd6..245442d9 100644
--- a/about.toml
+++ b/about.toml
@@ -5,6 +5,7 @@ accepted = [
     "BSD-3-Clause",
     "ISC",
     "Unicode-DFS-2016",
+    "Unicode-3.0",
 ]
 
 targets = [
diff --git a/enclave_build/Cargo.toml b/enclave_build/Cargo.toml
index e8383a6d..ecadafb6 100644
--- a/enclave_build/Cargo.toml
+++ b/enclave_build/Cargo.toml
@@ -3,13 +3,13 @@ name = "enclave_build"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team "]
 edition = "2018"
-rust-version = "1.68"
+rust-version = "1.71"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 bollard = "0.16.0"
-clap = "3.2"
+clap = "~4.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.8"
 serde_json = "1.0"
diff --git a/enclave_build/src/main.rs b/enclave_build/src/main.rs
index 0a5ac5da..06775d93 100644
--- a/enclave_build/src/main.rs
+++ b/enclave_build/src/main.rs
@@ -1,144 +1,127 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use clap::{App, AppSettings, Arg};
+use clap::{Arg, ArgAction, Command};
 use std::fs::OpenOptions;
 
 use aws_nitro_enclaves_image_format::generate_build_info;
 use enclave_build::Docker2Eif;
 
 fn main() {
-    let matches = App::new("Docker2Eif builder")
+    let matches = Command::new("Docker2Eif builder")
         .about("Generate consistent EIF image from a Docker image")
-        .setting(AppSettings::DisableVersion)
         .arg(
-            Arg::with_name("docker_image")
+            Arg::new("docker_image")
                 .short('t')
                 .long("tag")
                 .help("Docker image tag")
-                .takes_value(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("init_path")
+            Arg::new("init_path")
                 .short('i')
                 .long("init")
                 .help("Path to a binary representing the init process for the enclave")
-                .takes_value(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("nsm_path")
+            Arg::new("nsm_path")
                 .short('n')
                 .long("nsm")
                 .help("Path to the NitroSecureModule Kernel Driver")
-                .takes_value(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("kernel_img_path")
+            Arg::new("kernel_img_path")
                 .short('k')
                 .long("kernel")
                 .help("Path to a bzImage/Image file for x86_64/aarch64 linux kernel")
-                .takes_value(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("kernel_cfg_path")
+            Arg::new("kernel_cfg_path")
                 .long("kernel_config")
                 .help("Path to a bzImage.config/Image.config file for x86_64/aarch64 linux kernel config")
-                .takes_value(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("cmdline")
+            Arg::new("cmdline")
                 .short('c')
                 .long("cmdline")
                 .help("Cmdline for kernel")
-                .takes_value(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("linuxkit_path")
+            Arg::new("linuxkit_path")
                 .short('l')
                 .long("linuxkit")
                 .help("Linuxkit executable path")
-                .takes_value(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("output")
+            Arg::new("output")
                 .short('o')
                 .long("output")
                 .help("Output file for EIF image")
-                .takes_value(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("signing-certificate")
+            Arg::new("signing-certificate")
                 .long("signing-certificate")
-                .help("Specify the path to the signing certificate")
-                .takes_value(true),
+                .help("Specify the path to the signing certificate"),
         )
         .arg(
-            Arg::with_name("private-key")
+            Arg::new("private-key")
                 .long("private-key")
-                .help("Specify the path to the private-key")
-                .takes_value(true),
+                .help("Specify the path to the private-key"),
         )
         .arg(
-            Arg::with_name("build")
+            Arg::new("build")
                 .short('b')
                 .long("build")
                 .help("Build image from Dockerfile")
-                .takes_value(true)
-                .required(false),
+                .conflicts_with("pull"),
         )
         .arg(
-            Arg::with_name("pull")
+            Arg::new("pull")
                 .short('p')
                 .long("pull")
                 .help("Pull the Docker image before generating EIF")
-                .required(false)
+                .action(ArgAction::SetTrue)
                 .conflicts_with("build"),
         )
         .arg(
-            Arg::with_name("image_name")
+            Arg::new("image_name")
                 .long("name")
-                .help("Name for enclave image")
-                .takes_value(true),
+                .help("Name for enclave image"),
         )
         .arg(
-            Arg::with_name("image_version")
+            Arg::new("image_version")
                 .long("version")
-                .help("Version of the enclave image")
-                .takes_value(true),
+                .help("Version of the enclave image"),
         )
         .arg(
-            Arg::with_name("metadata")
+            Arg::new("metadata")
                 .long("metadata")
-                .help("Path to JSON containing the custom metadata provided by the user.")
-                .takes_value(true),
+                .help("Path to JSON containing the custom metadata provided by the user"),
         )
         .get_matches();
 
-    let docker_image = matches.value_of("docker_image").unwrap();
-    let init_path = matches.value_of("init_path").unwrap();
-    let nsm_path = matches.value_of("nsm_path").unwrap();
-    let kernel_img_path = matches.value_of("kernel_img_path").unwrap();
-    let kernel_cfg_path = matches.value_of("kernel_cfg_path").unwrap();
-    let cmdline = matches.value_of("cmdline").unwrap();
-    let linuxkit_path = matches.value_of("linuxkit_path").unwrap();
-    let output = matches.value_of("output").unwrap();
+    let docker_image = matches.get_one::("docker_image").unwrap();
+    let init_path = matches.get_one::("init_path").unwrap();
+    let nsm_path = matches.get_one::("nsm_path").unwrap();
+    let kernel_img_path = matches.get_one::("kernel_img_path").unwrap();
+    let kernel_cfg_path = matches.get_one::("kernel_cfg_path").unwrap();
+    let cmdline = matches.get_one::("cmdline").unwrap();
+    let linuxkit_path = matches.get_one::("linuxkit_path").unwrap();
+    let output = matches.get_one::("output").unwrap();
     let signing_certificate = matches
-        .value_of("signing_certificate")
-        .map(|val| val.to_string());
-    let private_key = matches
-        .value_of("private_certificate")
-        .map(|val| val.to_string());
-    let img_name = matches.value_of("image_name").map(|val| val.to_string());
-    let img_version = matches.value_of("image_version").map(|val| val.to_string());
-    let metadata = matches.value_of("metadata").map(|val| val.to_string());
+        .get_one::("signing-certificate")
+        .map(String::from);
+    let private_key = matches.get_one::("private-key").map(String::from);
+    let img_name = matches.get_one::("image_name").map(String::from);
+    let img_version = matches.get_one::("image_version").map(String::from);
+    let metadata = matches.get_one::("metadata").map(String::from);
 
     let mut output = OpenOptions::new()
         .read(true)
@@ -166,10 +149,9 @@ fn main() {
     )
     .unwrap();
 
-    if matches.is_present("build") {
-        let dockerfile_dir = matches.value_of("build").unwrap();
+    if let Some(dockerfile_dir) = matches.get_one::("build") {
         img.build_docker_image(dockerfile_dir.to_string()).unwrap();
-    } else if matches.is_present("pull") {
+    } else if matches.get_flag("pull") {
         img.pull_docker_image().unwrap();
     }
 
diff --git a/samples/command_executer/Cargo.toml b/samples/command_executer/Cargo.toml
index 226102e4..4a635fb2 100644
--- a/samples/command_executer/Cargo.toml
+++ b/samples/command_executer/Cargo.toml
@@ -3,12 +3,12 @@ name = "command-executer"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team "]
 edition = "2018"
-rust-version = "1.68"
+rust-version = "1.71"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "3.2"
+clap = "~4.4"
 log = "0.4"
 nix = "0.26"
 serde = { version = ">=1.0", features = ["derive"] }
diff --git a/samples/command_executer/src/command_parser.rs b/samples/command_executer/src/command_parser.rs
index 9feaf7c3..9fea9cef 100644
--- a/samples/command_executer/src/command_parser.rs
+++ b/samples/command_executer/src/command_parser.rs
@@ -80,40 +80,37 @@ impl CommandOutput {
 }
 
 fn parse_cid(args: &ArgMatches) -> Result {
-    let port = args.value_of("cid").ok_or("Could not find cid argument")?;
-    port.parse()
+    args.get_one::("cid")
+        .ok_or("Could not find cid argument")?
+        .parse()
         .map_err(|_err| "cid is not a number".to_string())
 }
 
 fn parse_port(args: &ArgMatches) -> Result {
-    let port = args
-        .value_of("port")
-        .ok_or("Could not find port argument")?;
-    port.parse()
+    args.get_one::("port")
+        .ok_or("Could not find port argument")?
+        .parse()
         .map_err(|_err| "port is not a number".to_string())
 }
 
 fn parse_command(args: &ArgMatches) -> Result {
-    let command = args
-        .value_of("command")
-        .ok_or("Could not find command argument")?;
-    Ok(String::from(command))
+    args.get_one::("command")
+        .map(String::from)
+        .ok_or_else(|| "Could not find command argument".to_string())
 }
 
 fn parse_no_wait(args: &ArgMatches) -> bool {
-    args.is_present("no-wait")
+    args.get_flag("no-wait")
 }
 
 fn parse_localfile(args: &ArgMatches) -> Result {
-    let output = args
-        .value_of("localpath")
-        .ok_or("Could not find localpath")?;
-    Ok(String::from(output))
+    args.get_one::("localpath")
+        .map(String::from)
+        .ok_or_else(|| "Could not find localpath".to_string())
 }
 
 fn parse_remotefile(args: &ArgMatches) -> Result {
-    let output = args
-        .value_of("remotepath")
-        .ok_or("Could not find remotepath")?;
-    Ok(String::from(output))
+    args.get_one::("remotepath")
+        .map(String::from)
+        .ok_or_else(|| "Could not find remotepath".to_string())
 }
diff --git a/samples/command_executer/src/main.rs b/samples/command_executer/src/main.rs
index ea2678b8..8fff2ed8 100644
--- a/samples/command_executer/src/main.rs
+++ b/samples/command_executer/src/main.rs
@@ -1,4 +1,4 @@
-use clap::{App, AppSettings, Arg, SubCommand};
+use clap::{Arg, ArgAction, Command};
 
 use command_executer::command_parser::{FileArgs, ListenArgs, RunArgs};
 use command_executer::create_app;
diff --git a/samples/command_executer/src/utils.rs b/samples/command_executer/src/utils.rs
index 5e88a679..e5ac8eee 100644
--- a/samples/command_executer/src/utils.rs
+++ b/samples/command_executer/src/utils.rs
@@ -19,113 +19,66 @@ impl ExitGracefully for Result {
 #[macro_export]
 macro_rules! create_app {
     () => {
-        App::new("Vsock Tool")
+        Command::new("Vsock Tool")
             .about("Tool that runs commands inside the enclave")
-            .setting(AppSettings::ArgRequiredElseHelp)
+            .arg_required_else_help(true)
             .version(env!("CARGO_PKG_VERSION"))
             .subcommand(
-                SubCommand::with_name("listen")
+                Command::new("listen")
                     .about("Listen on a given port")
-                    .arg(
-                        Arg::with_name("port")
-                            .long("port")
-                            .help("port")
-                            .takes_value(true)
-                            .required(true),
-                    ),
+                    .arg(Arg::new("port").long("port").help("port").required(true)),
             )
             .subcommand(
-                SubCommand::with_name("run")
+                Command::new("run")
                     .about("Run a command inside the enclave")
+                    .arg(Arg::new("port").long("port").help("port").required(true))
+                    .arg(Arg::new("cid").long("cid").help("cid").required(true))
                     .arg(
-                        Arg::with_name("port")
-                            .long("port")
-                            .help("port")
-                            .takes_value(true)
-                            .required(true),
-                    )
-                    .arg(
-                        Arg::with_name("cid")
-                            .long("cid")
-                            .help("cid")
-                            .takes_value(true)
-                            .required(true),
-                    )
-                    .arg(
-                        Arg::with_name("command")
+                        Arg::new("command")
                             .long("command")
                             .help("command")
-                            .takes_value(true)
                             .required(true),
                     )
                     .arg(
-                        Arg::with_name("no-wait")
+                        Arg::new("no-wait")
                             .long("no-wait")
                             .help("command-executer won't wait the command's result")
-                            .takes_value(false),
+                            .action(ArgAction::SetTrue),
                     ),
             )
             .subcommand(
-                SubCommand::with_name("recv-file")
+                Command::new("recv-file")
                     .about("Receive a file from the enclave")
+                    .arg(Arg::new("port").long("port").help("port").required(true))
+                    .arg(Arg::new("cid").long("cid").help("cid").required(true))
                     .arg(
-                        Arg::with_name("port")
-                            .long("port")
-                            .help("port")
-                            .takes_value(true)
-                            .required(true),
-                    )
-                    .arg(
-                        Arg::with_name("cid")
-                            .long("cid")
-                            .help("cid")
-                            .takes_value(true)
-                            .required(true),
-                    )
-                    .arg(
-                        Arg::with_name("localpath")
+                        Arg::new("localpath")
                             .long("localpath")
                             .help("localpath")
-                            .takes_value(true)
                             .required(true),
                     )
                     .arg(
-                        Arg::with_name("remotepath")
+                        Arg::new("remotepath")
                             .long("remotepath")
                             .help("remotepath")
-                            .takes_value(true)
                             .required(true),
                     ),
             )
             .subcommand(
-                SubCommand::with_name("send-file")
+                Command::new("send-file")
                     .about("Send a file to the enclave")
+                    .arg(Arg::new("port").long("port").help("port").required(true))
+                    .arg(Arg::new("cid").long("cid").help("cid").required(true))
                     .arg(
-                        Arg::with_name("port")
-                            .long("port")
-                            .help("port")
-                            .takes_value(true)
-                            .required(true),
-                    )
-                    .arg(
-                        Arg::with_name("cid")
-                            .long("cid")
-                            .help("cid")
-                            .takes_value(true)
-                            .required(true),
-                    )
-                    .arg(
-                        Arg::with_name("localpath")
+                        Arg::new("localpath")
                             .long("localpath")
                             .help("localpath")
-                            .takes_value(true)
                             .required(true),
                     )
                     .arg(
-                        Arg::with_name("remotepath")
+                        Arg::new("remotepath")
                             .long("remotepath")
                             .help("remotepath")
-                            .takes_value(true)
                             .required(true),
                     ),
             )
diff --git a/src/common/commands_parser.rs b/src/common/commands_parser.rs
index 78009196..913e75b1 100644
--- a/src/common/commands_parser.rs
+++ b/src/common/commands_parser.rs
@@ -42,7 +42,7 @@ pub struct RunEnclavesArgs {
 impl RunEnclavesArgs {
     /// Construct a new `RunEnclavesArgs` instance from the given command-line arguments.
     pub fn new_with(args: &ArgMatches) -> NitroCliResult {
-        if let Some(config_file) = args.value_of("config") {
+        if let Some(config_file) = args.get_one::("config") {
             let file = File::open(config_file).map_err(|err| {
                 new_nitro_cli_failure!(
                     &format!("Failed to open config file: {:?}", err),
@@ -237,7 +237,7 @@ impl DescribeEnclavesArgs {
     /// Construct a new `DescribeEnclavesArgs` instance from the given command-line arguments.
     pub fn new_with(args: &ArgMatches) -> Self {
         DescribeEnclavesArgs {
-            metadata: args.is_present("metadata"),
+            metadata: args.get_flag("metadata"),
         }
     }
 }
@@ -270,7 +270,7 @@ pub struct PcrArgs {
 impl PcrArgs {
     /// Construct a new `PcrArgs` instance from the given command-line arguments.
     pub fn new_with(args: &ArgMatches) -> NitroCliResult {
-        let (val_name, pcr_type) = match args.is_present("signing-certificate") {
+        let (val_name, pcr_type) = match args.contains_id("signing-certificate") {
             true => ("signing-certificate", PcrType::SigningCertificate),
             false => ("input", PcrType::DefaultType),
         };
@@ -282,13 +282,13 @@ impl PcrArgs {
 
 /// Parse file path to hash from the command-line arguments.
 fn parse_file_path(args: &ArgMatches, val_name: &str) -> NitroCliResult {
-    let path = args.value_of(val_name).ok_or_else(|| {
+    let path = args.get_one::(val_name).ok_or_else(|| {
         new_nitro_cli_failure!(
             "`input` or `signing-certificate` argument not found",
             NitroCliErrorEnum::MissingArgument
         )
     })?;
-    Ok(path.to_string())
+    Ok(path.into())
 }
 
 #[derive(Debug)]
@@ -332,7 +332,7 @@ impl FromStr for MemoryUnit {
 /// # Arguments
 /// * `args` - The command-line arguments.
 pub fn parse_memory(args: &ArgMatches) -> NitroCliResult {
-    let memory = args.value_of("memory").ok_or_else(|| {
+    let memory = args.get_one::("memory").ok_or_else(|| {
         new_nitro_cli_failure!(
             "`memory` argument not found",
             NitroCliErrorEnum::MissingArgument
@@ -341,7 +341,7 @@ pub fn parse_memory(args: &ArgMatches) -> NitroCliResult {
 
     let (num_str, size_str) = match memory.find(|c: char| !c.is_numeric()) {
         Some(index) => memory.split_at(index),
-        None => (memory, ""),
+        None => (memory.as_str(), ""),
     };
     let num = num_str.parse::().map_err(|_| {
         new_nitro_cli_failure!(
@@ -363,17 +363,17 @@ pub fn parse_memory(args: &ArgMatches) -> NitroCliResult {
 
 /// Parse the Docker tag from the command-line arguments.
 fn parse_docker_tag(args: &ArgMatches) -> Option {
-    args.value_of("docker-uri").map(|val| val.to_string())
+    args.get_one::("docker-uri").map(String::from)
 }
 
 /// Parse the Docker directory from the command-line arguments.
 fn parse_docker_dir(args: &ArgMatches) -> Option {
-    args.value_of("docker-dir").map(|val| val.to_string())
+    args.get_one::("docker-dir").map(String::from)
 }
 
 /// Parse the enclave's required CID from the command-line arguments.
 fn parse_enclave_cid(args: &ArgMatches) -> NitroCliResult> {
-    let enclave_cid = if let Some(enclave_cid) = args.value_of("enclave-cid") {
+    let enclave_cid = if let Some(enclave_cid) = args.get_one::("enclave-cid") {
         let enclave_cid: u64 = enclave_cid.parse().map_err(|_| {
             new_nitro_cli_failure!(
                 "`enclave-cid` is not a number",
@@ -445,38 +445,35 @@ fn parse_enclave_cid(args: &ArgMatches) -> NitroCliResult> {
 
 /// Parse the enclave image file path from the command-line arguments.
 fn parse_eif_path(args: &ArgMatches) -> NitroCliResult {
-    let eif_path = args.value_of("eif-path").ok_or_else(|| {
+    let eif_path = args.get_one::("eif-path").ok_or_else(|| {
         new_nitro_cli_failure!(
             "`eif-path` argument not found",
             NitroCliErrorEnum::MissingArgument
         )
     })?;
-    Ok(eif_path.to_string())
+    Ok(eif_path.into())
 }
 
 /// Parse the enclave's ID from the command-line arguments.
 fn parse_enclave_id(args: &ArgMatches) -> NitroCliResult {
-    let enclave_id = args.value_of("enclave-id").ok_or_else(|| {
+    let enclave_id = args.get_one::("enclave-id").ok_or_else(|| {
         new_nitro_cli_failure!(
             "`enclave-id` argument not found",
             NitroCliErrorEnum::MissingArgument
         )
     })?;
-    Ok(enclave_id.to_string())
+    Ok(enclave_id.into())
 }
 
 /// Parse the disconnect timeout from the command-line arguments.
 fn parse_disconnect_timeout(args: &ArgMatches) -> NitroCliResult> {
-    let disconnect_timeout = match args.value_of("disconnect-timeout") {
+    let disconnect_timeout = match args.get_one::("disconnect-timeout") {
         Some(arg) => Some(arg.parse::().map_err(|_| {
             new_nitro_cli_failure!(
                 "`disconnect-timeout` argument can't be parsed as a number",
                 NitroCliErrorEnum::InvalidArgument
             )
-            .add_info(vec![
-                "disconnect-timeout",
-                args.value_of("disconnect-timeout").unwrap(),
-            ])
+            .add_info(vec!["disconnect-timeout", arg])
         })?),
         None => None,
     };
@@ -485,85 +482,81 @@ fn parse_disconnect_timeout(args: &ArgMatches) -> NitroCliResult> {
 
 /// Parse the list of requested CPU IDs from the command-line arguments.
 fn parse_cpu_ids(args: &ArgMatches) -> NitroCliResult>> {
-    let cpu_ids_arg = args.values_of("cpu-ids");
-    match cpu_ids_arg {
-        Some(iterator) => {
-            let mut cpu_ids = Vec::new();
-            for cpu_id in iterator {
-                cpu_ids.push(cpu_id.parse().map_err(|_| {
-                    new_nitro_cli_failure!(
-                        "`cpu-id` is not a number",
-                        NitroCliErrorEnum::InvalidArgument
-                    )
-                    .add_info(vec!["cpu-id", cpu_id])
-                })?);
-            }
-            Ok(Some(cpu_ids))
-        }
-        None => Ok(None),
-    }
+    args.get_many::("cpu-ids")
+        .map(|values| {
+            values
+                .map(|id| {
+                    id.parse().map_err(|_| {
+                        new_nitro_cli_failure!(
+                            "`cpu-id` is not a number",
+                            NitroCliErrorEnum::InvalidArgument
+                        )
+                        .add_info(vec!["cpu-id", id])
+                    })
+                })
+                .collect()
+        })
+        .transpose()
 }
 
 /// Parse the requested number of CPUs from the command-line arguments.
 fn parse_cpu_count(args: &ArgMatches) -> NitroCliResult> {
-    let cpu_count = if let Some(cpu_count) = args.value_of("cpu-count") {
-        let cpu_count: u32 = cpu_count.parse().map_err(|_| {
-            new_nitro_cli_failure!(
-                "`cpu-count` is not a number",
-                NitroCliErrorEnum::InvalidArgument
-            )
-            .add_info(vec!["cpu-count", cpu_count])
-        })?;
-        Some(cpu_count)
-    } else {
-        None
-    };
-    Ok(cpu_count)
+    args.get_one::("cpu-count")
+        .map(|count| {
+            count.parse().map_err(|_| {
+                new_nitro_cli_failure!(
+                    "`cpu-count` is not a number",
+                    NitroCliErrorEnum::InvalidArgument
+                )
+                .add_info(vec!["cpu-count", count])
+            })
+        })
+        .transpose()
 }
 
 /// Parse the path of an output file from the command-line arguments.
 fn parse_output(args: &ArgMatches) -> Option {
-    args.value_of("output-file").map(|val| val.to_string())
+    args.get_one::("output-file").map(String::from)
 }
 
 /// Parse the debug-mode flag from the command-line arguments.
 fn debug_mode(args: &ArgMatches) -> bool {
-    args.is_present("debug-mode") || args.is_present("attach-console")
+    args.get_flag("debug-mode") || args.get_flag("attach-console")
 }
 
 /// Parse the attach-console flag from the command-line arguments.
 fn attach_console(args: &ArgMatches) -> bool {
-    args.is_present("attach-console")
+    args.get_flag("attach-console")
 }
 
 /// Parse the enclave name from the command-line arguments.
 fn parse_enclave_name(args: &ArgMatches) -> NitroCliResult> {
-    Ok(args.value_of("enclave-name").map(|e| e.to_string()))
+    Ok(args.get_one::("enclave-name").map(String::from))
 }
 
 fn parse_signing_certificate(args: &ArgMatches) -> Option {
-    args.value_of("signing-certificate")
-        .map(|val| val.to_string())
+    args.get_one::("signing-certificate")
+        .map(String::from)
 }
 
 fn parse_private_key(args: &ArgMatches) -> Option {
-    args.value_of("private-key").map(|val| val.to_string())
+    args.get_one::("private-key").map(String::from)
 }
 
 fn parse_image_name(args: &ArgMatches) -> Option {
-    args.value_of("image_name").map(|val| val.to_string())
+    args.get_one::("image_name").map(String::from)
 }
 
 fn parse_image_version(args: &ArgMatches) -> Option {
-    args.value_of("image_version").map(|val| val.to_string())
+    args.get_one::("image_version").map(String::from)
 }
 
 fn parse_metadata(args: &ArgMatches) -> Option {
-    args.value_of("metadata").map(|val| val.to_string())
+    args.get_one::("metadata").map(String::from)
 }
 
 fn parse_error_code_str(args: &ArgMatches) -> NitroCliResult {
-    let error_code_str = args.value_of("error-code").ok_or_else(|| {
+    let error_code_str = args.get_one::("error-code").ok_or_else(|| {
         new_nitro_cli_failure!(
             "`error-code` argument not found",
             NitroCliErrorEnum::MissingArgument
@@ -579,15 +572,17 @@ mod tests {
     use crate::common::construct_error_message;
     use crate::create_app;
 
-    use clap::{App, AppSettings, Arg, SubCommand};
+    use clap::{Arg, Command};
 
     /// Parse the path of the JSON config file
     fn parse_config_file(args: &ArgMatches) -> NitroCliResult {
-        let config_file = args.value_of("config").ok_or(new_nitro_cli_failure!(
-            "`config` argument not found",
-            NitroCliErrorEnum::MissingArgument
-        ))?;
-        Ok(config_file.to_string())
+        let config_file = args
+            .get_one::("config")
+            .ok_or(new_nitro_cli_failure!(
+                "`config` argument not found",
+                NitroCliErrorEnum::MissingArgument
+            ))?;
+        Ok(config_file.into())
     }
 
     #[test]
@@ -604,7 +599,7 @@ mod tests {
             "non_existing_eif.eif",
         ];
 
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_memory(
@@ -632,7 +627,7 @@ mod tests {
             "non_existing_eif.eif",
         ];
 
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_memory(
@@ -656,7 +651,7 @@ mod tests {
             "non_existing_eif.eif",
         ];
 
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_memory(
@@ -680,7 +675,7 @@ mod tests {
             "non_existing_eif.eif",
         ];
 
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_memory(
@@ -704,7 +699,7 @@ mod tests {
             "non_existing_eif.eif",
         ];
 
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_memory(
@@ -730,7 +725,7 @@ mod tests {
             "--output-file",
             "sample_eif.eif",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_docker_tag(
@@ -757,7 +752,7 @@ mod tests {
             "--output-file",
             "sample_eif.eif",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_docker_dir(
@@ -786,7 +781,7 @@ mod tests {
             "--enclave-cid",
             "10",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_enclave_cid(
@@ -818,7 +813,7 @@ mod tests {
             "--enclave-cid",
             "0",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_enclave_cid(
@@ -850,7 +845,7 @@ mod tests {
             "--enclave-cid",
             "0x1g",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_enclave_cid(
@@ -883,7 +878,7 @@ mod tests {
             "--enclave-cid",
             &cid_local,
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_enclave_cid(
@@ -916,7 +911,7 @@ mod tests {
             "--enclave-cid",
             &cid_host,
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_enclave_cid(
@@ -949,7 +944,7 @@ mod tests {
             "--enclave-cid",
             &parent_vm_cid,
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_enclave_cid(
@@ -981,7 +976,7 @@ mod tests {
             "--enclave-cid",
             "-18",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         // Error (got unexpected value ["-1"])
         assert!(matches.is_err());
     }
@@ -999,7 +994,7 @@ mod tests {
             "--eif-path",
             "non_existing_eif.eif",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_eif_path(
@@ -1022,7 +1017,7 @@ mod tests {
             "--enclave-id",
             "i-0000-enc-1234",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_enclave_id(
@@ -1050,7 +1045,7 @@ mod tests {
             "--memory",
             "64",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_cpu_ids(
@@ -1082,7 +1077,7 @@ mod tests {
             "non_existing_eif.eif",
             "--memory 64",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         // Error (got unexpected value ["-5"])
         assert!(matches.is_err());
     }
@@ -1101,7 +1096,7 @@ mod tests {
             "--memory",
             "64",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_cpu_ids(
@@ -1131,7 +1126,7 @@ mod tests {
             "--memory",
             "64",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_cpu_count(
@@ -1161,7 +1156,7 @@ mod tests {
             "--memory",
             "64",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_cpu_count(
@@ -1191,7 +1186,7 @@ mod tests {
             "--output-file",
             "sample_eif.eif",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_output(
@@ -1216,7 +1211,7 @@ mod tests {
             "--docker-dir",
             "/home/user/non_existing_dir",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         // Error (the following required argument were not supplied)
         assert!(matches.is_err());
     }
@@ -1235,7 +1230,7 @@ mod tests {
             "non_existing_eif.eif",
             "--debug-mode",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = debug_mode(
@@ -1261,7 +1256,7 @@ mod tests {
             "--eif-path",
             "non_existing_eif.eif",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = debug_mode(
@@ -1288,7 +1283,7 @@ mod tests {
             "--eif-path",
             "non_existing_eif.eif",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let matches = matches
@@ -1311,7 +1306,7 @@ mod tests {
             "--config",
             "non_existing_config.json",
         ];
-        let matches = app.get_matches_from_safe(args);
+        let matches = app.try_get_matches_from(args);
         assert!(matches.is_ok());
 
         let result = parse_config_file(
diff --git a/src/common/mod.rs b/src/common/mod.rs
index 48ac0983..b329b95f 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -474,7 +474,8 @@ where
     T: Serialize,
 {
     // Serialize the command type.
-    let cmd_bytes = serde_cbor::to_vec(&cmd).map_err(|e| {
+    let mut cmd_bytes = Vec::new();
+    ciborium::ser::into_writer(&cmd, &mut cmd_bytes).map_err(|e| {
         new_nitro_cli_failure!(
             &format!("Invalid command format: {:?}", e),
             NitroCliErrorEnum::InvalidCommand
@@ -496,7 +497,8 @@ where
 
     // Serialize the command arguments.
     if let Some(args) = args {
-        let arg_bytes = serde_cbor::to_vec(args).map_err(|e| {
+        let mut arg_bytes = Vec::new();
+        ciborium::ser::into_writer(args, &mut arg_bytes).map_err(|e| {
             new_nitro_cli_failure!(
                 &format!("Invalid single command arguments: {:?}", e),
                 NitroCliErrorEnum::InvalidCommand
@@ -526,18 +528,13 @@ where
         .map_err(|e| e.add_subaction("Failed to receive data size".to_string()))?
         as usize;
     let mut raw_data: Vec = vec![0; size];
-    input_stream.read_exact(&mut raw_data[..]).map_err(|e| {
-        new_nitro_cli_failure!(
-            &format!("Failed to receive data: {:?}", e),
-            NitroCliErrorEnum::SocketError
-        )
-    })?;
-    let data: T = serde_cbor::from_slice(&raw_data[..]).map_err(|e| {
-        new_nitro_cli_failure!(
-            &format!("Failed to decode received data: {:?}", e),
-            NitroCliErrorEnum::SerdeError
-        )
-    })?;
+    let data: T =
+        ciborium::de::from_reader_with_buffer(input_stream, &mut raw_data[..]).map_err(|e| {
+            new_nitro_cli_failure!(
+                &format!("Failed to decode received data: {:?}", e),
+                NitroCliErrorEnum::SerdeError
+            )
+        })?;
     Ok(data)
 }
 
diff --git a/src/enclave_proc/connection.rs b/src/enclave_proc/connection.rs
index 458ae1b7..472d03e3 100644
--- a/src/enclave_proc/connection.rs
+++ b/src/enclave_proc/connection.rs
@@ -309,7 +309,8 @@ impl Connection {
         }
 
         let mut stream = lock.input_stream.as_mut().unwrap();
-        let reply_bytes = serde_cbor::to_vec(reply).map_err(|e| {
+        let mut reply_bytes = Vec::new();
+        ciborium::into_writer(reply, &mut reply_bytes).map_err(|e| {
             new_nitro_cli_failure!(
                 &format!("Failed to serialize reply: {:?}", e),
                 NitroCliErrorEnum::SerdeError
diff --git a/src/lib.rs b/src/lib.rs
index 818c722f..c9b9a5ef 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -577,65 +577,54 @@ pub fn get_file_pcr(path: String, pcr_type: PcrType) -> NitroCliResult {
-        App::new("Nitro CLI")
+        Command::new("Nitro CLI")
             .about("CLI for enclave lifetime management")
-            .setting(AppSettings::ArgRequiredElseHelp)
-            .version(env!("CARGO_PKG_VERSION"))
+            .arg_required_else_help(true)
             .subcommand(
-                SubCommand::with_name("run-enclave")
+                Command::new("run-enclave")
                     .about("Starts a new enclave")
                     .arg(
-                        Arg::with_name("cpu-ids")
+                        Arg::new("cpu-ids")
                             .long("cpu-ids")
                             .help("List of cpu-ids that will be provided to the enclave")
-                            .takes_value(true)
-                            .multiple(true)
-                            .min_values(1)
-                            .required_unless("cpu-count")
-                            .required_unless("config")
-                            .conflicts_with("cpu-count")
-                            .conflicts_with("config"),
+                            .num_args(1..)
+                            .required_unless_present_any(["cpu-count", "config"])
+                            .conflicts_with_all(["cpu-count", "config"]),
                     )
                     .arg(
-                        Arg::with_name("cpu-count")
+                        Arg::new("cpu-count")
                             .long("cpu-count")
                             .help("Number of cpus")
-                            .takes_value(true)
-                            .required_unless("cpu-ids")
-                            .required_unless("config")
-                            .conflicts_with("cpu-ids")
-                            .conflicts_with("config"),
+                            .required_unless_present_any(["cpu-ids", "config"])
+                            .conflicts_with_all(["cpu-ids", "config"]),
                     )
                     .arg(
-                        Arg::with_name("memory")
+                        Arg::new("memory")
                             .long("memory")
                             .help(
                                 "Memory to allocate for the enclave in MB. Depending on the available \
                                 pages, more might be allocated."
                             )
-                            .required_unless("config")
-                            .takes_value(true)
+                            .required_unless_present("config")
                             .conflicts_with("config"),
                     )
                     .arg(
-                        Arg::with_name("eif-path")
+                        Arg::new("eif-path")
                             .long("eif-path")
                             .help("Path pointing to a prebuilt Eif image")
-                            .required_unless("config")
-                            .takes_value(true)
+                            .required_unless_present("config")
                             .conflicts_with("config"),
                     )
                     .arg(
-                        Arg::with_name("enclave-cid")
+                        Arg::new("enclave-cid")
                             .long("enclave-cid")
-                            .takes_value(true)
                             .help("CID to be used for the newly started enclave")
                             .conflicts_with("config"),
                     )
                     .arg(
-                        Arg::with_name("debug-mode")
+                        Arg::new("debug-mode")
                             .long("debug-mode")
-                            .takes_value(false)
+                            .action(clap::ArgAction::SetTrue)
                             .help(
                                 "Starts enclave in debug-mode. This makes the console of the enclave \
                                 available over vsock at CID: VMADDR_CID_HYPERVISOR (0), port: \
@@ -645,196 +634,169 @@ macro_rules! create_app {
                             .conflicts_with("config"),
                     )
                     .arg(
-                        Arg::with_name("attach-console")
+                        Arg::new("attach-console")
                             .long("attach-console")
-                            .takes_value(false)
+                            .action(clap::ArgAction::SetTrue)
                             .help(
                                 "Attach the enclave console immediately after starting the enclave. \
                                 (implies debug-mode)"
                             )
                     )
                     .arg(
-                        Arg::with_name("enclave-name")
+                        Arg::new("enclave-name")
                             .long("enclave-name")
-                            .takes_value(true)
                             .help("Custom name assigned to the enclave by the user")
-                            .required(false)
                             .conflicts_with("config"),
                     )
                     .arg(
-                        Arg::with_name("config")
+                        Arg::new("config")
                             .long("config")
-                            .takes_value(true)
                             .value_name("json-config")
                             .help("Config is used to read enclave settings from JSON file"),
                     ),
             )
             .subcommand(
-                SubCommand::with_name("terminate-enclave")
+                Command::new("terminate-enclave")
                     .about("Terminates an enclave")
                     .arg(
-                        Arg::with_name("enclave-id")
+                        Arg::new("enclave-id")
                             .long("enclave-id")
-                            .takes_value(true)
                             .help("Enclave ID, used to uniquely identify an enclave")
-                            .required_unless("all")
-                            .required_unless("enclave-name")
-                            .conflicts_with("all")
-                            .conflicts_with("enclave-name"),
+                            .required_unless_present_any(["all", "enclave-name"])
+                            .conflicts_with_all(["all", "enclave-name"]),
                     )
                     .arg(
-                        Arg::with_name("all")
+                        Arg::new("all")
                             .long("all")
-                            .takes_value(false)
+                            .action(clap::ArgAction::SetTrue)
                             .help("Terminate all running enclave instances belonging to the current user")
-                            .required_unless("enclave-id")
-                            .required_unless("enclave-name")
-                            .conflicts_with("enclave-id")
-                            .conflicts_with("enclave-name"),
+                            .required_unless_present_any(["enclave-id", "enclave-name"])
+                            .conflicts_with_all(["enclave-id", "enclave-name"]),
                     )
                     .arg(
-                        Arg::with_name("enclave-name")
+                        Arg::new("enclave-name")
                             .long("enclave-name")
-                            .takes_value(true)
                             .help("Enclave name, used to uniquely identify an enclave")
-                            .required_unless("enclave-id")
-                            .required_unless("all")
-                            .conflicts_with("enclave-id")
-                            .conflicts_with("all"),
+                            .required_unless_present_any(["enclave-id", "all"])
+                            .conflicts_with_all(["enclave-id", "all"]),
                     ),
             )
             .subcommand(
-                SubCommand::with_name("build-enclave")
+                Command::new("build-enclave")
                     .about("Builds an enclave image and saves it to a file")
                     .arg(
-                        Arg::with_name("docker-uri")
+                        Arg::new("docker-uri")
                             .long("docker-uri")
                             .help(
-                                "Uri pointing to an existing docker container or to be created  \
-                                 locally when docker-dir is present",
+                                "Uri pointing to an existing docker container or to be created \
+                                locally when docker-dir is present"
                             )
-                            .required(true)
-                            .takes_value(true),
+                            .required(true),
                     )
                     .arg(
-                        Arg::with_name("docker-dir")
+                        Arg::new("docker-dir")
                             .long("docker-dir")
-                            .help("Local path to a directory containing a Dockerfile")
-                            .takes_value(true),
+                            .help("Local path to a directory containing a Dockerfile"),
                     )
                     .arg(
-                        Arg::with_name("output-file")
+                        Arg::new("output-file")
                             .long("output-file")
                             .help("Location where the Enclave Image should be saved")
-                            .group("action")
-                            .required(true)
-                            .takes_value(true),
+                            .required(true),
                     )
                     .arg(
-                        Arg::with_name("signing-certificate")
+                        Arg::new("signing-certificate")
                             .long("signing-certificate")
-                            .help("Local path to developer's X509 signing certificate.")
-                            .takes_value(true),
+                            .help("Local path to developer's X509 signing certificate."),
                     )
                     .arg(
-                        Arg::with_name("private-key")
+                        Arg::new("private-key")
                             .long("private-key")
-                            .help("Local path to developer's Eliptic Curve private key.")
-                            .takes_value(true),
+                            .help("Local path to developer's Eliptic Curve private key."),
                     )
                     .arg(
-                        Arg::with_name("image_name")
+                        Arg::new("image_name")
                             .long("name")
-                            .help("Name for enclave image")
-                            .takes_value(true),
+                            .help("Name for enclave image"),
                     )
                     .arg(
-                        Arg::with_name("image_version")
+                        Arg::new("image_version")
                             .long("version")
-                            .help("Version of the enclave image")
-                            .takes_value(true),
+                            .help("Version of the enclave image"),
                     )
                     .arg(
-                        Arg::with_name("metadata")
+                        Arg::new("metadata")
                             .long("metadata")
-                            .help("Path to JSON containing the custom metadata provided by the user.")
-                            .takes_value(true),
+                            .help("Path to JSON containing the custom metadata provided by the user."),
                     ),
             )
             .subcommand(
-                SubCommand::with_name("describe-eif")
+                Command::new("describe-eif")
                     .about("Returns information about the EIF found at a given path.")
                     .arg(
-                        Arg::with_name("eif-path")
+                        Arg::new("eif-path")
                             .long("eif-path")
                             .help("Path to the EIF to describe.")
-                            .required(true)
-                            .takes_value(true),
+                            .required(true),
                     ),
             )
             .subcommand(
-                SubCommand::with_name("describe-enclaves")
+                Command::new("describe-enclaves")
                     .about("Returns a list of the running enclaves")
                     .arg(
-                        Arg::with_name("metadata")
+                        Arg::new("metadata")
                             .long("metadata")
                             .help("Adds EIF metadata of the current enclaves to the command output.")
+                            .action(clap::ArgAction::SetTrue)
                         ),
             )
             .subcommand(
-                SubCommand::with_name("console")
+                Command::new("console")
                     .about("Connect to the console of an enclave")
                     .arg(
-                        Arg::with_name("enclave-id")
+                        Arg::new("enclave-id")
                             .long("enclave-id")
-                            .takes_value(true)
                             .help("Enclave ID, used to uniquely identify an enclave")
-                            .required_unless("enclave-name")
+                            .required_unless_present("enclave-name")
                             .conflicts_with("enclave-name"),
                     )
                     .arg(
-                        Arg::with_name("disconnect-timeout")
+                        Arg::new("disconnect-timeout")
                             .long("disconnect-timeout")
-                            .takes_value(true)
-                            .help("The time in seconds after the console disconnects from the enclave")
-                            .required(false)
+                            .help("The time in seconds after the console disconnects from the enclave"),
                     )
                     .arg(
-                        Arg::with_name("enclave-name")
+                        Arg::new("enclave-name")
                             .long("enclave-name")
-                            .takes_value(true)
                             .help("Enclave name, used to uniquely identify an enclave")
-                            .required_unless("enclave-id")
+                            .required_unless_present("enclave-id")
                             .conflicts_with("enclave-id"),
                     ),
             )
             .subcommand(
-                SubCommand::with_name("pcr")
+                Command::new("pcr")
                     .about("Return the PCR hash value of the given input")
                     .arg(
-                        Arg::with_name("signing-certificate")
+                        Arg::new("signing-certificate")
                             .long("signing-certificate")
-                            .takes_value(true)
                             .help("Takes the path to the '.pem' signing certificate and returns PCR8. Can be used to identify the certificate used to sign an EIF")
-                            .required_unless("input")
+                            .required_unless_present("input")
                             .conflicts_with("input"),
                     )
                     .arg(
-                        Arg::with_name("input")
+                        Arg::new("input")
                             .long("input")
-                            .takes_value(true)
                             .help("Given a path to a file, returns the PCR hash of the bytes it contains")
-                            .required_unless("signing-certificate")
+                            .required_unless_present("signing-certificate")
                             .conflicts_with("signing-certificate"),
                     ),
             )
             .subcommand(
-                SubCommand::with_name("explain")
+                Command::new("explain")
                     .about("Display detailed information about an error returned by a misbehaving Nitro CLI command")
                     .arg(
-                        Arg::with_name("error-code")
+                        Arg::new("error-code")
                             .long("error-code")
-                            .takes_value(true)
                             .help("Error code, as returned by the misbehaving Nitro CLI command")
                             .required(true),
                     ),
diff --git a/src/main.rs b/src/main.rs
index 3c46d6b4..f4c8cfc8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,7 @@
 
 extern crate lazy_static;
 
-use clap::{App, AppSettings, Arg, SubCommand};
+use clap::{Arg, Command};
 use log::info;
 use std::os::unix::net::UnixStream;
 
@@ -45,11 +45,11 @@ const FILE_PCR_STR: &str = "File PCR";
 
 /// *Nitro CLI* application entry point.
 fn main() {
-    let version_str: String = env!("CARGO_PKG_VERSION").to_string();
+    let version_str = env!("CARGO_PKG_VERSION");
 
     // Command-line specification for the Nitro CLI.
     let mut app = create_app!();
-    app = app.version(&*version_str);
+    app = app.version(version_str);
     let args = app.get_matches();
     let logger = logger::init_logger()
         .map_err(|e| e.set_action("Logger initialization".to_string()))
@@ -136,7 +136,7 @@ fn main() {
             }
         }
         Some(("terminate-enclave", args)) => {
-            if args.is_present("all") {
+            if args.get_flag("all") {
                 terminate_all_enclaves()
                     .map_err(|e| {
                         e.add_subaction("Failed to terminate all running enclaves".to_string())
@@ -229,8 +229,8 @@ fn main() {
         }
         Some(("describe-eif", args)) => {
             let eif_path = args
-                .value_of("eif-path")
-                .map(|val| val.to_string())
+                .get_one::("eif-path")
+                .map(String::from)
                 .unwrap();
             describe_eif(eif_path)
                 .map_err(|e| {
diff --git a/tests/test_nitro_cli_args.rs b/tests/test_nitro_cli_args.rs
index e68f625b..023bd1c3 100644
--- a/tests/test_nitro_cli_args.rs
+++ b/tests/test_nitro_cli_args.rs
@@ -4,7 +4,7 @@
 
 #[cfg(test)]
 mod test_nitro_cli_args {
-    use clap::{App, AppSettings, Arg, SubCommand};
+    use clap::{Arg, Command};
     use nitro_cli::create_app;
 
     #[test]
@@ -12,7 +12,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "terminate-enclave"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -20,7 +20,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "terminate-enclave", "--enclave-id"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -33,7 +33,7 @@ mod test_nitro_cli_args {
             "i-1234_enc123",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -47,7 +47,7 @@ mod test_nitro_cli_args {
             "135",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -60,7 +60,7 @@ mod test_nitro_cli_args {
             "testName",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -68,7 +68,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "terminate-enclave", "--enclave-name"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -82,7 +82,7 @@ mod test_nitro_cli_args {
             "name2",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -90,7 +90,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "describe-enclaves"];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -98,7 +98,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "describe-enclaves", "--metadata"];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -106,7 +106,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "describe-eif", "--eif-path", "dir/image.eif"];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -114,7 +114,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "describe-eif", "--eif-path"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -122,7 +122,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "console"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -130,7 +130,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "console", "--enclave-id"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -138,7 +138,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "console", "--enclave-id", "i-1234_enc123"];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -152,7 +152,7 @@ mod test_nitro_cli_args {
             "135",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -160,7 +160,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "console", "--enclave-name", "testName"];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -168,7 +168,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "console", "--enclave-name"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -176,7 +176,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "console", "--enclave-name", "name1", "name2"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -191,7 +191,7 @@ mod test_nitro_cli_args {
             "10",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -206,7 +206,7 @@ mod test_nitro_cli_args {
             "10",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -220,7 +220,7 @@ mod test_nitro_cli_args {
             "--disconnect-timeout",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -228,7 +228,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "build-enclave", "--output-file", "image.eif"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -243,7 +243,7 @@ mod test_nitro_cli_args {
             "image.eif",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -256,7 +256,7 @@ mod test_nitro_cli_args {
             "dkr.ecr.us-east-1.amazonaws.com/stronghold-develss",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -273,7 +273,7 @@ mod test_nitro_cli_args {
             "image.eif",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -294,7 +294,7 @@ mod test_nitro_cli_args {
             "key.pem",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -317,7 +317,7 @@ mod test_nitro_cli_args {
             "meta.json",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -339,7 +339,7 @@ mod test_nitro_cli_args {
             "--metadata",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -360,7 +360,7 @@ mod test_nitro_cli_args {
             "--debug-mode",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -378,7 +378,7 @@ mod test_nitro_cli_args {
             "--debug-mode",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -397,7 +397,7 @@ mod test_nitro_cli_args {
             "--debug-mode",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -418,7 +418,7 @@ mod test_nitro_cli_args {
             "--debug-mode",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -436,7 +436,7 @@ mod test_nitro_cli_args {
             "--debug-mode",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -452,7 +452,7 @@ mod test_nitro_cli_args {
             "dir/image.eif",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -470,7 +470,7 @@ mod test_nitro_cli_args {
             "--enclave-cid",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -491,7 +491,7 @@ mod test_nitro_cli_args {
             "123",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -506,7 +506,7 @@ mod test_nitro_cli_args {
             "512",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -523,7 +523,7 @@ mod test_nitro_cli_args {
             "--eif-path",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -531,7 +531,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "run-enclave", "--config"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -545,7 +545,7 @@ mod test_nitro_cli_args {
             "config2.json",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -564,7 +564,7 @@ mod test_nitro_cli_args {
             "dir/image.eif",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -587,7 +587,7 @@ mod test_nitro_cli_args {
             "testName",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 
     #[test]
@@ -609,7 +609,7 @@ mod test_nitro_cli_args {
             "--enclave-name",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -617,7 +617,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "pcr", "--input"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -625,7 +625,7 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "pcr", "--signing-certificate"];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -640,7 +640,7 @@ mod test_nitro_cli_args {
             "test.bin",
         ];
 
-        assert!(app.get_matches_from_safe(args).is_err())
+        assert!(app.try_get_matches_from(args).is_err())
     }
 
     #[test]
@@ -648,6 +648,6 @@ mod test_nitro_cli_args {
         let app = create_app!();
         let args = vec!["nitro cli", "pcr", "--signing-certificate", "cert.pem"];
 
-        assert!(app.get_matches_from_safe(args).is_ok())
+        assert!(app.try_get_matches_from(args).is_ok())
     }
 }
diff --git a/tools/Dockerfile b/tools/Dockerfile
index fed947b3..66f2def6 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -30,14 +30,17 @@ RUN cd /tmp/openssl_src/openssl-${OPENSSL_VERSION} &&  \
 	make install_sw
 
 # Setup the right rust ver
-ENV RUST_VERSION=1.68.2
+ENV RUST_VERSION=1.71.1
 RUN  source $HOME/.cargo/env && \
-	ARCH=$(uname -m) && \
-	rustup toolchain install ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
-	rustup default ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
-	rustup target add --toolchain ${RUST_VERSION} ${ARCH}-unknown-linux-musl && \
-	cargo install cargo-audit --version 0.17.6 --locked &&  \
-	cargo install cargo-about --version 0.5.6 --locked
+    ARCH=$(uname -m) && \
+    # Install and set 1.71.1 as default
+    rustup toolchain install ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
+    rustup default ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
+    rustup target add --toolchain ${RUST_VERSION} ${ARCH}-unknown-linux-musl && \
+    # Install stable toolchain (needed to run fresh cargo-about)
+    rustup toolchain install stable-${ARCH}-unknown-linux-gnu && \
+	cargo +stable install cargo-about --version 0.6.6 --locked && \
+    cargo install cargo-audit --version 0.17.6 --locked
 
 # Install docker for nitro-cli build-enclave runs
 RUN apt-get update && \
diff --git a/vsock_proxy/Cargo.toml b/vsock_proxy/Cargo.toml
index c27c3e77..5ba8cf4b 100644
--- a/vsock_proxy/Cargo.toml
+++ b/vsock_proxy/Cargo.toml
@@ -3,19 +3,19 @@ name = "vsock-proxy"
 version = "1.0.1"
 authors = ["The AWS Nitro Enclaves Team "]
 edition = "2018"
-rust-version = "1.68"
+rust-version = "1.71"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 chrono = "0.4"
-clap = "3.2"
+clap = "~4.4"
 env_logger = "0.10"
 hickory-resolver = "0.24"
-idna = "0.3.0"
+idna = "1.0.3"
 log = "0.4"
 nix = "0.26"
-yaml-rust = "0.4.3"
+yaml-rust2 = "0.9"
 threadpool = "1.7.1"
 vsock = "0.3"
 
diff --git a/vsock_proxy/src/main.rs b/vsock_proxy/src/main.rs
index 691c6bfc..0500b195 100644
--- a/vsock_proxy/src/main.rs
+++ b/vsock_proxy/src/main.rs
@@ -6,7 +6,7 @@
 /// Example of usage:
 /// vsock-proxy 8000 127.0.0.1 9000
 ///
-use clap::{App, Arg};
+use clap::{Arg, ArgAction, Command};
 use env_logger::init;
 use log::info;
 
@@ -18,68 +18,64 @@ use vsock_proxy::{
 fn main() -> VsockProxyResult<()> {
     init();
 
-    let matches = App::new("Vsock-TCP proxy")
+    let matches = Command::new("Vsock-TCP proxy")
         .about("Vsock-TCP proxy")
         .version(env!("CARGO_PKG_VERSION"))
         .arg(
-            Arg::with_name("ipv4")
+            Arg::new("ipv4")
                 .short('4')
                 .long("ipv4")
                 .help("Force the proxy to use IPv4 addresses only.")
-                .required(false),
+                .action(ArgAction::SetTrue),
         )
         .arg(
-            Arg::with_name("ipv6")
+            Arg::new("ipv6")
                 .short('6')
                 .long("ipv6")
                 .help("Force the proxy to use IPv6 addresses only.")
-                .required(false)
+                .action(ArgAction::SetTrue)
                 .conflicts_with("ipv4"),
         )
         .arg(
-            Arg::with_name("workers")
+            Arg::new("workers")
                 .short('w')
                 .long("num_workers")
                 .help("Set the maximum number of simultaneous\nconnections supported.")
-                .required(false)
-                .takes_value(true)
                 .default_value("4"),
         )
         .arg(
-            Arg::with_name("local_port")
+            Arg::new("local_port")
                 .help("Local Vsock port to listen for incoming connections.")
                 .required(true),
         )
         .arg(
-            Arg::with_name("remote_addr")
+            Arg::new("remote_addr")
                 .help("Address of the server to be proxyed.")
                 .required(true),
         )
         .arg(
-            Arg::with_name("remote_port")
+            Arg::new("remote_port")
                 .help("Remote TCP port of the server to be proxyed.")
                 .required(true),
         )
         .arg(
-            Arg::with_name("config_file")
+            Arg::new("config_file")
                 .long("config")
                 .help("YAML file containing the services that\ncan be forwarded.\n")
-                .required(false)
-                .takes_value(true)
                 .default_value("/etc/nitro_enclaves/vsock-proxy.yaml"),
         )
         .get_matches();
 
     let local_port = matches
-        .value_of("local_port")
+        .get_one::("local_port")
         // This argument is required, so clap ensures it's available
         .unwrap();
     let local_port = local_port
         .parse::()
         .map_err(|_| "Local port is not valid")?;
 
-    let ipv4_only = matches.is_present("ipv4");
-    let ipv6_only = matches.is_present("ipv6");
+    let ipv4_only = matches.get_flag("ipv4");
+    let ipv6_only = matches.get_flag("ipv6");
     let ip_addr_type: IpAddrType = match (ipv4_only, ipv6_only) {
         (true, false) => IpAddrType::IPAddrV4Only,
         (false, true) => IpAddrType::IPAddrV6Only,
@@ -87,12 +83,12 @@ fn main() -> VsockProxyResult<()> {
     };
 
     let remote_addr = matches
-        .value_of("remote_addr")
+        .get_one::("remote_addr")
         // This argument is required, so clap ensures it's available
         .unwrap();
 
     let remote_port = matches
-        .value_of("remote_port")
+        .get_one::("remote_port")
         // This argument is required, so clap ensures it's available
         .unwrap();
     let remote_port = remote_port
@@ -100,7 +96,7 @@ fn main() -> VsockProxyResult<()> {
         .map_err(|_| "Remote port is not valid")?;
 
     let num_workers = matches
-        .value_of("workers")
+        .get_one::("workers")
         // This argument has a default value, so it is available
         .unwrap();
     let num_workers = num_workers
@@ -112,10 +108,10 @@ fn main() -> VsockProxyResult<()> {
     }
 
     info!("Checking allowlist configuration");
-    let config_file = matches.value_of("config_file");
-    let remote_host = String::from(remote_addr);
-    let _ = check_allowlist(&remote_host, remote_port, config_file, ip_addr_type)
-        .map_err(|err| format!("Error at checking the allowlist: {}", err))?;
+    let config_file = matches.get_one::("config_file").map(String::as_str);
+    let remote_host = remote_addr.to_string();
+    check_allowlist(&remote_host, remote_port, config_file, ip_addr_type)
+        .map_err(|err| format!("Error at checking the allowlist: {err}"))?;
 
     let mut proxy = Proxy::new(
         local_port,
diff --git a/vsock_proxy/src/proxy.rs b/vsock_proxy/src/proxy.rs
index fa7512f1..335818ec 100644
--- a/vsock_proxy/src/proxy.rs
+++ b/vsock_proxy/src/proxy.rs
@@ -13,7 +13,7 @@ use std::net::{IpAddr, SocketAddr, TcpStream};
 use std::os::unix::io::AsRawFd;
 use threadpool::ThreadPool;
 use vsock::{VsockAddr, VsockListener};
-use yaml_rust::YamlLoader;
+use yaml_rust2::YamlLoader;
 
 use crate::dns::DnsResolutionInfo;
 use crate::{dns, IpAddrType, VsockProxyResult};