Merge branch 'main' into embassy-git

3 files changed, 35 insertions, 47 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 48c2c00..fe3eb21 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.2.52"
+version = "1.2.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
+checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -143,7 +143,7 @@ dependencies = [
 [[package]]
 name = "embassy-executor"
 version = "0.9.1"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "cordyceps",
  "critical-section",
@@ -155,7 +155,7 @@ dependencies = [
 [[package]]
 name = "embassy-executor-macros"
 version = "0.7.0"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -166,12 +166,12 @@ dependencies = [
 [[package]]
 name = "embassy-executor-timer-queue"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 
 [[package]]
 name = "embassy-futures"
 version = "0.1.2"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 
 [[package]]
 name = "embassy-ha"
@@ -184,8 +184,7 @@ dependencies = [
  "embassy-net",
  "embassy-sync",
  "embassy-time",
- "embedded-io-async 0.6.1",
- "embedded-io-async 0.7.0",
+ "embedded-io-async",
  "heapless 0.9.2",
  "rand",
  "serde",
@@ -198,14 +197,14 @@ dependencies = [
 [[package]]
 name = "embassy-net"
 version = "0.8.0"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "defmt 1.0.1",
  "document-features",
  "embassy-net-driver",
  "embassy-sync",
  "embassy-time",
- "embedded-io-async 0.7.0",
+ "embedded-io-async",
  "embedded-nal-async",
  "heapless 0.8.0",
  "managed",
@@ -215,7 +214,7 @@ dependencies = [
 [[package]]
 name = "embassy-net-driver"
 version = "0.2.0"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "defmt 1.0.1",
 ]
@@ -223,12 +222,12 @@ dependencies = [
 [[package]]
 name = "embassy-sync"
 version = "0.7.2"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "cfg-if",
  "critical-section",
  "defmt 1.0.1",
- "embedded-io-async 0.7.0",
+ "embedded-io-async",
  "futures-core",
  "futures-sink",
  "heapless 0.8.0",
@@ -237,7 +236,7 @@ dependencies = [
 [[package]]
 name = "embassy-time"
 version = "0.5.0"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "cfg-if",
  "critical-section",
@@ -254,7 +253,7 @@ dependencies = [
 [[package]]
 name = "embassy-time-driver"
 version = "0.2.1"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "document-features",
 ]
@@ -262,7 +261,7 @@ dependencies = [
 [[package]]
 name = "embassy-time-queue-utils"
 version = "0.3.0"
-source = "git+https://github.com/embassy-rs/embassy#c862fea52335854074f32ce786b1ea60e0972dfb"
+source = "git+https://github.com/embassy-rs/embassy#dd4b0ae19e97101dab86af061e69e2d3d3a03387"
 dependencies = [
  "embassy-executor-timer-queue",
  "heapless 0.8.0",
@@ -295,32 +294,17 @@ dependencies = [
 
 [[package]]
 name = "embedded-io"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
-
-[[package]]
-name = "embedded-io"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7"
 
 [[package]]
 name = "embedded-io-async"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f"
-dependencies = [
- "embedded-io 0.6.1",
-]
-
-[[package]]
-name = "embedded-io-async"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2564b9f813c544241430e147d8bc454815ef9ac998878d30cc3055449f7fd4c0"
 dependencies = [
- "embedded-io 0.7.1",
+ "embedded-io",
 ]
 
 [[package]]
@@ -338,15 +322,15 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb5a1bd585135d302f8f6d7de329310938093da6271b37a6c94b8798795c0c6d"
 dependencies = [
- "embedded-io-async 0.7.0",
+ "embedded-io-async",
  "embedded-nal",
 ]
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
+checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
 
 [[package]]
 name = "fnv"
@@ -607,9 +591,9 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
  "getrandom",
 ]
@@ -759,18 +743,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -867,9 +851,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
  "wit-bindgen",
 ]
@@ -900,9 +884,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.46.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 
 [[package]]
 name = "zerocopy"
diff --git a/Cargo.toml b/Cargo.toml
index 480d32b..5821533 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,14 +26,14 @@ defmt = { version = "1", optional = true }
 tracing = { version = "0.1", optional = true, default-features = false }
 embassy-sync = { git = "https://github.com/embassy-rs/embassy" }
 embassy-futures = { git = "https://github.com/embassy-rs/embassy" }
-embedded-io-async = { version = "0.7" }
+embedded-io-async = "0.7"
 
 [dev-dependencies]
 embassy-time = { git = "https://github.com/embassy-rs/embassy", features = ["std"] }
 embassy-executor = { git = "https://github.com/embassy-rs/embassy", features = ["arch-std", "executor-thread"] }
 embassy-sync = { git = "https://github.com/embassy-rs/embassy" }
 static_cell = "2.1"
-embedded-io-async = { version = "0.6", features = ["std"] }
+embedded-io-async = { version = "0.7", features = ["std"] }
 critical-section = { version = "1", features = ["std"] }
 rand = "0.9"
 tracing-subscriber = "0.3"
diff --git a/examples/common/std_async_tcp.rs b/examples/common/std_async_tcp.rs
index 10a9fd8..5d20aee 100644
--- a/examples/common/std_async_tcp.rs
+++ b/examples/common/std_async_tcp.rs
@@ -93,6 +93,10 @@ impl embedded_io_async::Write for AsyncTcp {
         self.write_handle.thread().unpark();
         Ok(buf.len())
     }
+
+    async fn flush(&mut self) -> Result<(), Self::Error> {
+        Ok(())
+    }
 }
 
 impl embedded_io_async::Read for AsyncTcp {