Merge branch 'main' into 17-add-support-for-boot-protocol

1 files changed, 7 insertions, 15 deletions

diff --git a/embassy-executor/tests/ui/spawn_nonsend.stderr b/embassy-executor/tests/ui/spawn_nonsend.stderr
index 25bd7d78d..31efadd49 100644
--- a/embassy-executor/tests/ui/spawn_nonsend.stderr
+++ b/embassy-executor/tests/ui/spawn_nonsend.stderr
@@ -1,27 +1,19 @@
-warning: unused import: `core::future::Future`
- --> tests/ui/spawn_nonsend.rs:3:5
-  |
-3 | use core::future::Future;
-  |     ^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: `#[warn(unused_imports)]` on by default
-
 error[E0277]: `*mut ()` cannot be sent between threads safely
-  --> tests/ui/spawn_nonsend.rs:13:13
+  --> tests/ui/spawn_nonsend.rs:11:13
    |
-7  | #[embassy_executor::task]
+ 5 | #[embassy_executor::task]
    | ------------------------- within this `impl Sized`
 ...
-13 |     s.spawn(task(core::ptr::null_mut()).unwrap());
+11 |     s.spawn(task(core::ptr::null_mut()).unwrap());
    |       ----- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*mut ()` cannot be sent between threads safely
    |       |
    |       required by a bound introduced by this call
    |
    = help: within `impl Sized`, the trait `Send` is not implemented for `*mut ()`
 note: required because it's used within this closure
-  --> tests/ui/spawn_nonsend.rs:7:1
+  --> tests/ui/spawn_nonsend.rs:5:1
    |
-7  | #[embassy_executor::task]
+ 5 | #[embassy_executor::task]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: required because it appears within the type `impl Sized`
   --> src/raw/mod.rs
@@ -29,9 +21,9 @@ note: required because it appears within the type `impl Sized`
    |     pub unsafe fn _spawn_async_fn<FutFn>(&'static self, future: FutFn) -> Result<SpawnToken<impl Sized>, SpawnError>
    |                                                                                             ^^^^^^^^^^
 note: required because it appears within the type `impl Sized`
-  --> tests/ui/spawn_nonsend.rs:7:1
+  --> tests/ui/spawn_nonsend.rs:5:1
    |
-7  | #[embassy_executor::task]
+ 5 | #[embassy_executor::task]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: required by a bound in `SendSpawner::spawn`
   --> src/spawner.rs