From a89738d6af7e56687f8c0b819f4aa2eac2675ece Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Oct 2022 15:01:16 -0700 Subject: [PATCH 01/13] flake: WIP --- .cargo/config.toml | 9 - .gitignore | 2 +- Cargo.lock | 1924 ++++++++++++++++++++++++++++++++++++++++++++ flake.lock | 108 +++ flake.nix | 170 ++++ mqtt/Cargo.toml | 5 +- sntp/Cargo.toml | 5 +- 7 files changed, 2210 insertions(+), 13 deletions(-) delete mode 100644 .cargo/config.toml create mode 100644 Cargo.lock create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index c83516f7..00000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,9 +0,0 @@ -[alias] -test-all = "test --features async,chrono,eh0,eh1,eha0,log,num-rational,std,time,w5500-tls" -test-dhcp = "test -p w5500-dhcp --features log,std" -test-ll = "test -p w5500-ll --all-features" -test-hl = "test -p w5500-hl --all-features" -test-mqtt = "test -p w5500-mqtt --features log,std,w5500-tls" -test-regsim = "test -p w5500-regsim --all-features" -test-sntp = "test -p w5500-sntp --features std,log,eh0,eh1,time,chrono,num-rational" -test-tls = "test -p w5500-tls --features log,std" diff --git a/.gitignore b/.gitignore index baa56b84..22811ec7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ target -Cargo.lock +/result* # wireshark *.pcapng diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 00000000..4a67b929 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,1924 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "afl" +version = "0.12.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14c4f38655ef328922eead1656bfe02aa91b5ff3cdb5dac8a3fd0d9b96e857d" +dependencies = [ + "clap", + "fs_extra", + "libc", + "rustc_version 0.4.0", + "tempfile", + "xdg", +] + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "async-trait" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic-polyfill" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c041a8d9751a520ee19656232a18971f18946a7900f1520ee4400002244dd89" +dependencies = [ + "critical-section", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bare-metal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3" +dependencies = [ + "rustc_version 0.2.3", +] + +[[package]] +name = "bare-metal" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603" + +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + +[[package]] +name = "bit_field" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" + +[[package]] +name = "bitfield" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time 0.1.44", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clap" +version = "3.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +dependencies = [ + "atty", + "bitflags", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "const-oid" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cortex-m" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70858629a458fdfd39f9675c4dc309411f2a3f83bede76988d81bf1a0ecee9e0" +dependencies = [ + "bare-metal 0.2.5", + "bitfield", + "embedded-hal 0.2.7", + "volatile-register", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "critical-section" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95da181745b56d4bd339530ec393508910c909c784e8962d15d722bacf0bcbcd" +dependencies = [ + "bare-metal 1.0.0", + "cfg-if", + "cortex-m", + "riscv", +] + +[[package]] +name = "crypto-bigint" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f2b443d17d49dad5ef0ede301c3179cc923b8822f3393b4d2c28c269dd4a122" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cxx" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "data-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" + +[[package]] +name = "defmt" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3a0ae7494d9bff013d7b89471f4c424356a71e9752e0c78abe7e6c608a16bb3" +dependencies = [ + "bitflags", + "defmt-macros", +] + +[[package]] +name = "defmt-macros" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8500cbe4cca056412efce4215a63d0bc20492942aeee695f23b624a53e0a6854" +dependencies = [ + "defmt-parser", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "defmt-parser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0db23d29972d99baa3de2ee2ae3f104c10564a6d05a346eb3f4c4f2c0525a06e" + +[[package]] +name = "der" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +dependencies = [ + "const-oid", +] + +[[package]] +name = "dhcproto" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "656b1fafe9931d897da5f17b40115deaedb0725d9b8d3e67c6f1271d29b07a58" +dependencies = [ + "hex", + "rand", + "thiserror", + "trust-dns-proto 0.21.2", + "url", +] + +[[package]] +name = "digest" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "embedded-hal" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" +dependencies = [ + "nb 0.1.3", + "void", +] + +[[package]] +name = "embedded-hal" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "129b101ddfee640565f7c07b301a31d95aa21e5acef21a491c307139f5fa4c91" + +[[package]] +name = "embedded-hal-async" +version = "0.1.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ab70a3f49fc0ad2ccb824c50fbac3234040c82010cecd93b2f4c1b3efed0de" +dependencies = [ + "embedded-hal 1.0.0-alpha.9", +] + +[[package]] +name = "embedded-hal-mock" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c061879892486c076c52665d6e04e3ce0b2f7bba8250874b5942963d436c65" +dependencies = [ + "embedded-hal 0.2.7", + "nb 0.1.3", +] + +[[package]] +name = "embedded-hal-mock" +version = "0.8.0" +source = "git+https://github.com/newAM/embedded-hal-mock?branch=1.0.0-alpha.9#d8f1cecb83885e5187b35559f5f0bc504b962200" +dependencies = [ + "embedded-hal 1.0.0-alpha.9", + "embedded-hal-nb", +] + +[[package]] +name = "embedded-hal-mock" +version = "0.8.0" +source = "git+https://github.com/newAM/embedded-hal-mock?branch=async#4effcd01550a6b172b1f1eb6d021000fb0a7a105" +dependencies = [ + "embedded-hal 1.0.0-alpha.9", + "embedded-hal-async", + "embedded-hal-nb", +] + +[[package]] +name = "embedded-hal-nb" +version = "1.0.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e0760ec0a3bf76859d5e33f39542af103f157d5b2ecfb00ace56dd461472e3a" +dependencies = [ + "embedded-hal 1.0.0-alpha.9", + "nb 1.0.0", +] + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enum-as-inner" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "ff" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + +[[package]] +name = "ftdi-embedded-hal" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f6a34fd0204ac41761ed1b2c125608b78a10ba1be3f762a310f92fde7ace38a" +dependencies = [ + "embedded-hal 0.2.7", + "embedded-hal 1.0.0-alpha.9", + "embedded-hal-nb", + "ftdi-mpsse", + "libftd2xx", + "nb 1.0.0", +] + +[[package]] +name = "ftdi-mpsse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7cfcda69930a8d2fdcdd7ffb9234fe4c79a8c73934ed4904327d77bfb5078a" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "futures-channel" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" + +[[package]] +name = "futures-io" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" + +[[package]] +name = "futures-task" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" + +[[package]] +name = "futures-util" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "group" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "defmt", + "hash32", + "rustc_version 0.4.0", + "spin", + "stable_deref_trait", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "iana-time-zone" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.135" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" + +[[package]] +name = "libftd2xx" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6ccf251ff9cb123d9b7ce2ee61d9f844e3b09db8025c43a36fd30699e82157" +dependencies = [ + "ftdi-mpsse", + "libftd2xx-ffi", + "log", + "paste", + "static_assertions", +] + +[[package]] +name = "libftd2xx-ffi" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "026ed1a973c38dfe32b1400fbbbee805dd206c6b2a26590e63cb0271fba6e64d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mio" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] +name = "mqttbytes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7bd39d24e28e1544d74ff5746e322a477e52353c8ba7adcaa83d2e760752853" +dependencies = [ + "bytes", +] + +[[package]] +name = "nb" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" +dependencies = [ + "nb 1.0.0", +] + +[[package]] +name = "nb" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "once_cell" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" + +[[package]] +name = "os_str_bytes" +version = "6.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" + +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "p256-cm4" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0f0b0aeacbed02ce7cc31654bb9248c86c4a303510194d92cbb42f0075337d" + +[[package]] +name = "paste" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "riscv" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6907ccdd7a31012b70faf2af85cd9e5ba97657cc3987c4f13f8e4d2c2a088aba" +dependencies = [ + "bare-metal 1.0.0", + "bit_field", + "riscv-target", +] + +[[package]] +name = "riscv-target" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88aa938cda42a0cf62a20cfe8d139ff1af20c2e681212b5b34adb5a58333f222" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.14", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array", + "subtle", + "zeroize", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stderrlog" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af95cb8a5f79db5b2af2a46f44da7594b5adbcbb65cbf87b8da0959bfdd82460" +dependencies = [ + "atty", + "chrono", + "log", + "termcolor", + "thread_local", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "testsuite" +version = "0.1.0" +dependencies = [ + "ftdi-embedded-hal", + "log", + "rand_core", + "stderrlog", + "w5500-dhcp", + "w5500-dns", + "w5500-hl", + "w5500-ll", + "w5500-mqtt", + "w5500-sntp", + "w5500-tls", +] + +[[package]] +name = "textwrap" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +dependencies = [ + "libc", + "num_threads", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "tokio-macros", + "winapi", +] + +[[package]] +name = "tokio-macros" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "trust-dns-client" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c408c32e6a9dbb38037cece35740f2cf23c875d8ca134d33631cec83f74d3fe" +dependencies = [ + "cfg-if", + "data-encoding", + "futures-channel", + "futures-util", + "lazy_static", + "radix_trie", + "rand", + "thiserror", + "time 0.3.15", + "tokio", + "tracing", + "trust-dns-proto 0.22.0", +] + +[[package]] +name = "trust-dns-proto" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.4.0", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "log", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "url", +] + +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.5.1", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna 0.3.0", + "percent-encoding", +] + +[[package]] +name = "vcell" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "volatile-register" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6" +dependencies = [ + "vcell", +] + +[[package]] +name = "w5500-dhcp" +version = "0.4.2" +dependencies = [ + "defmt", + "dhcproto", + "log", + "rand_core", + "stderrlog", + "w5500-hl", + "w5500-regsim", +] + +[[package]] +name = "w5500-dns" +version = "0.2.0" +dependencies = [ + "defmt", + "log", + "rand_core", + "stderrlog", + "w5500-hl", + "w5500-regsim", +] + +[[package]] +name = "w5500-fuzz" +version = "0.1.0" +dependencies = [ + "rand_core", + "w5500-ll", +] + +[[package]] +name = "w5500-hl" +version = "0.9.0" +dependencies = [ + "defmt", + "embedded-hal 1.0.0-alpha.9", + "embedded-hal-mock 0.8.0 (git+https://github.com/newAM/embedded-hal-mock?branch=1.0.0-alpha.9)", + "w5500-ll", +] + +[[package]] +name = "w5500-ll" +version = "0.10.4" +dependencies = [ + "defmt", + "embedded-hal 0.2.7", + "embedded-hal 1.0.0-alpha.9", + "embedded-hal-async", + "embedded-hal-mock 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "embedded-hal-mock 0.8.0 (git+https://github.com/newAM/embedded-hal-mock?branch=async)", +] + +[[package]] +name = "w5500-mqtt" +version = "0.1.2" +dependencies = [ + "bytes", + "defmt", + "log", + "mqttbytes", + "rand_core", + "stderrlog", + "w5500-hl", + "w5500-regsim", + "w5500-tls", +] + +[[package]] +name = "w5500-regsim" +version = "0.1.0-alpha.8" +dependencies = [ + "httparse", + "log", + "stderrlog", + "tokio", + "trust-dns-client", + "w5500-hl", + "w5500-ll", +] + +[[package]] +name = "w5500-sntp" +version = "0.2.0" +dependencies = [ + "chrono", + "defmt", + "log", + "num-rational", + "stderrlog", + "time 0.3.15", + "w5500-hl", + "w5500-regsim", +] + +[[package]] +name = "w5500-tls" +version = "0.1.3" +dependencies = [ + "bytes", + "cfg-if", + "defmt", + "heapless", + "hkdf", + "hmac", + "log", + "mqttbytes", + "p256", + "p256-cm4", + "rand_core", + "sha2", + "stderrlog", + "subtle", + "w5500-hl", + "w5500-regsim", +] + +[[package]] +name = "w5500-tls-afl" +version = "0.0.0" +dependencies = [ + "afl", + "rand_core", + "stderrlog", + "w5500-fuzz", + "w5500-regsim", + "w5500-tls", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "xdg" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" +dependencies = [ + "dirs", +] + +[[package]] +name = "zeroize" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000..12a1c428 --- /dev/null +++ b/flake.lock @@ -0,0 +1,108 @@ +{ + "nodes": { + "crane": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665356181, + "narHash": "sha256-ONEzlKL5LN4Y1TRfFY6C39G2Am1YFEjArwMYJONFhhs=", + "owner": "ipetkov", + "repo": "crane", + "rev": "d78cb0453b9823d2102f7b22bb98686215462416", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1665259268, + "narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c5924154f000e6306030300592f4282949b2db6c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665398664, + "narHash": "sha256-y/UcVB5k0Wdc0j+7whJE2+vko8m296wZYX37b2lFSpI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "af29a900f10dd6e467622202fb4f6d944d72a3a6", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000..aff1f74d --- /dev/null +++ b/flake.nix @@ -0,0 +1,170 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + + flake-utils.url = "github:numtide/flake-utils"; + + crane = { + url = "github:ipetkov/crane"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; + + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + }; + + outputs = { + self, + nixpkgs, + flake-utils, + crane, + rust-overlay, + }: + flake-utils.lib.eachSystem [ + "x86_64-linux" + "aarch64-linux" + ] ( + system: let + inherit (nixpkgs) lib; + + pkgs = import nixpkgs { + inherit system; + overlays = [(import rust-overlay)]; + }; + + workspaceCargoToml = lib.importTOML ./Cargo.toml; + testMembers = + lib.filter (m: !(lib.hasSuffix "/afl" m) && m != "testsuite") + workspaceCargoToml.workspace.members; + + craneLib = (crane.mkLib pkgs).overrideToolchain (pkgs.rust-bin.stable.latest.default.override { + targets = ["thumbv7em-none-eabi" "thumbv6m-none-eabi"]; + }); + + # https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html + craneLibNightly = (crane.mkLib pkgs).overrideToolchain (pkgs.rust-bin.nightly.latest.default.override { + targets = ["thumbv7em-none-eabi" "thumbv6m-none-eabi"]; + }); + + src = craneLib.cleanCargoSource ./.; + + cargoToml = { + dhcp = lib.importTOML ./dhcp/Cargo.toml; + dns = lib.importTOML ./dns/Cargo.toml; + fuzz = lib.importTOML ./fuzz/Cargo.toml; + hl = lib.importTOML ./hl/Cargo.toml; + ll = lib.importTOML ./ll/Cargo.toml; + mqtt = lib.importTOML ./mqtt/Cargo.toml; + regsim = lib.importTOML ./regsim/Cargo.toml; + sntp = lib.importTOML ./sntp/Cargo.toml; + testsuite = lib.importTOML ./testsuite/Cargo.toml; + tls = lib.importTOML ./tls/Cargo.toml; + tls-afl = lib.importTOML ./tls/afl/Cargo.toml; + }; + + features = with lib; + mapAttrs (crate: toml: (sort lessThan (attrNames (toml.features or {})))) cargoToml; + + allFeatures = with lib; + sort lessThan (unique (flatten (attrValues features))); + + noStdFeatures = [ + "defmt" + "p256-cm4" + ]; + nightlyFeatures = [ + "async" + "eha0" + ]; + + filterNoStdFeatures = lib.filter (m: !(lib.elem m noStdFeatures)); + mkFeatures = lib.concatStringsSep ","; + + allStdCompatFeatures = mkFeatures (filterNoStdFeatures allFeatures); + allStdStableCompatFeatures = mkFeatures ( + lib.filter (m: !(lib.elem m (noStdFeatures ++ nightlyFeatures))) allFeatures + ); + + cargoArtifactsNightly = craneLibNightly.buildDepsOnly { + inherit src; + cargoExtraArgs = "--features ${allStdCompatFeatures}"; + }; + + cargoArtifacts = craneLibNightly.buildDepsOnly { + inherit src; + cargoExtraArgs = "--features ${allStdStableCompatFeatures}"; + }; + in { + packages = { + testsuite = craneLib.buildPackage { + inherit src; + inherit cargoArtifacts; + cargoExtraArgs = "-p testsuite"; + }; + }; + + checks = let + nixSrc = nixpkgs.lib.sources.sourceFilesBySuffices ./. [".nix"]; + + tests = lib.listToAttrs (lib.forEach testMembers (p: { + name = "test-${p}"; + value = craneLibNightly.cargoTest { + pname = "w5500-${p}"; + inherit src; + cargoArtifacts = cargoArtifactsNightly; + cargoExtraArgs = let + featuresNoDefmt = mkFeatures (filterNoStdFeatures (lib.getAttr p features)); + featureArgs = + if featuresNoDefmt != "" + then "--features ${featuresNoDefmt}" + else ""; + in "-p w5500-${p} ${featureArgs}"; + }; + })); + + docs = lib.listToAttrs (lib.forEach testMembers (p: { + name = "doc-${p}"; + value = craneLibNightly.cargoDoc { + pname = "w5500-${p}"; + inherit src; + cargoArtifacts = cargoArtifactsNightly; + # RUSTDOCFLAGS = "-D warnings --cfg docsrs"; + buildPhaseCargoCommand = '' + RUSTDOCFLAGS = "-D warnings --cfg docsrs" cargoWithProfile rustdoc --all-features + ''; + }; + })); + + generatedChecks = lib.recursiveUpdate tests docs; + in + lib.recursiveUpdate generatedChecks + { + clippy = craneLibNightly.cargoClippy { + inherit src; + cargoArtifacts = cargoArtifactsNightly; + cargoClippyExtraArgs = "--all-features --all-targets -- --deny warnings"; + }; + + rustfmt = craneLibNightly.cargoFmt {inherit src;}; + + testsuite-build = self.packages.${system}.testsuite; + + alejandra = pkgs.runCommand "alejandra" {} '' + ${pkgs.alejandra}/bin/alejandra --check ${nixSrc} + touch $out + ''; + + statix = pkgs.runCommand "statix" {} '' + ${pkgs.statix}/bin/statix check ${nixSrc} + touch $out + ''; + }; + } + ); +} diff --git a/mqtt/Cargo.toml b/mqtt/Cargo.toml index 334422a5..ce5b80a7 100644 --- a/mqtt/Cargo.toml +++ b/mqtt/Cargo.toml @@ -12,12 +12,13 @@ categories = ["embedded", "hardware-support", "no-std"] homepage = "https://github.com/newAM/w5500-rs" [features] +defmt = ["w5500-hl/defmt", "dep:defmt", "w5500-tls?/defmt"] eh0 = ["w5500-hl/eh0"] eh1 = ["w5500-hl/eh1"] -defmt = ["w5500-hl/defmt", "dep:defmt"] -std = ["w5500-hl/std", "w5500-tls?/std"] log = ["dep:log", "w5500-tls?/log"] p256-cm4 = ["w5500-tls?/p256-cm4"] +std = ["w5500-hl/std", "w5500-tls?/std"] +w5500-tls = ["dep:w5500-tls"] [dependencies] defmt = { version = "0.3", optional = true } diff --git a/sntp/Cargo.toml b/sntp/Cargo.toml index ac44d3b6..aa131cd8 100644 --- a/sntp/Cargo.toml +++ b/sntp/Cargo.toml @@ -12,10 +12,13 @@ categories = ["embedded", "hardware-support", "no-std"] homepage = "https://github.com/newAM/w5500-rs" [features] +chrono = ["dep:chrono"] +defmt = ["w5500-hl/defmt", "dep:defmt"] eh0 = ["w5500-hl/eh0"] eh1 = ["w5500-hl/eh1"] -defmt = ["w5500-hl/defmt", "dep:defmt"] +num-rational = ["dep:num-rational"] std = ["w5500-hl/std"] +time = ["dep:time"] [dependencies] chrono = { version = "0.4", default-features = false, optional = true } From 293c4c03b0ea30d53180eaa0044f9f68cd6d2bc6 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Oct 2022 15:17:56 -0700 Subject: [PATCH 02/13] flake: add docs --- flake.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index aff1f74d..b882e50d 100644 --- a/flake.nix +++ b/flake.nix @@ -128,20 +128,7 @@ }; })); - docs = lib.listToAttrs (lib.forEach testMembers (p: { - name = "doc-${p}"; - value = craneLibNightly.cargoDoc { - pname = "w5500-${p}"; - inherit src; - cargoArtifacts = cargoArtifactsNightly; - # RUSTDOCFLAGS = "-D warnings --cfg docsrs"; - buildPhaseCargoCommand = '' - RUSTDOCFLAGS = "-D warnings --cfg docsrs" cargoWithProfile rustdoc --all-features - ''; - }; - })); - - generatedChecks = lib.recursiveUpdate tests docs; + generatedChecks = tests; in lib.recursiveUpdate generatedChecks { @@ -153,6 +140,15 @@ rustfmt = craneLibNightly.cargoFmt {inherit src;}; + docs = craneLibNightly.cargoDoc { + inherit src; + cargoArtifacts = cargoArtifactsNightly; + + RUSTDOCFLAGS = "-D warnings --cfg docsrs"; + + cargoExtraArgs = "--all-features"; + }; + testsuite-build = self.packages.${system}.testsuite; alejandra = pkgs.runCommand "alejandra" {} '' From 454970c72fad22fe35cc7656c142466dafa712be Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Oct 2022 15:21:08 -0700 Subject: [PATCH 03/13] flake: WIP --- flake.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index b882e50d..3f739419 100644 --- a/flake.nix +++ b/flake.nix @@ -43,13 +43,15 @@ lib.filter (m: !(lib.hasSuffix "/afl" m) && m != "testsuite") workspaceCargoToml.workspace.members; + targets = ["thumbv7em-none-eabi" "thumbv6m-none-eabi"]; + craneLib = (crane.mkLib pkgs).overrideToolchain (pkgs.rust-bin.stable.latest.default.override { - targets = ["thumbv7em-none-eabi" "thumbv6m-none-eabi"]; + inherit targets; }); # https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html craneLibNightly = (crane.mkLib pkgs).overrideToolchain (pkgs.rust-bin.nightly.latest.default.override { - targets = ["thumbv7em-none-eabi" "thumbv6m-none-eabi"]; + inherit targets; }); src = craneLib.cleanCargoSource ./.; @@ -107,6 +109,13 @@ inherit cargoArtifacts; cargoExtraArgs = "-p testsuite"; }; + + # TODO: check (v6, v7 x std, nightly) + ll = craneLib.buildPackage { + inherit src; + inherit cargoArtifacts; + cargoExtraArgs = "-p w5500-ll --target thumbv6m-none-eabi"; + }; }; checks = let From 72aaf0f6fbae32adc287ead799accd1936c20f5e Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Oct 2022 15:22:59 -0700 Subject: [PATCH 04/13] flake: add to CI --- .github/workflows/ci.yml | 194 +++------------------------------------ 1 file changed, 12 insertions(+), 182 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f9e6fab..504b8f5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,150 +5,22 @@ on: tags: - '**' pull_request: - schedule: - - cron: "13 3 * * *" + workflow_dispatch: name: CI jobs: - build: - name: Build + check: runs-on: ubuntu-latest - env: {"RUSTFLAGS": "-D warnings"} - strategy: - matrix: - toolchain: - - "stable" - - "nightly" steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.toolchain }} - - run: cargo build - - run: cargo build --all-features - if: ${{ matrix.toolchain == 'nightly' }} - - run: cargo build -p testsuite - - build_no_std: - name: Build no_std - runs-on: ubuntu-latest - env: {"RUSTFLAGS": "-D warnings"} - strategy: - matrix: - toolchain: - - "stable" - - "nightly" - target: - - "thumbv6m-none-eabi" - - "thumbv7em-none-eabi" - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@master - with: - target: ${{ matrix.target }} - toolchain: ${{ matrix.toolchain }} - - run: cargo build --target ${{ matrix.target }} -p w5500-ll - - run: cargo build --target ${{ matrix.target }} -p w5500-hl - - run: cargo build --target ${{ matrix.target }} -p w5500-dhcp - - run: cargo build --target ${{ matrix.target }} -p w5500-dns - - run: cargo build --target ${{ matrix.target }} -p w5500-mqtt - - run: cargo build --target ${{ matrix.target }} -p w5500-sntp - - run: cargo build --target ${{ matrix.target }} -p w5500-tls - - run: cargo build --target ${{ matrix.target }} -p w5500-ll --features defmt - - run: cargo build --target ${{ matrix.target }} -p w5500-hl --features defmt - - run: cargo build --target ${{ matrix.target }} -p w5500-dhcp --features defmt - - run: cargo build --target ${{ matrix.target }} -p w5500-dns --features defmt - - run: cargo build --target ${{ matrix.target }} -p w5500-mqtt --features defmt - - run: cargo build --target ${{ matrix.target }} -p w5500-tls --features defmt - - run: cargo build --target ${{ matrix.target }} -p w5500-ll --features eh0,eh1 - - run: cargo build --target ${{ matrix.target }} -p w5500-hl --features eh0,eh1 - - run: cargo build --target ${{ matrix.target }} -p w5500-dhcp --features eh0,eh1 - - run: cargo build --target ${{ matrix.target }} -p w5500-dns --features eh0,eh1 - - run: cargo build --target ${{ matrix.target }} -p w5500-mqtt --features eh0,eh1 - - run: cargo build --target ${{ matrix.target }} -p w5500-sntp --features eh0,eh1 - - run: cargo build --target ${{ matrix.target }} -p w5500-tls --features eh0,eh1 - - run: cargo build --target ${{ matrix.target }} -p w5500-dhcp --features log - - run: cargo build --target ${{ matrix.target }} -p w5500-dns --features log - - run: cargo build --target ${{ matrix.target }} -p w5500-mqtt --features log - - run: cargo build --target ${{ matrix.target }} -p w5500-sntp --features log - - run: cargo build --target ${{ matrix.target }} -p w5500-tls --features log - - run: cargo build --target ${{ matrix.target }} -p w5500-sntp --features time - - run: cargo build --target ${{ matrix.target }} -p w5500-sntp --features chrono - - run: cargo build --target ${{ matrix.target }} -p w5500-sntp --features num-rational - - run: cargo build --target ${{ matrix.target }} -p w5500-mqtt --features w5500-tls - - run: cargo build --target ${{ matrix.target }} -p w5500-ll --features async - if: ${{ matrix.toolchain == 'nightly' }} - - run: cargo build --target ${{ matrix.target }} -p w5500-ll --features eha0 - if: ${{ matrix.toolchain == 'nightly' }} - - run: cargo build --target ${{ matrix.target }} -p w5500-tls --features p256-cm4 - if: ${{ matrix.target == 'thumbv7em-none-eabi' }} - - run: cargo build --target ${{ matrix.target }} -p w5500-mqtt --features w5500-tls,p256-cm4 - if: ${{ matrix.target == 'thumbv7em-none-eabi' }} - - test: - name: Test - runs-on: ubuntu-latest - env: {"RUSTFLAGS": "-D warnings"} - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@nightly - - run: cargo test-all - - clippy: - name: Clippy - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@nightly - with: - components: clippy - - run: cargo clippy --all-features -- --deny warnings - - format: - name: Format - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@nightly - with: - components: rustfmt - - run: cargo +nightly fmt -- --check - - rustdoc: - name: rustdoc - runs-on: ubuntu-latest - env: {"RUSTDOCFLAGS": "-D warnings --cfg docsrs"} - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@nightly - - name: rustdoc - run: | - cd dhcp - cargo +nightly rustdoc --all-features - cd ../dns - cargo +nightly rustdoc --all-features - cd ../hl - cargo +nightly rustdoc --all-features - cd ../ll - cargo +nightly rustdoc --all-features - cd ../mqtt - cargo +nightly rustdoc --all-features - cd ../regsim - cargo +nightly rustdoc --all-features - cd ../sntp - cargo +nightly rustdoc --all-features + - uses: cachix/install-nix-action@v17 + - run: nix flake check -L release-ll: name: w5500-ll crates.io release if: startsWith(github.ref, 'refs/tags/ll/v') - needs: - - build - - build_no_std - - test - - clippy - - format - - rustdoc + needs: [ "check" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -163,13 +35,7 @@ jobs: release-hl: name: w5500-hl crates.io release if: startsWith(github.ref, 'refs/tags/hl/v') - needs: - - build - - build_no_std - - test - - clippy - - format - - rustdoc + needs: [ "check" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -184,13 +50,7 @@ jobs: release-dhcp: name: w5500-dhcp crates.io release if: startsWith(github.ref, 'refs/tags/dhcp/v') - needs: - - build - - build_no_std - - test - - clippy - - format - - rustdoc + needs: [ "check" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -205,13 +65,7 @@ jobs: release-regsim: name: w5500-regsim crates.io release if: startsWith(github.ref, 'refs/tags/regsim/v') - needs: - - build - - build_no_std - - test - - clippy - - format - - rustdoc + needs: [ "check" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -226,13 +80,7 @@ jobs: release-dns: name: w5500-dns crates.io release if: startsWith(github.ref, 'refs/tags/dns/v') - needs: - - build - - build_no_std - - test - - clippy - - format - - rustdoc + needs: [ "check" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -247,13 +95,7 @@ jobs: release-mqtt: name: w5500-mqtt crates.io release if: startsWith(github.ref, 'refs/tags/mqtt/v') - needs: - - build - - build_no_std - - test - - clippy - - format - - rustdoc + needs: [ "check" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -268,13 +110,7 @@ jobs: release-sntp: name: w5500-sntp crates.io release if: startsWith(github.ref, 'refs/tags/sntp/v') - needs: - - build - - build_no_std - - test - - clippy - - format - - rustdoc + needs: [ "check" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -289,13 +125,7 @@ jobs: release-tls: name: w5500-tls crates.io release if: startsWith(github.ref, 'refs/tags/tls/v') - needs: - - build - - build_no_std - - test - - clippy - - format - - rustdoc + needs: [ "check" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 3c81f80d06e9b33814b4dc273d6b894bdba89994 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Oct 2022 15:52:58 -0700 Subject: [PATCH 05/13] flake: wip --- flake.nix | 59 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index 3f739419..6f78c76b 100644 --- a/flake.nix +++ b/flake.nix @@ -88,34 +88,55 @@ filterNoStdFeatures = lib.filter (m: !(lib.elem m noStdFeatures)); mkFeatures = lib.concatStringsSep ","; - allStdCompatFeatures = mkFeatures (filterNoStdFeatures allFeatures); - allStdStableCompatFeatures = mkFeatures ( + allStdFeatures = mkFeatures (filterNoStdFeatures allFeatures); + allStdStableFeatures = mkFeatures ( lib.filter (m: !(lib.elem m (noStdFeatures ++ nightlyFeatures))) allFeatures ); - cargoArtifactsNightly = craneLibNightly.buildDepsOnly { - inherit src; - cargoExtraArgs = "--features ${allStdCompatFeatures}"; - }; - - cargoArtifacts = craneLibNightly.buildDepsOnly { - inherit src; - cargoExtraArgs = "--features ${allStdStableCompatFeatures}"; + cargoArtifacts = { + stdNightly = craneLibNightly.buildDepsOnly { + inherit src; + cargoExtraArgs = "--features ${allStdFeatures}"; + }; + stdStable = craneLib.buildDepsOnly { + inherit src; + cargoExtraArgs = "--features ${allStdStableFeatures}"; + }; + # v6Nightly = craneLibNightly.buildDepsOnly { + # inherit src; + # cargoExtraArgs = "--features ${features}"; + # }; + # v6Stable = craneLib.buildDepsOnly { + # inherit src; + # cargoExtraArgs = "--features ${features}"; + # }; + # v7Nightly = craneLibNightly.buildDepsOnly { + # inherit src; + # cargoExtraArgs = "--features ${allFeatures}"; + # }; + # v7Stable = craneLib.buildDepsOnly { + # inherit src; + # cargoExtraArgs = let + # features = mkFeatures ( + # lib.filter (m: !(lib.elem m nightlyFeatures)) allFeatures + # ); + # in "--features ${features}"; + # }; }; in { packages = { testsuite = craneLib.buildPackage { inherit src; - inherit cargoArtifacts; + cargoArtifacts = cargoArtifacts.stdNightly; cargoExtraArgs = "-p testsuite"; }; # TODO: check (v6, v7 x std, nightly) - ll = craneLib.buildPackage { - inherit src; - inherit cargoArtifacts; - cargoExtraArgs = "-p w5500-ll --target thumbv6m-none-eabi"; - }; + # llStable = craneLib.buildPackage { + # inherit src; + # cargoArtifacts = cargoArtifacts.v7Stable; + # cargoExtraArgs = "-p w5500-ll --target thumbv7em-none-eabi"; + # }; }; checks = let @@ -126,7 +147,7 @@ value = craneLibNightly.cargoTest { pname = "w5500-${p}"; inherit src; - cargoArtifacts = cargoArtifactsNightly; + cargoArtifacts = cargoArtifacts.stdNightly; cargoExtraArgs = let featuresNoDefmt = mkFeatures (filterNoStdFeatures (lib.getAttr p features)); featureArgs = @@ -143,7 +164,7 @@ { clippy = craneLibNightly.cargoClippy { inherit src; - cargoArtifacts = cargoArtifactsNightly; + cargoArtifacts = cargoArtifacts.stdNightly; cargoClippyExtraArgs = "--all-features --all-targets -- --deny warnings"; }; @@ -151,7 +172,7 @@ docs = craneLibNightly.cargoDoc { inherit src; - cargoArtifacts = cargoArtifactsNightly; + cargoArtifacts = cargoArtifacts.stdNightly; RUSTDOCFLAGS = "-D warnings --cfg docsrs"; From 0817a3f6c7ebfeb98d5becfbe5a9d296180eb2e2 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Oct 2022 15:59:13 -0700 Subject: [PATCH 06/13] CI: use cachix --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 504b8f5d..6f093f48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,10 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v17 + - uses: cachix/cachix-action@v10 + with: + name: newam + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix flake check -L release-ll: From 649526fe404cf3cf8bc9b81e866d782a9d0a0dfb Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Oct 2022 16:08:14 -0700 Subject: [PATCH 07/13] flake: add artifacts to packages --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 6f78c76b..32e5117b 100644 --- a/flake.nix +++ b/flake.nix @@ -125,6 +125,8 @@ }; in { packages = { + inherit (cargoArtifacts) stdNightly; + testsuite = craneLib.buildPackage { inherit src; cargoArtifacts = cargoArtifacts.stdNightly; From 0fc42dc138f0393b62ef7c196dab0526758c1c20 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 22 Oct 2022 15:23:58 -0700 Subject: [PATCH 08/13] Update flake --- flake.lock | 21 ++++++++++++--------- flake.nix | 21 ++++++++------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 12a1c428..5a879449 100644 --- a/flake.lock +++ b/flake.lock @@ -8,14 +8,17 @@ ], "nixpkgs": [ "nixpkgs" + ], + "rust-overlay": [ + "rust-overlay" ] }, "locked": { - "lastModified": 1665356181, - "narHash": "sha256-ONEzlKL5LN4Y1TRfFY6C39G2Am1YFEjArwMYJONFhhs=", + "lastModified": 1666399003, + "narHash": "sha256-mz0c01w66vnNJDQ7WSwXnXVNNH5qcHnAocTggS1tvcw=", "owner": "ipetkov", "repo": "crane", - "rev": "d78cb0453b9823d2102f7b22bb98686215462416", + "rev": "eadc11533bbd3525773de34deb7c8d7d7692c4f6", "type": "github" }, "original": { @@ -57,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665259268, - "narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=", + "lastModified": 1666377499, + "narHash": "sha256-dZZCGvWcxc7oGnUgFVf0UeNHsJ4VhkTM0v5JRe8EwR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5924154f000e6306030300592f4282949b2db6c", + "rev": "301aada7a64812853f2e2634a530ef5d34505048", "type": "github" }, "original": { @@ -89,11 +92,11 @@ ] }, "locked": { - "lastModified": 1665398664, - "narHash": "sha256-y/UcVB5k0Wdc0j+7whJE2+vko8m296wZYX37b2lFSpI=", + "lastModified": 1666407365, + "narHash": "sha256-eD1hN+Uez7oOKl9BgvfBydQOCEqfoLuezoGfR6t0nzI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "af29a900f10dd6e467622202fb4f6d944d72a3a6", + "rev": "8ffc63427df1dc7e53fb96cb13b130028c258202", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 32e5117b..aa86d356 100644 --- a/flake.nix +++ b/flake.nix @@ -4,19 +4,14 @@ flake-utils.url = "github:numtide/flake-utils"; - crane = { - url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; - }; + crane.url = "github:ipetkov/crane"; + crane.inputs.flake-utils.follows = "flake-utils"; + crane.inputs.nixpkgs.follows = "nixpkgs"; + crane.inputs.rust-overlay.follows = "rust-overlay"; + + rust-overlay.url = "github:oxalica/rust-overlay"; + rust-overlay.inputs.flake-utils.follows = "flake-utils"; + rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { From 9e890e15e643152dfe5920f6b7f6262113716303 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 23 Oct 2022 16:39:52 -0700 Subject: [PATCH 09/13] flake: pin nightly --- flake.lock | 18 +++++++++--------- flake.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 5a879449..1add3242 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1666399003, - "narHash": "sha256-mz0c01w66vnNJDQ7WSwXnXVNNH5qcHnAocTggS1tvcw=", + "lastModified": 1666567222, + "narHash": "sha256-AVySilLW+eNM409GSIJYsF6wg5NsxK12Ht2DMSYAgO0=", "owner": "ipetkov", "repo": "crane", - "rev": "eadc11533bbd3525773de34deb7c8d7d7692c4f6", + "rev": "2ce1a3313e299b0db63b11f94c863af74b0b08ad", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666377499, - "narHash": "sha256-dZZCGvWcxc7oGnUgFVf0UeNHsJ4VhkTM0v5JRe8EwR8=", + "lastModified": 1666447894, + "narHash": "sha256-i9WHX4w/et4qPMzEXd9POmnO0/bthjr7R4cblKNHGms=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "301aada7a64812853f2e2634a530ef5d34505048", + "rev": "95aeaf83c247b8f5aa561684317ecd860476fcd6", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1666407365, - "narHash": "sha256-eD1hN+Uez7oOKl9BgvfBydQOCEqfoLuezoGfR6t0nzI=", + "lastModified": 1666494036, + "narHash": "sha256-4mmm+1MBPMD56LMLN9QcEwnfnu41NkA6lDeZGjSrxIw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8ffc63427df1dc7e53fb96cb13b130028c258202", + "rev": "af2e939ba2c7cbb188d06d6650c6353b10b3f2be", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index aa86d356..2e693f6c 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ }); # https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html - craneLibNightly = (crane.mkLib pkgs).overrideToolchain (pkgs.rust-bin.nightly.latest.default.override { + craneLibNightly = (crane.mkLib pkgs).overrideToolchain (pkgs.rust-bin.nightly."2022-10-20".default.override { inherit targets; }); From 983e2c94a9953fb85fcc25b7fa23b18ba9443e27 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 12 Nov 2022 10:42:28 -0800 Subject: [PATCH 10/13] flake.lock, Cargo.lock: update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'crane': 'github:ipetkov/crane/2ce1a3313e299b0db63b11f94c863af74b0b08ad' (2022-10-23) → 'github:ipetkov/crane/074825a9e8d6446564e2ae6949ac3feb79aa7397' (2022-11-10) • Updated input 'flake-utils': 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/95aeaf83c247b8f5aa561684317ecd860476fcd6' (2022-10-22) → 'github:NixOS/nixpkgs/5f588eb4a958f1a526ed8da02d6ea1bea0047b9f' (2022-11-10) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/af2e939ba2c7cbb188d06d6650c6353b10b3f2be' (2022-10-23) → 'github:oxalica/rust-overlay/7bb04cd980cf71119d08b6833f4a0525e8b6a54a' (2022-11-12) updated git repository `https://github.com/dbrgn/embedded-hal-mock` updated git repository `https://github.com/newam/embedded-hal-mock` updated afl v0.12.8 -> v0.12.10 updated async-trait v0.1.57 -> v0.1.58 updated bumpalo v3.11.0 -> v3.11.1 updated cc v1.0.73 -> v1.0.76 updated chrono v0.4.22 -> v0.4.23 updated clap v3.2.22 -> v4.0.23 updated clap_lex v0.2.4 -> v0.3.0 updated crypto-bigint v0.4.8 -> v0.4.9 updated cxx v1.0.78 -> v1.0.81 updated cxx-build v1.0.78 -> v1.0.81 updated cxxbridge-flags v1.0.78 -> v1.0.81 updated cxxbridge-macro v1.0.78 -> v1.0.81 updated embedded-hal-async v0.1.0-alpha.2 -> v0.1.0-alpha.3 added embedded-hal-mock v0.8.0 (https://github.com/dbrgn/embedded-hal-mock?branch=1-alpha#3d5ecf6b) removed embedded-hal-mock v0.8.0 (https://github.com/newam/embedded-hal-mock?branch=1.0.0-alpha.9#d8f1cecb) updated embedded-hal-mock v0.8.0 (https://github.com/newam/embedded-hal-mock?branch=async#4effcd01) -> #69772c53 updated ff v0.12.0 -> v0.12.1 updated futures-channel v0.3.24 -> v0.3.25 updated futures-core v0.3.24 -> v0.3.25 updated futures-io v0.3.24 -> v0.3.25 updated futures-task v0.3.24 -> v0.3.25 updated futures-util v0.3.24 -> v0.3.25 updated getrandom v0.2.7 -> v0.2.8 updated group v0.12.0 -> v0.12.1 removed hashbrown v0.12.3 updated iana-time-zone v0.1.51 -> v0.1.53 updated iana-time-zone-haiku v0.1.0 -> v0.1.1 removed indexmap v1.9.1 updated ipnet v2.5.0 -> v2.5.1 updated libc v0.2.135 -> v0.2.137 updated mio v0.8.4 -> v0.8.5 updated num_cpus v1.13.1 -> v1.14.0 removed num_threads v0.1.6 updated once_cell v1.15.0 -> v1.16.0 updated os_str_bytes v6.3.0 -> v6.4.0 updated ppv-lite86 v0.2.16 -> v0.2.17 updated proc-macro2 v1.0.46 -> v1.0.47 updated regex v1.6.0 -> v1.7.0 updated regex-syntax v0.6.27 -> v0.6.28 added serde v1.0.147 updated stderrlog v0.5.3 -> v0.5.4 updated syn v1.0.102 -> v1.0.103 removed textwrap v0.15.1 removed time v0.1.44 removed time v0.3.15 added time v0.3.17 added time-core v0.1.0 removed wasi v0.10.0+wasi-snapshot-preview1 updated windows-sys v0.36.1 -> v0.42.0 added windows_aarch64_gnullvm v0.42.0 updated windows_aarch64_msvc v0.36.1 -> v0.42.0 updated windows_i686_gnu v0.36.1 -> v0.42.0 updated windows_i686_msvc v0.36.1 -> v0.42.0 updated windows_x86_64_gnu v0.36.1 -> v0.42.0 added windows_x86_64_gnullvm v0.42.0 updated windows_x86_64_msvc v0.36.1 -> v0.42.0 --- Cargo.lock | 258 ++++++++++++++++++++++++----------------------------- flake.lock | 24 ++--- 2 files changed, 129 insertions(+), 153 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a67b929..e46d9e0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "afl" -version = "0.12.8" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14c4f38655ef328922eead1656bfe02aa91b5ff3cdb5dac8a3fd0d9b96e857d" +checksum = "3a914d2e0f713b59acd9b2a85cd2f0b651e2df3ae1ade2bb18c56a97cdb51177" dependencies = [ "clap", "fs_extra", @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "byteorder" @@ -139,9 +139,9 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" [[package]] name = "cfg-if" @@ -151,40 +151,37 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", "num-integer", "num-traits", - "time 0.1.44", "wasm-bindgen", "winapi", ] [[package]] name = "clap" -version = "3.2.22" +version = "4.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +checksum = "0eb41c13df48950b20eb4cd0eefa618819469df1bffc49d11e8487c4ba0037e5" dependencies = [ "atty", "bitflags", "clap_lex", - "indexmap", "once_cell", "strsim", "termcolor", - "textwrap", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" dependencies = [ "os_str_bytes", ] @@ -246,9 +243,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2b443d17d49dad5ef0ede301c3179cc923b8822f3393b4d2c28c269dd4a122" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array", "rand_core", @@ -268,9 +265,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" dependencies = [ "cc", "cxxbridge-flags", @@ -280,9 +277,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199" +checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" dependencies = [ "cc", "codespan-reporting", @@ -295,15 +292,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" +checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" [[package]] name = "cxxbridge-macro" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" dependencies = [ "proc-macro2", "quote", @@ -436,9 +433,9 @@ checksum = "129b101ddfee640565f7c07b301a31d95aa21e5acef21a491c307139f5fa4c91" [[package]] name = "embedded-hal-async" -version = "0.1.0-alpha.2" +version = "0.1.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ab70a3f49fc0ad2ccb824c50fbac3234040c82010cecd93b2f4c1b3efed0de" +checksum = "c913f631bd08c253b85fdf0077061c64763d70e27803b04da5a49c5fb2a65057" dependencies = [ "embedded-hal 1.0.0-alpha.9", ] @@ -456,7 +453,7 @@ dependencies = [ [[package]] name = "embedded-hal-mock" version = "0.8.0" -source = "git+https://github.com/newAM/embedded-hal-mock?branch=1.0.0-alpha.9#d8f1cecb83885e5187b35559f5f0bc504b962200" +source = "git+https://github.com/dbrgn/embedded-hal-mock?branch=1-alpha#3d5ecf6b392434c053197dbcb894a7db7b4089ba" dependencies = [ "embedded-hal 1.0.0-alpha.9", "embedded-hal-nb", @@ -465,7 +462,7 @@ dependencies = [ [[package]] name = "embedded-hal-mock" version = "0.8.0" -source = "git+https://github.com/newAM/embedded-hal-mock?branch=async#4effcd01550a6b172b1f1eb6d021000fb0a7a105" +source = "git+https://github.com/newAM/embedded-hal-mock?branch=async#69772c536f0de2d68e1c9e6eaa66568086cf0066" dependencies = [ "embedded-hal 1.0.0-alpha.9", "embedded-hal-async", @@ -523,9 +520,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "rand_core", "subtle", @@ -571,36 +568,36 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-core", "futures-task", @@ -621,20 +618,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "group" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", "rand_core", @@ -650,12 +647,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "heapless" version = "0.7.16" @@ -717,9 +708,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "iana-time-zone" -version = "0.1.51" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -731,9 +722,9 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" dependencies = [ "cxx", "cxx-build", @@ -760,16 +751,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - [[package]] name = "instant" version = "0.1.12" @@ -781,9 +762,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" [[package]] name = "js-sys" @@ -802,9 +783,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libftd2xx" @@ -870,13 +851,13 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "mio" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -945,34 +926,25 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" [[package]] name = "p256" @@ -1015,9 +987,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-error" @@ -1045,9 +1017,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] @@ -1123,9 +1095,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -1134,9 +1106,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -1232,6 +1204,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" + [[package]] name = "sha2" version = "0.10.6" @@ -1291,9 +1269,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stderrlog" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af95cb8a5f79db5b2af2a46f44da7594b5adbcbb65cbf87b8da0959bfdd82460" +checksum = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b" dependencies = [ "atty", "chrono", @@ -1316,9 +1294,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", @@ -1365,12 +1343,6 @@ dependencies = [ "w5500-tls", ] -[[package]] -name = "textwrap" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" - [[package]] name = "thiserror" version = "1.0.37" @@ -1402,24 +1374,19 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "serde", + "time-core", ] [[package]] -name = "time" -version = "0.3.15" +name = "time-core" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" -dependencies = [ - "libc", - "num_threads", -] +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "tinyvec" @@ -1511,7 +1478,7 @@ dependencies = [ "radix_trie", "rand", "thiserror", - "time 0.3.15", + "time", "tokio", "tracing", "trust-dns-proto 0.22.0", @@ -1676,7 +1643,7 @@ version = "0.9.0" dependencies = [ "defmt", "embedded-hal 1.0.0-alpha.9", - "embedded-hal-mock 0.8.0 (git+https://github.com/newAM/embedded-hal-mock?branch=1.0.0-alpha.9)", + "embedded-hal-mock 0.8.0 (git+https://github.com/dbrgn/embedded-hal-mock?branch=1-alpha)", "w5500-ll", ] @@ -1690,6 +1657,7 @@ dependencies = [ "embedded-hal-async", "embedded-hal-mock 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "embedded-hal-mock 0.8.0 (git+https://github.com/newAM/embedded-hal-mock?branch=async)", + "tokio", ] [[package]] @@ -1729,7 +1697,7 @@ dependencies = [ "log", "num-rational", "stderrlog", - "time 0.3.15", + "time", "w5500-hl", "w5500-regsim", ] @@ -1768,12 +1736,6 @@ dependencies = [ "w5500-tls", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1867,46 +1829,60 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ + "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", + "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" [[package]] name = "xdg" diff --git a/flake.lock b/flake.lock index 1add3242..86d62e25 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1666567222, - "narHash": "sha256-AVySilLW+eNM409GSIJYsF6wg5NsxK12Ht2DMSYAgO0=", + "lastModified": 1668047118, + "narHash": "sha256-F4xP7dAU6ca+hYa3qF0CtnwfQJT3YH4qEh/IxO+p9t0=", "owner": "ipetkov", "repo": "crane", - "rev": "2ce1a3313e299b0db63b11f94c863af74b0b08ad", + "rev": "074825a9e8d6446564e2ae6949ac3feb79aa7397", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666447894, - "narHash": "sha256-i9WHX4w/et4qPMzEXd9POmnO0/bthjr7R4cblKNHGms=", + "lastModified": 1668087632, + "narHash": "sha256-T/cUx44aYDuLMFfaiVpMdTjL4kpG7bh0VkN6JEM78/E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95aeaf83c247b8f5aa561684317ecd860476fcd6", + "rev": "5f588eb4a958f1a526ed8da02d6ea1bea0047b9f", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1666494036, - "narHash": "sha256-4mmm+1MBPMD56LMLN9QcEwnfnu41NkA6lDeZGjSrxIw=", + "lastModified": 1668220912, + "narHash": "sha256-rtrFTQOhrf+xJC3RYdgGglbOHu5J32SjuLV2ekLl8jo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "af2e939ba2c7cbb188d06d6650c6353b10b3f2be", + "rev": "7bb04cd980cf71119d08b6833f4a0525e8b6a54a", "type": "github" }, "original": { From 5d7b1e7dc3ac4c32cc729870414739bc2885a955 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 12 Nov 2022 10:45:31 -0800 Subject: [PATCH 11/13] nightly: 2022-10-20 -> 2022-11-12 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2e693f6c..0c6900f8 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ }); # https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html - craneLibNightly = (crane.mkLib pkgs).overrideToolchain (pkgs.rust-bin.nightly."2022-10-20".default.override { + craneLibNightly = (crane.mkLib pkgs).overrideToolchain (pkgs.rust-bin.nightly."2022-11-12".default.override { inherit targets; }); From b7464174216243028790de2e7593ad12c44bd5b1 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 12 Nov 2022 10:51:52 -0800 Subject: [PATCH 12/13] update nightly feature names --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 0c6900f8..d314814e 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ ]; nightlyFeatures = [ "async" - "eha0" + "eha0a" ]; filterNoStdFeatures = lib.filter (m: !(lib.elem m noStdFeatures)); From dc13be73384c492bee6f42d7d482124c7d51779c Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 20 Nov 2022 16:13:12 -0800 Subject: [PATCH 13/13] flake.lock, Cargo.lock: update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'crane': 'github:ipetkov/crane/074825a9e8d6446564e2ae6949ac3feb79aa7397' (2022-11-10) → 'github:ipetkov/crane/acbb22591c1335d6d6d241e5f0ef18b206565b58' (2022-11-20) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5f588eb4a958f1a526ed8da02d6ea1bea0047b9f' (2022-11-10) → 'github:NixOS/nixpkgs/690ffff026b4e635b46f69002c0f4e81c65dfc2e' (2022-11-20) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/7bb04cd980cf71119d08b6833f4a0525e8b6a54a' (2022-11-12) → 'github:oxalica/rust-overlay/5200195aa2a0cef1becc2ba6ff61cba65e1f90fe' (2022-11-20) updated git repository `https://github.com/dbrgn/embedded-hal-mock` updated git repository `https://github.com/newam/embedded-hal-mock` updated cc v1.0.76 -> v1.0.77 updated clap v4.0.23 -> v4.0.26 updated const-oid v0.9.0 -> v0.9.1 updated cxx v1.0.81 -> v1.0.82 updated cxx-build v1.0.81 -> v1.0.82 updated cxxbridge-flags v1.0.81 -> v1.0.82 updated cxxbridge-macro v1.0.81 -> v1.0.82 updated digest v0.10.5 -> v0.10.6 updated tokio v1.21.2 -> v1.22.0 --- Cargo.lock | 36 ++++++++++++++++++------------------ flake.lock | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e46d9e0e..156e34a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -139,9 +139,9 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cc" -version = "1.0.76" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cfg-if" @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.23" +version = "4.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb41c13df48950b20eb4cd0eefa618819469df1bffc49d11e8487c4ba0037e5" +checksum = "2148adefda54e14492fb9bddcc600b4344c5d1a3123bd666dcb939c6f0e0e57e" dependencies = [ "atty", "bitflags", @@ -198,9 +198,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" [[package]] name = "core-foundation-sys" @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" dependencies = [ "cc", "cxxbridge-flags", @@ -277,9 +277,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" +checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" dependencies = [ "cc", "codespan-reporting", @@ -292,15 +292,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" +checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" [[package]] name = "cxxbridge-macro" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" +checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ "proc-macro2", "quote", @@ -366,9 +366,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", @@ -1405,9 +1405,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", "bytes", diff --git a/flake.lock b/flake.lock index 86d62e25..9945bc30 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1668047118, - "narHash": "sha256-F4xP7dAU6ca+hYa3qF0CtnwfQJT3YH4qEh/IxO+p9t0=", + "lastModified": 1668902895, + "narHash": "sha256-mfZOjmsPcXyQQ02pEw5B1vpafczopI1JKMx/eovuZ90=", "owner": "ipetkov", "repo": "crane", - "rev": "074825a9e8d6446564e2ae6949ac3feb79aa7397", + "rev": "acbb22591c1335d6d6d241e5f0ef18b206565b58", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668087632, - "narHash": "sha256-T/cUx44aYDuLMFfaiVpMdTjL4kpG7bh0VkN6JEM78/E=", + "lastModified": 1668905981, + "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f588eb4a958f1a526ed8da02d6ea1bea0047b9f", + "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1668220912, - "narHash": "sha256-rtrFTQOhrf+xJC3RYdgGglbOHu5J32SjuLV2ekLl8jo=", + "lastModified": 1668912095, + "narHash": "sha256-3oGeJgeA4+8Wj2XZnbZKJYHoZziyJl36ZGU49I2VC8U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7bb04cd980cf71119d08b6833f4a0525e8b6a54a", + "rev": "5200195aa2a0cef1becc2ba6ff61cba65e1f90fe", "type": "github" }, "original": {