From 94566dff73a2d8978785ca9162b3798c0d9b7ed7 Mon Sep 17 00:00:00 2001 From: Santiago Cingolani Date: Wed, 13 Mar 2024 15:53:38 +0100 Subject: [PATCH] Bump embassy-sync version --- examples/linux/Cargo.lock | 49 ++++++++++++++++++++++---- examples/linux/Cargo.toml | 2 +- examples/stm32h745i/cm4/Cargo.lock | 52 ++++++++++++++++++--------- examples/stm32h745i/cm7/Cargo.lock | 56 ++++++++++++++++++++---------- examples/stm32h745i/cm7/Cargo.toml | 2 +- heimlig/Cargo.lock | 45 +++++++++++++++++++++--- heimlig/Cargo.toml | 2 +- 7 files changed, 159 insertions(+), 49 deletions(-) diff --git a/examples/linux/Cargo.lock b/examples/linux/Cargo.lock index ce59cd6b..70c545ac 100644 --- a/examples/linux/Cargo.lock +++ b/examples/linux/Cargo.lock @@ -490,14 +490,15 @@ dependencies = [ [[package]] name = "embassy-sync" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0525b466ca3ace30b57f2db868a35215dfaecd038d8668cb2db03feb7c069a0" +checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", + "embedded-io-async", "futures-util", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -510,7 +511,7 @@ dependencies = [ "critical-section", "embedded-hal", "futures-util", - "heapless", + "heapless 0.7.16", "log", ] @@ -524,6 +525,21 @@ dependencies = [ "void", ] +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + +[[package]] +name = "embedded-io-async" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" +dependencies = [ + "embedded-io", +] + [[package]] name = "errno" version = "0.3.5" @@ -692,6 +708,15 @@ dependencies = [ "byteorder", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -705,12 +730,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" dependencies = [ "atomic-polyfill 0.1.11", - "hash32", + "hash32 0.2.1", "rustc_version", "spin", "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32 0.3.1", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -737,7 +772,7 @@ dependencies = [ "embassy-futures", "embassy-sync", "futures", - "heapless", + "heapless 0.7.16", "hmac", "p256", "p384", @@ -851,7 +886,7 @@ dependencies = [ "embassy-sync", "embassy-time", "futures", - "heapless", + "heapless 0.7.16", "heimlig", "hex", "log", diff --git a/examples/linux/Cargo.toml b/examples/linux/Cargo.toml index e137bf35..5f83406c 100644 --- a/examples/linux/Cargo.toml +++ b/examples/linux/Cargo.toml @@ -11,7 +11,7 @@ path = "src/main.rs" [dependencies] embassy-executor = { version = "0.3.0", features = ["arch-std", "executor-thread", "integrated-timers", "log", "nightly"] } -embassy-sync = { version = "0.3.0" } +embassy-sync = { version = "0.5.0" } embassy-time = { version = "0.1.3", features = ["log", "std"] } futures = "0.3.28" heapless = "0.7.16" diff --git a/examples/stm32h745i/cm4/Cargo.lock b/examples/stm32h745i/cm4/Cargo.lock index 46e83b0f..39e68196 100644 --- a/examples/stm32h745i/cm4/Cargo.lock +++ b/examples/stm32h745i/cm4/Cargo.lock @@ -560,7 +560,7 @@ source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e dependencies = [ "defmt", "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", - "embassy-sync 0.3.0 (git+https://github.com/embassy-rs/embassy.git)", + "embassy-sync 0.3.0", "embassy-time", "embedded-hal 0.2.7", "embedded-hal 1.0.0-rc.1", @@ -643,7 +643,7 @@ dependencies = [ "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", "embassy-hal-internal", "embassy-net-driver", - "embassy-sync 0.3.0 (git+https://github.com/embassy-rs/embassy.git)", + "embassy-sync 0.3.0", "embassy-time", "embassy-usb-driver", "embedded-hal 0.2.7", @@ -668,25 +668,26 @@ dependencies = [ [[package]] name = "embassy-sync" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0525b466ca3ace30b57f2db868a35215dfaecd038d8668cb2db03feb7c069a0" +source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" dependencies = [ "cfg-if", "critical-section", + "defmt", "futures-util", - "heapless", + "heapless 0.7.16", ] [[package]] name = "embassy-sync" -version = "0.3.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", - "defmt", + "embedded-io-async", "futures-util", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -701,7 +702,7 @@ dependencies = [ "embedded-hal 1.0.0-rc.1", "embedded-hal-async", "futures-util", - "heapless", + "heapless 0.7.16", ] [[package]] @@ -758,9 +759,9 @@ dependencies = [ [[package]] name = "embedded-io-async" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de03527d6fb488b2d7c7a4dc81dfb6a657efe264256bfc70bb899746821666b1" +checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" dependencies = [ "defmt", "embedded-io", @@ -933,6 +934,15 @@ dependencies = [ "byteorder", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -946,12 +956,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" dependencies = [ "atomic-polyfill 0.1.11", - "hash32", + "hash32 0.2.1", "rustc_version 0.4.0", "spin", "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32 0.3.1", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -976,9 +996,9 @@ dependencies = [ "ed25519-dalek", "elliptic-curve", "embassy-futures 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "embassy-sync 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "embassy-sync 0.5.0", "futures", - "heapless", + "heapless 0.7.16", "hmac", "p256", "p384", @@ -1493,7 +1513,7 @@ dependencies = [ "embassy-executor", "embassy-stm32", "embassy-time", - "heapless", + "heapless 0.7.16", "heimlig", "panic-probe", "rand", diff --git a/examples/stm32h745i/cm7/Cargo.lock b/examples/stm32h745i/cm7/Cargo.lock index 279dfc8a..e2e1d95d 100644 --- a/examples/stm32h745i/cm7/Cargo.lock +++ b/examples/stm32h745i/cm7/Cargo.lock @@ -560,7 +560,7 @@ source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e dependencies = [ "defmt", "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", - "embassy-sync 0.3.0 (git+https://github.com/embassy-rs/embassy.git)", + "embassy-sync 0.3.0", "embassy-time 0.1.5", "embedded-hal 0.2.7", "embedded-hal 1.0.0-rc.1", @@ -645,7 +645,7 @@ dependencies = [ "embassy-futures 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", "embassy-hal-internal", "embassy-net-driver", - "embassy-sync 0.3.0 (git+https://github.com/embassy-rs/embassy.git)", + "embassy-sync 0.3.0", "embassy-time 0.1.5", "embassy-usb-driver", "embedded-hal 0.2.7", @@ -670,25 +670,26 @@ dependencies = [ [[package]] name = "embassy-sync" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0525b466ca3ace30b57f2db868a35215dfaecd038d8668cb2db03feb7c069a0" +source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" dependencies = [ "cfg-if", "critical-section", + "defmt", "futures-util", - "heapless", + "heapless 0.7.16", ] [[package]] name = "embassy-sync" -version = "0.3.0" -source = "git+https://github.com/embassy-rs/embassy.git#b6fc682117a41e8e63a9632e06da5a17f46d9ab0" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", - "defmt", + "embedded-io-async", "futures-util", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -701,7 +702,7 @@ dependencies = [ "critical-section", "embedded-hal 0.2.7", "futures-util", - "heapless", + "heapless 0.7.16", ] [[package]] @@ -716,7 +717,7 @@ dependencies = [ "embedded-hal 1.0.0-rc.1", "embedded-hal-async", "futures-util", - "heapless", + "heapless 0.7.16", ] [[package]] @@ -773,9 +774,9 @@ dependencies = [ [[package]] name = "embedded-io-async" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de03527d6fb488b2d7c7a4dc81dfb6a657efe264256bfc70bb899746821666b1" +checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" dependencies = [ "defmt", "embedded-io", @@ -948,6 +949,15 @@ dependencies = [ "byteorder", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -961,12 +971,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" dependencies = [ "atomic-polyfill 0.1.11", - "hash32", + "hash32 0.2.1", "rustc_version 0.4.0", "spin", "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32 0.3.1", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -991,9 +1011,9 @@ dependencies = [ "ed25519-dalek", "elliptic-curve", "embassy-futures 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "embassy-sync 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "embassy-sync 0.5.0", "futures", - "heapless", + "heapless 0.7.16", "hmac", "p256", "p384", @@ -1498,9 +1518,9 @@ dependencies = [ "defmt-rtt", "embassy-executor", "embassy-stm32", - "embassy-sync 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "embassy-sync 0.5.0", "embassy-time 0.1.5", - "heapless", + "heapless 0.7.16", "heimlig", "panic-probe", "rand_chacha", diff --git a/examples/stm32h745i/cm7/Cargo.toml b/examples/stm32h745i/cm7/Cargo.toml index a00a8d37..ea23b2d8 100644 --- a/examples/stm32h745i/cm7/Cargo.toml +++ b/examples/stm32h745i/cm7/Cargo.toml @@ -20,7 +20,7 @@ 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-sync = { version = "0.3.0", default-features = false } +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"] } heapless = { version = "0.7.16", default-features = false } panic-probe = { version = "0.3.1", features = ["print-defmt"] } diff --git a/heimlig/Cargo.lock b/heimlig/Cargo.lock index 927b275a..80657703 100644 --- a/heimlig/Cargo.lock +++ b/heimlig/Cargo.lock @@ -558,14 +558,30 @@ checksum = "47e5367165d347c039360f784812f493b001583ab6a3dd8622f4ce9c30374ec3" [[package]] name = "embassy-sync" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0525b466ca3ace30b57f2db868a35215dfaecd038d8668cb2db03feb7c069a0" +checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", + "embedded-io-async", "futures-util", - "heapless", + "heapless 0.8.0", +] + +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + +[[package]] +name = "embedded-io-async" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" +dependencies = [ + "embedded-io", ] [[package]] @@ -744,6 +760,15 @@ dependencies = [ "byteorder", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -757,12 +782,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" dependencies = [ "atomic-polyfill", - "hash32", + "hash32 0.2.1", "rustc_version", "spin", "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32 0.3.1", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -790,7 +825,7 @@ dependencies = [ "embassy-futures", "embassy-sync", "futures", - "heapless", + "heapless 0.7.16", "hex", "hmac", "p256", diff --git a/heimlig/Cargo.toml b/heimlig/Cargo.toml index c43f3e60..6bd77c0f 100644 --- a/heimlig/Cargo.toml +++ b/heimlig/Cargo.toml @@ -22,7 +22,7 @@ ecdsa = { version = "0.16.8", default-features = false } ed25519-dalek = { version = "2.1.1", default-features = false, features = ["zeroize"] } elliptic-curve = { version = "0.13.5", default-features = false } embassy-futures = { version = "0.1.0", default-features = false } -embassy-sync = { version = "0.3.0", default-features = false } +embassy-sync = { version = "0.5.0", default-features = false } futures = { version = "0.3.28", default-features = false } heapless = { version = "0.7.16", default-features = false, features = ["cas", "x86-sync-pool"] } hmac = { version = "0.12.1", default-features = false }