From 9458e0a1312e4e589669c9baada24fbadcd601d1 Mon Sep 17 00:00:00 2001 From: Norbert Fabritius Date: Wed, 21 Aug 2024 10:13:41 +0200 Subject: [PATCH] Remove dependency on git versions of embassy The move from unstable dependencies pulled directly from Github to the crates.io version required several changes: - Update of other dependencies to match the expectations of the crates .io versions. - Use `impl_trait_in_assoc_type` instead of `type_alias_impl_trait` feature. See https://github.com/rust-lang/rust/issues/63063 - Remove unstable features of dependencies. --- examples/linux/Cargo.lock | 98 ++++++++--- examples/linux/Cargo.toml | 4 +- examples/linux/src/main.rs | 2 +- examples/stm32h745i/cm4/Cargo.lock | 150 ++++++++-------- examples/stm32h745i/cm4/Cargo.toml | 6 +- examples/stm32h745i/cm4/src/bin/blinky.rs | 2 +- examples/stm32h745i/cm7/Cargo.lock | 165 ++++++++---------- examples/stm32h745i/cm7/Cargo.toml | 6 +- examples/stm32h745i/cm7/src/bin/blinky.rs | 2 +- .../stm32h745i/cm7/src/bin/rng_single_core.rs | 2 +- 10 files changed, 233 insertions(+), 204 deletions(-) diff --git a/examples/linux/Cargo.lock b/examples/linux/Cargo.lock index 1a9aa8f0..de6d7c8a 100644 --- a/examples/linux/Cargo.lock +++ b/examples/linux/Cargo.lock @@ -391,6 +391,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "ecdsa" version = "0.16.8" @@ -447,30 +456,23 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4aa6caef00aa56e881bce7c18b7172422c9bc930940a10e1abf2955d79243f" +checksum = "09ed0e24bdd4a5f4ff1b72ee4f264b1d23e179ea71a77d984b5fd24877a2bbe1" dependencies = [ - "atomic-polyfill", "critical-section", - "embassy-macros", - "embassy-time", - "futures-util", + "document-features", + "embassy-executor-macros", + "embassy-time-driver", + "embassy-time-queue-driver", "log", - "static_cell", ] [[package]] -name = "embassy-futures" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e5367165d347c039360f784812f493b001583ab6a3dd8622f4ce9c30374ec3" - -[[package]] -name = "embassy-macros" -version = "0.2.1" +name = "embassy-executor-macros" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d3eef431adfc517df1601e367f72b1c28a51c6eb91def7dc297be7fc8789a4" +checksum = "d4d4c0c34b32c2c653c9eecce1cefaf8539dd9a54e61deb5499254f01e2fcac2" dependencies = [ "darling", "proc-macro2", @@ -478,6 +480,12 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "embassy-futures" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e5367165d347c039360f784812f493b001583ab6a3dd8622f4ce9c30374ec3" + [[package]] name = "embassy-sync" version = "0.5.0" @@ -493,18 +501,38 @@ dependencies = [ [[package]] name = "embassy-time" -version = "0.1.5" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03bcc866a1d3c678da6fa1d28f655a074840b6122123975e156cfca7f1ccc78a" +checksum = "158080d48f824fad101d7b2fae2d83ac39e3f7a6fa01811034f7ab8ffc6e7309" dependencies = [ "cfg-if", "critical-section", - "embedded-hal", + "document-features", + "embassy-time-driver", + "embassy-time-queue-driver", + "embedded-hal 0.2.7", + "embedded-hal 1.0.0", + "embedded-hal-async", "futures-util", - "heapless 0.7.17", + "heapless 0.8.0", "log", ] +[[package]] +name = "embassy-time-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24" +dependencies = [ + "document-features", +] + +[[package]] +name = "embassy-time-queue-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1177859559ebf42cd24ae7ba8fe6ee707489b01d0bf471f8827b7b12dcb0bc0" + [[package]] name = "embedded-hal" version = "0.2.7" @@ -515,6 +543,21 @@ dependencies = [ "void", ] +[[package]] +name = "embedded-hal" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" + +[[package]] +name = "embedded-hal-async" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" +dependencies = [ + "embedded-hal 1.0.0", +] + [[package]] name = "embedded-io" version = "0.6.1" @@ -890,6 +933,12 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.11" @@ -1238,15 +1287,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_cell" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cd323fc21eb534f903ee78d781d622099f9716c5b408ed23bcf39f8f1651c0" -dependencies = [ - "atomic-polyfill", -] - [[package]] name = "strsim" version = "0.10.0" diff --git a/examples/linux/Cargo.toml b/examples/linux/Cargo.toml index 5f83406c..6f0ca56c 100644 --- a/examples/linux/Cargo.toml +++ b/examples/linux/Cargo.toml @@ -10,9 +10,9 @@ name = "linux" path = "src/main.rs" [dependencies] -embassy-executor = { version = "0.3.0", features = ["arch-std", "executor-thread", "integrated-timers", "log", "nightly"] } +embassy-executor = { version = "0.6.0", features = ["arch-std", "executor-thread", "integrated-timers", "log", "nightly"] } embassy-sync = { version = "0.5.0" } -embassy-time = { version = "0.1.3", features = ["log", "std"] } +embassy-time = { version = "0.3.2", features = ["log", "std"] } futures = "0.3.28" heapless = "0.7.16" hex = "0.4.3" diff --git a/examples/linux/src/main.rs b/examples/linux/src/main.rs index 1866a6ff..145d7019 100644 --- a/examples/linux/src/main.rs +++ b/examples/linux/src/main.rs @@ -1,4 +1,4 @@ -#![feature(type_alias_impl_trait)] // Required for embassy +#![feature(impl_trait_in_assoc_type)] // Required for embassy use embassy_executor::Spawner; use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; diff --git a/examples/stm32h745i/cm4/Cargo.lock b/examples/stm32h745i/cm4/Cargo.lock index 175cf8d4..f0a36d21 100644 --- a/examples/stm32h745i/cm4/Cargo.lock +++ b/examples/stm32h745i/cm4/Cargo.lock @@ -546,14 +546,15 @@ dependencies = [ [[package]] name = "embassy-embedded-hal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca4a9380d03e61063067b8239f67d2fa9f108ede7c46b4273804f6b79e59a1d" dependencies = [ "defmt", - "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", - "embassy-sync 0.3.0", + "embassy-futures", + "embassy-sync", "embassy-time", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", "embedded-hal-async", "embedded-storage", "embedded-storage-async", @@ -562,34 +563,42 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.3.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ed0e24bdd4a5f4ff1b72ee4f264b1d23e179ea71a77d984b5fd24877a2bbe1" dependencies = [ - "atomic-polyfill", "cortex-m", "critical-section", "defmt", - "embassy-macros", - "embassy-time", - "futures-util", - "static_cell", + "document-features", + "embassy-executor-macros", + "embassy-time-driver", + "embassy-time-queue-driver", ] [[package]] -name = "embassy-futures" -version = "0.1.0" +name = "embassy-executor-macros" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e5367165d347c039360f784812f493b001583ab6a3dd8622f4ce9c30374ec3" +checksum = "d4d4c0c34b32c2c653c9eecce1cefaf8539dd9a54e61deb5499254f01e2fcac2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.38", +] [[package]] name = "embassy-futures" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e5367165d347c039360f784812f493b001583ab6a3dd8622f4ce9c30374ec3" [[package]] name = "embassy-hal-internal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ec47cf8bab914018d4bd2b4f0aaeb46e4f52ab1e7985df88aeef2c6eda5aed" dependencies = [ "cortex-m", "critical-section", @@ -597,21 +606,11 @@ dependencies = [ "num-traits", ] -[[package]] -name = "embassy-macros" -version = "0.2.1" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "embassy-net-driver" version = "0.2.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d" dependencies = [ "defmt", ] @@ -619,7 +618,8 @@ dependencies = [ [[package]] name = "embassy-stm32" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32bc0257b5ade13a1b93e8b9949268f44d57e8ce03e599ef1c5a62024a0fbff9" dependencies = [ "bit_field", "bxcan", @@ -630,14 +630,15 @@ dependencies = [ "defmt", "document-features", "embassy-embedded-hal", - "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", + "embassy-futures", "embassy-hal-internal", "embassy-net-driver", - "embassy-sync 0.3.0", + "embassy-sync", "embassy-time", + "embassy-time-driver", "embassy-usb-driver", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", "embedded-hal-async", "embedded-hal-nb", "embedded-io", @@ -655,18 +656,6 @@ dependencies = [ "vcell", ] -[[package]] -name = "embassy-sync" -version = "0.3.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" -dependencies = [ - "cfg-if", - "critical-section", - "defmt", - "futures-util", - "heapless 0.7.17", -] - [[package]] name = "embassy-sync" version = "0.5.0" @@ -675,6 +664,7 @@ checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", + "defmt", "embedded-io-async", "futures-util", "heapless 0.8.0", @@ -682,23 +672,43 @@ dependencies = [ [[package]] name = "embassy-time" -version = "0.1.5" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "158080d48f824fad101d7b2fae2d83ac39e3f7a6fa01811034f7ab8ffc6e7309" dependencies = [ "cfg-if", "critical-section", "defmt", + "document-features", + "embassy-time-driver", + "embassy-time-queue-driver", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", "embedded-hal-async", "futures-util", - "heapless 0.7.17", + "heapless 0.8.0", ] +[[package]] +name = "embassy-time-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24" +dependencies = [ + "document-features", +] + +[[package]] +name = "embassy-time-queue-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1177859559ebf42cd24ae7ba8fe6ee707489b01d0bf471f8827b7b12dcb0bc0" + [[package]] name = "embassy-usb-driver" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970" dependencies = [ "defmt", ] @@ -715,26 +725,26 @@ dependencies = [ [[package]] name = "embedded-hal" -version = "1.0.0-rc.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2894bc2f0457b8ca3d6b8ab8aad64d9337583672494013457f86c5a9146c0e22" +checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" [[package]] name = "embedded-hal-async" -version = "1.0.0-rc.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a8a3517745342155b3b00895a0f78417a453fb800d97a8bf4777d5720acde9" +checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" dependencies = [ - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", ] [[package]] name = "embedded-hal-nb" -version = "1.0.0-rc.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257e3bb0163c69195acb0ebe0083b017b963235861d5ea9741626abdc55f39c9" +checksum = "fba4268c14288c828995299e59b12babdbe170f6c6d73731af1b4648142e8605" dependencies = [ - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", "nb 1.1.0", ] @@ -759,15 +769,15 @@ dependencies = [ [[package]] name = "embedded-storage" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156d7a2fdd98ebbf9ae579cbceca3058cff946e13f8e17b90e3511db0508c723" +checksum = "a21dea9854beb860f3062d10228ce9b976da520a73474aed3171ec276bc0c032" [[package]] name = "embedded-storage-async" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052997a894670d0cde873faa7405bc98e2fd29f569d2acd568561bc1c396b35a" +checksum = "1763775e2323b7d5f0aa6090657f5e21cfa02ede71f5dc40eead06d64dcd15cc" dependencies = [ "embedded-storage", ] @@ -985,8 +995,8 @@ dependencies = [ "ecdsa", "ed25519-dalek", "elliptic-curve", - "embassy-futures 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "embassy-sync 0.5.0", + "embassy-futures", + "embassy-sync", "futures", "heapless 0.7.17", "hmac", @@ -1459,15 +1469,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_cell" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cd323fc21eb534f903ee78d781d622099f9716c5b408ed23bcf39f8f1651c0" -dependencies = [ - "atomic-polyfill", -] - [[package]] name = "stm32-fmc" version = "0.3.0" @@ -1479,8 +1480,9 @@ dependencies = [ [[package]] name = "stm32-metapac" -version = "14.0.0" -source = "git+https://github.com/embassy-rs/stm32-data-generated?tag=stm32-data-bcc9b6bf9fa195e91625849efc4ba473d9ace4e9#4f60a9c3c9583915a33c842a35574bead53aa8da" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deabea56a8821dcea05d0109f3ab3135f31eb572444e5da203d06149c594c8c6" dependencies = [ "cortex-m", "cortex-m-rt", diff --git a/examples/stm32h745i/cm4/Cargo.toml b/examples/stm32h745i/cm4/Cargo.toml index ddfed5ad..8e08296a 100644 --- a/examples/stm32h745i/cm4/Cargo.toml +++ b/examples/stm32h745i/cm4/Cargo.toml @@ -14,9 +14,9 @@ cortex-m = { version = "0.7.7", default-features = false, features = ["critical- cortex-m-rt = { version = "0.7.3", default-features = false } defmt = { version = "0.3.5", default-features = false } defmt-rtt = { version = "0.4.0", default-features = false } -embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", version = "0.3.0", features = ["arch-cortex-m", "defmt", "executor-thread", "integrated-timers", "nightly"] } -embassy-time = { git = "https://github.com/embassy-rs/embassy.git", version = "0.1.2", features = ["defmt", "defmt-timestamp-uptime", "nightly", "tick-hz-32_768", "unstable-traits"] } -embassy-stm32 = { git = "https://github.com/embassy-rs/embassy.git", version = "0.1", features = ["nightly", "defmt", "stm32h745xi-cm4", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } +embassy-executor = { version = "0.6.0", features = ["arch-cortex-m", "defmt", "executor-thread", "integrated-timers", "nightly"] } +embassy-time = { version = "0.3.2", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } +embassy-stm32 = { version = "0.1", features = ["defmt", "stm32h745xi-cm4", "time-driver-any", "exti"] } heapless = { version = "0.7.16", default-features = false } panic-probe = { version = "0.3.1", features = ["print-defmt"] } rand = { version = "0.8.5", default-features = false } diff --git a/examples/stm32h745i/cm4/src/bin/blinky.rs b/examples/stm32h745i/cm4/src/bin/blinky.rs index aa46b65e..89fbabf4 100644 --- a/examples/stm32h745i/cm4/src/bin/blinky.rs +++ b/examples/stm32h745i/cm4/src/bin/blinky.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -#![feature(type_alias_impl_trait)] +#![feature(impl_trait_in_assoc_type)] use defmt::*; use embassy_executor::Spawner; diff --git a/examples/stm32h745i/cm7/Cargo.lock b/examples/stm32h745i/cm7/Cargo.lock index 7cc59a00..5013c6b8 100644 --- a/examples/stm32h745i/cm7/Cargo.lock +++ b/examples/stm32h745i/cm7/Cargo.lock @@ -546,14 +546,15 @@ dependencies = [ [[package]] name = "embassy-embedded-hal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca4a9380d03e61063067b8239f67d2fa9f108ede7c46b4273804f6b79e59a1d" dependencies = [ "defmt", - "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", - "embassy-sync 0.3.0", - "embassy-time 0.1.5", + "embassy-futures", + "embassy-sync", + "embassy-time", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", "embedded-hal-async", "embedded-storage", "embedded-storage-async", @@ -562,35 +563,42 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4aa6caef00aa56e881bce7c18b7172422c9bc930940a10e1abf2955d79243f" +checksum = "09ed0e24bdd4a5f4ff1b72ee4f264b1d23e179ea71a77d984b5fd24877a2bbe1" dependencies = [ - "atomic-polyfill", "cortex-m", "critical-section", "defmt", - "embassy-macros", - "embassy-time 0.1.4", - "futures-util", - "static_cell", + "document-features", + "embassy-executor-macros", + "embassy-time-driver", + "embassy-time-queue-driver", ] [[package]] -name = "embassy-futures" -version = "0.1.0" +name = "embassy-executor-macros" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e5367165d347c039360f784812f493b001583ab6a3dd8622f4ce9c30374ec3" +checksum = "d4d4c0c34b32c2c653c9eecce1cefaf8539dd9a54e61deb5499254f01e2fcac2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.38", +] [[package]] name = "embassy-futures" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e5367165d347c039360f784812f493b001583ab6a3dd8622f4ce9c30374ec3" [[package]] name = "embassy-hal-internal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ec47cf8bab914018d4bd2b4f0aaeb46e4f52ab1e7985df88aeef2c6eda5aed" dependencies = [ "cortex-m", "critical-section", @@ -598,22 +606,11 @@ dependencies = [ "num-traits", ] -[[package]] -name = "embassy-macros" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d3eef431adfc517df1601e367f72b1c28a51c6eb91def7dc297be7fc8789a4" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "embassy-net-driver" version = "0.2.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d" dependencies = [ "defmt", ] @@ -621,7 +618,8 @@ dependencies = [ [[package]] name = "embassy-stm32" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32bc0257b5ade13a1b93e8b9949268f44d57e8ce03e599ef1c5a62024a0fbff9" dependencies = [ "bit_field", "bxcan", @@ -632,14 +630,15 @@ dependencies = [ "defmt", "document-features", "embassy-embedded-hal", - "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", + "embassy-futures", "embassy-hal-internal", "embassy-net-driver", - "embassy-sync 0.3.0", - "embassy-time 0.1.5", + "embassy-sync", + "embassy-time", + "embassy-time-driver", "embassy-usb-driver", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", "embedded-hal-async", "embedded-hal-nb", "embedded-io", @@ -657,18 +656,6 @@ dependencies = [ "vcell", ] -[[package]] -name = "embassy-sync" -version = "0.3.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" -dependencies = [ - "cfg-if", - "critical-section", - "defmt", - "futures-util", - "heapless 0.7.17", -] - [[package]] name = "embassy-sync" version = "0.5.0" @@ -677,6 +664,7 @@ checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", + "defmt", "embedded-io-async", "futures-util", "heapless 0.8.0", @@ -684,36 +672,43 @@ dependencies = [ [[package]] name = "embassy-time" -version = "0.1.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eece6d4c82b7533d3c5a7751024b83eb790b3a89dd1de29a6e9a76b33b53ce78" +checksum = "158080d48f824fad101d7b2fae2d83ac39e3f7a6fa01811034f7ab8ffc6e7309" dependencies = [ "cfg-if", "critical-section", + "defmt", + "document-features", + "embassy-time-driver", + "embassy-time-queue-driver", "embedded-hal 0.2.7", + "embedded-hal 1.0.0", + "embedded-hal-async", "futures-util", - "heapless 0.7.17", + "heapless 0.8.0", ] [[package]] -name = "embassy-time" -version = "0.1.5" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +name = "embassy-time-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24" dependencies = [ - "cfg-if", - "critical-section", - "defmt", - "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.1", - "embedded-hal-async", - "futures-util", - "heapless 0.7.17", + "document-features", ] +[[package]] +name = "embassy-time-queue-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1177859559ebf42cd24ae7ba8fe6ee707489b01d0bf471f8827b7b12dcb0bc0" + [[package]] name = "embassy-usb-driver" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970" dependencies = [ "defmt", ] @@ -730,26 +725,26 @@ dependencies = [ [[package]] name = "embedded-hal" -version = "1.0.0-rc.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2894bc2f0457b8ca3d6b8ab8aad64d9337583672494013457f86c5a9146c0e22" +checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" [[package]] name = "embedded-hal-async" -version = "1.0.0-rc.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a8a3517745342155b3b00895a0f78417a453fb800d97a8bf4777d5720acde9" +checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" dependencies = [ - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", ] [[package]] name = "embedded-hal-nb" -version = "1.0.0-rc.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257e3bb0163c69195acb0ebe0083b017b963235861d5ea9741626abdc55f39c9" +checksum = "fba4268c14288c828995299e59b12babdbe170f6c6d73731af1b4648142e8605" dependencies = [ - "embedded-hal 1.0.0-rc.1", + "embedded-hal 1.0.0", "nb 1.1.0", ] @@ -774,15 +769,15 @@ dependencies = [ [[package]] name = "embedded-storage" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156d7a2fdd98ebbf9ae579cbceca3058cff946e13f8e17b90e3511db0508c723" +checksum = "a21dea9854beb860f3062d10228ce9b976da520a73474aed3171ec276bc0c032" [[package]] name = "embedded-storage-async" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052997a894670d0cde873faa7405bc98e2fd29f569d2acd568561bc1c396b35a" +checksum = "1763775e2323b7d5f0aa6090657f5e21cfa02ede71f5dc40eead06d64dcd15cc" dependencies = [ "embedded-storage", ] @@ -1000,8 +995,8 @@ dependencies = [ "ecdsa", "ed25519-dalek", "elliptic-curve", - "embassy-futures 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "embassy-sync 0.5.0", + "embassy-futures", + "embassy-sync", "futures", "heapless 0.7.17", "hmac", @@ -1465,15 +1460,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_cell" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cd323fc21eb534f903ee78d781d622099f9716c5b408ed23bcf39f8f1651c0" -dependencies = [ - "atomic-polyfill", -] - [[package]] name = "stm32-fmc" version = "0.3.0" @@ -1485,8 +1471,9 @@ dependencies = [ [[package]] name = "stm32-metapac" -version = "14.0.0" -source = "git+https://github.com/embassy-rs/stm32-data-generated?tag=stm32-data-bcc9b6bf9fa195e91625849efc4ba473d9ace4e9#4f60a9c3c9583915a33c842a35574bead53aa8da" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deabea56a8821dcea05d0109f3ab3135f31eb572444e5da203d06149c594c8c6" dependencies = [ "cortex-m", "cortex-m-rt", @@ -1502,8 +1489,8 @@ dependencies = [ "defmt-rtt", "embassy-executor", "embassy-stm32", - "embassy-sync 0.5.0", - "embassy-time 0.1.5", + "embassy-sync", + "embassy-time", "heapless 0.7.17", "heimlig", "panic-probe", diff --git a/examples/stm32h745i/cm7/Cargo.toml b/examples/stm32h745i/cm7/Cargo.toml index ea23b2d8..8bff301e 100644 --- a/examples/stm32h745i/cm7/Cargo.toml +++ b/examples/stm32h745i/cm7/Cargo.toml @@ -18,10 +18,10 @@ cortex-m = { version = "0.7.7", default-features = false, features = ["critical- cortex-m-rt = { version = "0.7.3", default-features = false } defmt = { version = "0.3.5", default-features = false } defmt-rtt = { version = "0.4.0", default-features = false } -embassy-executor = { version = "0.3.0", features = ["arch-cortex-m", "defmt", "executor-thread", "integrated-timers", "nightly"] } -embassy-stm32 = { git = "https://github.com/embassy-rs/embassy.git", version = "0.1.0", features = ["nightly", "defmt", "stm32h745xi-cm7", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } +embassy-executor = { version = "0.6.0", features = ["arch-cortex-m", "defmt", "executor-thread", "integrated-timers", "nightly"] } +embassy-stm32 = { version = "0.1.0", features = ["defmt", "stm32h745xi-cm7", "time-driver-any", "exti"] } embassy-sync = { version = "0.5.0", default-features = false } -embassy-time = { git = "https://github.com/embassy-rs/embassy.git", version = "0.1.2", features = ["defmt", "defmt-timestamp-uptime", "nightly", "tick-hz-32_768", "unstable-traits"] } +embassy-time = { version = "0.3.2", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } heapless = { version = "0.7.16", default-features = false } panic-probe = { version = "0.3.1", features = ["print-defmt"] } rand_chacha = { version = "0.3.1", default-features = false } diff --git a/examples/stm32h745i/cm7/src/bin/blinky.rs b/examples/stm32h745i/cm7/src/bin/blinky.rs index ed358217..bb82e599 100644 --- a/examples/stm32h745i/cm7/src/bin/blinky.rs +++ b/examples/stm32h745i/cm7/src/bin/blinky.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -#![feature(type_alias_impl_trait)] +#![feature(impl_trait_in_assoc_type)] use defmt::*; use embassy_executor::Spawner; diff --git a/examples/stm32h745i/cm7/src/bin/rng_single_core.rs b/examples/stm32h745i/cm7/src/bin/rng_single_core.rs index 33de4c8d..1314e489 100644 --- a/examples/stm32h745i/cm7/src/bin/rng_single_core.rs +++ b/examples/stm32h745i/cm7/src/bin/rng_single_core.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -#![feature(type_alias_impl_trait)] +#![feature(impl_trait_in_assoc_type)] use defmt::*; use embassy_executor::Spawner;