diff options
author | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-05-11 23:10:39 +0200 |
---|---|---|
committer | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-05-11 23:10:39 +0200 |
commit | c8b2ff9644356debe6fddc135f260884e8caf16e (patch) | |
tree | a6511d67ed60785c7b0e5ec07c966841f8dfd4ad | |
parent | e5dc3e803ff34bac647a3b729a82443737c4f60b (diff) | |
download | nrf-softdevice-c8b2ff9644356debe6fddc135f260884e8caf16e.zip |
Update deps.
-rw-r--r-- | .vscode/settings.json | 9 | ||||
-rw-r--r-- | Cargo.lock | 259 | ||||
-rw-r--r-- | Cargo.toml | 1 | ||||
-rw-r--r-- | examples/Cargo.toml | 5 | ||||
-rw-r--r-- | rust-toolchain.toml | 6 |
5 files changed, 136 insertions, 144 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 953054c..56c37a2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,13 +4,16 @@ "rust-analyzer.checkOnSave.allFeatures": false, "rust-analyzer.cargo.target": "thumbv7em-none-eabihf", "rust-analyzer.checkOnSave.allTargets": false, - "rust-analyzer.cargo.loadOutDirsFromCheck": true, + "rust-analyzer.cargo.runBuildScripts": true, + "rust-analyzer.experimental.procAttrMacros": false, "rust-analyzer.procMacro.enable": true, - "rust-analyzer.assist.importMergeBehavior": "last", + "rust-analyzer.assist.importGranularity": "module", + "rust-analyzer.linkedProjects": [ + "examples/Cargo.toml" + ], "files.watcherExclude": { "**/.git/objects/**": true, "**/.git/subtree-cache/**": true, "**/target/**": true, }, - "cmake.configureOnOpen": false }
\ No newline at end of file @@ -54,19 +54,18 @@ dependencies = [ [[package]] name = "atomic-polyfill" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686d748538a32325b28d6411dd8a939e7ad5128e5d0023cc4fd3573db456042" +checksum = "e14bf7b4f565e5e717d7a7a65b2a05c0b8c96e4db636d6f780f03b15108cdd1b" dependencies = [ "critical-section", - "riscv-target", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "az" @@ -80,7 +79,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3" dependencies = [ - "rustc_version", + "rustc_version 0.2.3", ] [[package]] @@ -109,9 +108,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bytemuck" -version = "1.7.3" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f" +checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" [[package]] name = "byteorder" @@ -146,7 +145,7 @@ checksum = "37ff967e867ca14eba0c34ac25cd71ea98c678e741e3915d923999bb2fe7c826" dependencies = [ "bare-metal 0.2.5", "bitfield", - "embedded-hal 0.2.6", + "embedded-hal 0.2.7", "volatile-register", ] @@ -172,9 +171,9 @@ dependencies = [ [[package]] name = "critical-section" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e191a5a6f6edad9b679777ef6b6c0f2bdd4a333f2ecb8f61c3e28109a03d70" +checksum = "95da181745b56d4bd339530ec393508910c909c784e8962d15d722bacf0bcbcd" dependencies = [ "bare-metal 1.0.0", "cfg-if", @@ -194,12 +193,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core 0.13.1", - "darling_macro 0.13.1", + "darling_core 0.13.4", + "darling_macro 0.13.4", ] [[package]] @@ -218,9 +217,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", @@ -243,20 +242,20 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core 0.13.1", + "darling_core 0.13.4", "quote", "syn", ] [[package]] name = "defmt" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fb5df4d2b06a2dbf6ba26b49031f5f45f1aafdfca4b9259719466d362f34a0" +checksum = "9252abe43d4c0a5df0c5c865129fa8daad338bb33357ba40023a37cd34b4a7b9" dependencies = [ "bitflags", "defmt-macros", @@ -264,9 +263,9 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098396b763a1786b329405f69bc3677e00d45eb4534bc9f31cd23011ee2ba267" +checksum = "6d944432e281084511691b36e5e9c794c19c33675822c9019e3b64f5b89e10da" dependencies = [ "defmt-parser", "proc-macro-error", @@ -277,14 +276,14 @@ dependencies = [ [[package]] name = "defmt-parser" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d1ce010e1a51aef925c98f12ed81a4e0e96ce0185a87c33f1b3b9c8f20749c7" +checksum = "0db23d29972d99baa3de2ee2ae3f104c10564a6d05a346eb3f4c4f2c0525a06e" [[package]] name = "embassy" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy#d76cd5ceaf5140c48ef97180beae156c0c0e07c8" +source = "git+https://github.com/embassy-rs/embassy#604051777419591cf66f5d06196cf16d3e399752" dependencies = [ "atomic-polyfill", "cfg-if", @@ -292,8 +291,8 @@ dependencies = [ "critical-section", "defmt", "embassy-macros", - "embassy-traits", - "embedded-hal 0.2.6", + "embedded-hal 0.2.7", + "embedded-hal-async", "futures", "heapless", "pin-project", @@ -302,20 +301,19 @@ dependencies = [ [[package]] name = "embassy-hal-common" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy#d76cd5ceaf5140c48ef97180beae156c0c0e07c8" +source = "git+https://github.com/embassy-rs/embassy#604051777419591cf66f5d06196cf16d3e399752" dependencies = [ "cortex-m 0.7.4", "embassy", "num-traits", - "usb-device", ] [[package]] name = "embassy-macros" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy#d76cd5ceaf5140c48ef97180beae156c0c0e07c8" +source = "git+https://github.com/embassy-rs/embassy#604051777419591cf66f5d06196cf16d3e399752" dependencies = [ - "darling 0.13.1", + "darling 0.13.4", "proc-macro2", "quote", "syn", @@ -324,7 +322,7 @@ dependencies = [ [[package]] name = "embassy-nrf" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy#d76cd5ceaf5140c48ef97180beae156c0c0e07c8" +source = "git+https://github.com/embassy-rs/embassy#604051777419591cf66f5d06196cf16d3e399752" dependencies = [ "cfg-if", "cortex-m 0.7.4", @@ -334,27 +332,28 @@ dependencies = [ "embassy", "embassy-hal-common", "embassy-macros", + "embassy-usb", "embedded-dma", - "embedded-hal 0.2.6", - "embedded-storage 0.2.0", + "embedded-hal 0.2.7", + "embedded-hal 1.0.0-alpha.8", + "embedded-hal-async", + "embedded-io", + "embedded-storage", + "embedded-storage-async", "fixed", "futures", - "nrf-usbd", - "nrf52840-pac 0.10.1", + "nrf52840-pac", "rand_core", - "usb-device", ] [[package]] -name = "embassy-traits" +name = "embassy-usb" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy#d76cd5ceaf5140c48ef97180beae156c0c0e07c8" +source = "git+https://github.com/embassy-rs/embassy#604051777419591cf66f5d06196cf16d3e399752" dependencies = [ "defmt", - "embedded-hal 0.2.6", - "embedded-hal 1.0.0-alpha.6", - "embedded-hal-async", - "nb 1.0.0", + "embassy", + "heapless", ] [[package]] @@ -368,9 +367,9 @@ dependencies = [ [[package]] name = "embedded-hal" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36cfb62ff156596c892272f3015ef952fe1525e85261fa3a7f327bd6b384ab9" +checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" dependencies = [ "nb 0.1.3", "void", @@ -378,25 +377,31 @@ dependencies = [ [[package]] name = "embedded-hal" -version = "1.0.0-alpha.6" -source = "git+https://github.com/embassy-rs/embedded-hal?branch=embassy#1fa64a1d2f9cc1a1ae632dbfcc4064a9f6504a3f" +version = "1.0.0-alpha.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3babfc7fd332142a0b11aebf592992f211f4e01b6222fb04b03aba1bd80018d" dependencies = [ "nb 1.0.0", ] [[package]] name = "embedded-hal-async" -version = "0.0.1" -source = "git+https://github.com/embassy-rs/embedded-hal?branch=embassy#1fa64a1d2f9cc1a1ae632dbfcc4064a9f6504a3f" +version = "0.1.0-alpha.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9f684248ddba6d9f33c40386e7d8954ec13ad3c49705af3264cf995cce5abd" dependencies = [ - "embedded-hal 1.0.0-alpha.6", + "embedded-hal 1.0.0-alpha.8", ] [[package]] -name = "embedded-storage" +name = "embedded-io" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723dce4e9f25b6e6c5f35628e144794e5b459216ed7da97b7c4b66cdb3fa82ca" +checksum = "7fe1572ca75ff2cbb520a8b0b5a9eb589073524748c82e457adb34c6cf0e6af4" +dependencies = [ + "defmt", + "futures", +] [[package]] name = "embedded-storage" @@ -410,14 +415,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ff04af74e47e9bb4315bd7aa2b01f3d1b05f33c03a6c4e9c3b20e9ce9cd8d79" dependencies = [ - "embedded-storage 0.3.0", + "embedded-storage", ] [[package]] name = "fixed" -version = "1.11.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a9a8cb2e34880a498f09367089339bda5e12d6f871640f947850f7113058c0" +checksum = "36a65312835c1097a0c926ff3702df965285fadc33d948b87397ff8961bad881" dependencies = [ "az", "bytemuck", @@ -433,9 +438,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -447,9 +452,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -457,33 +462,33 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-io" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-sink" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-util" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures-core", "futures-sink", @@ -537,12 +542,13 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d076121838e03f862871315477528debffdb7462fb229216ecef91b1a3eb31eb" +checksum = "bf3aa654fd5797bcce240927e736c84617d9db084afe6e5a63e4f065b2b8119c" dependencies = [ "atomic-polyfill", "hash32", + "rustc_version 0.4.0", "spin", "stable_deref_trait", ] @@ -567,27 +573,28 @@ checksum = "822add9edb1860698b79522510da17bef885171f75aa395cff099d770c609c24" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "nb" @@ -613,7 +620,7 @@ dependencies = [ "critical-section", "defmt", "embassy", - "embedded-storage 0.3.0", + "embedded-storage", "embedded-storage-async", "fixed", "futures", @@ -631,7 +638,7 @@ dependencies = [ "nrf52820-pac", "nrf52832-pac", "nrf52833-pac", - "nrf52840-pac 0.11.0", + "nrf52840-pac", "num_enum", ] @@ -655,8 +662,7 @@ dependencies = [ "defmt", "embassy", "embassy-nrf", - "embassy-traits", - "embedded-storage 0.3.0", + "embedded-storage", "embedded-storage-async", "fixed", "futures", @@ -704,19 +710,6 @@ name = "nrf-softdevice-s140" version = "0.1.1" [[package]] -name = "nrf-usbd" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640e88d4c108743c667f03320d0c9ab24a20f183a7a1b18bde7891ee13fd92c5" -dependencies = [ - "bare-metal 1.0.0", - "cortex-m 0.7.4", - "critical-section", - "usb-device", - "vcell", -] - -[[package]] name = "nrf52805-pac" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -784,17 +777,6 @@ dependencies = [ [[package]] name = "nrf52840-pac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209c71d29ce1c0e9249b59ffff1ff5035c68b65070bf4c1315767fa4c93103ac" -dependencies = [ - "cortex-m 0.7.4", - "cortex-m-rt", - "vcell", -] - -[[package]] -name = "nrf52840-pac" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9efa9d1e910e3b825fd7e28f369363a8e036b386b77e21035b9f0e510de199cf" @@ -806,27 +788,27 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] name = "num_enum" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro2", "quote", @@ -865,9 +847,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -901,18 +883,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -925,9 +907,9 @@ checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", @@ -967,7 +949,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver", + "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.9", ] [[package]] @@ -986,6 +977,12 @@ dependencies = [ ] [[package]] +name = "semver" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" + +[[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -993,9 +990,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "spin" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" +checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d" dependencies = [ "lock_api", ] @@ -1020,9 +1017,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2" dependencies = [ "proc-macro2", "quote", @@ -1037,15 +1034,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "usb-device" -version = "0.2.8" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6be90410d4772074ea49525e2e753b65920b94b57eee21a6ef7b6a6fe6296245" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "uuid" @@ -24,7 +24,6 @@ exclude = [ embassy = { git = "https://github.com/embassy-rs/embassy" } embassy-nrf = { git = "https://github.com/embassy-rs/embassy" } embassy-macros = { git = "https://github.com/embassy-rs/embassy" } -embassy-traits = { git = "https://github.com/embassy-rs/embassy" } [profile.release] codegen-units = 1 diff --git a/examples/Cargo.toml b/examples/Cargo.toml index ea91e02..e2a936e 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -16,9 +16,8 @@ ble-gatt-server = ["nrf-softdevice/ble-gatt-server"] ble-gatt-client = ["nrf-softdevice/ble-gatt-client"] [dependencies] -embassy = { version = "0.1.0", features = ["defmt"]} -embassy-traits = { version = "0.1.0", features = ["defmt"]} -embassy-nrf = { version = "0.1.0", features = [ "defmt", "nrf52840", "gpiote", "time-driver-rtc1" ]} +embassy = { version = "0.1.0", features = ["nightly", "defmt"]} +embassy-nrf = { version = "0.1.0", features = [ "nightly", "defmt", "nrf52840", "gpiote", "time-driver-rtc1" ]} cortex-m = { version = "0.7.2" } cortex-m-rt = "0.7.0" defmt = { version = "0.3", features = ["alloc"] } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3395ca8..e73ef7e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ # Before upgrading check that everything is available on all tier1 targets here: # https://rust-lang.github.io/rustup-components-history [toolchain] -channel = "nightly-2021-12-16" -components = ["rust-src", "rustfmt"] -targets = ["thumbv7em-none-eabihf"] +channel = "nightly-2022-04-24" +components = [ "rust-src", "rustfmt" ] +targets = [ "thumbv7em-none-eabi", "thumbv7m-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf", "wasm32-unknown-unknown" ] |