Merge branch main into n6

6 files changed, 18 insertions, 28 deletions

diff --git a/embassy-executor/tests/test.rs b/embassy-executor/tests/test.rs
index 6baf3dc21..a99976168 100644
--- a/embassy-executor/tests/test.rs
+++ b/embassy-executor/tests/test.rs
@@ -2,14 +2,14 @@
 #![cfg_attr(feature = "nightly", feature(never_type))]
 
 use std::boxed::Box;
-use std::future::{poll_fn, Future};
+use std::future::{Future, poll_fn};
 use std::sync::{Arc, Mutex};
 use std::task::Poll;
 
 use embassy_executor::raw::Executor;
-use embassy_executor::{task, Spawner};
+use embassy_executor::{Spawner, task};
 
-#[export_name = "__pender"]
+#[unsafe(export_name = "__pender")]
 fn __pender(context: *mut ()) {
     unsafe {
         let trace = &*(context as *const Trace);
diff --git a/embassy-executor/tests/ui/nonstatic_struct_elided.stderr b/embassy-executor/tests/ui/nonstatic_struct_elided.stderr
index 0ee1bfe0c..e6829bf5d 100644
--- a/embassy-executor/tests/ui/nonstatic_struct_elided.stderr
+++ b/embassy-executor/tests/ui/nonstatic_struct_elided.stderr
@@ -9,16 +9,16 @@ help: indicate the anonymous lifetime
 6 | async fn task(_x: Foo<'_>) {}
   |                      ++++
 
-error[E0700]: hidden type for `impl Sized` captures lifetime that does not appear in bounds
+error: lifetime may not live long enough
  --> tests/ui/nonstatic_struct_elided.rs:5:1
   |
 5 | #[embassy_executor::task]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^ opaque type defined here
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^ returning this value requires that `'1` must outlive `'static`
 6 | async fn task(_x: Foo) {}
-  |                   --- hidden type `impl Sized` captures the anonymous lifetime defined here
+  |               -- has type `Foo<'1>`
   |
   = note: this error originates in the attribute macro `embassy_executor::task` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: add a `use<...>` bound to explicitly capture `'_`
+help: to declare that `impl Sized` captures data from argument `_x`, you can add an explicit `'_` lifetime bound
   |
-5 | #[embassy_executor::task] + use<'_>
-  |                           +++++++++
+5 | #[embassy_executor::task] + '_
+  |                           ++++
diff --git a/embassy-executor/tests/ui/spawn_nonsend.rs b/embassy-executor/tests/ui/spawn_nonsend.rs
index 601041941..a06c0b37a 100644
--- a/embassy-executor/tests/ui/spawn_nonsend.rs
+++ b/embassy-executor/tests/ui/spawn_nonsend.rs
@@ -1,7 +1,5 @@
 #![cfg_attr(feature = "nightly", feature(impl_trait_in_assoc_type))]
 
-use core::future::Future;
-
 use embassy_executor::SendSpawner;
 
 #[embassy_executor::task]
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
diff --git a/embassy-executor/tests/ui/task_safety_attribute.rs b/embassy-executor/tests/ui/task_safety_attribute.rs
index ab5a2f99f..46a5c665f 100644
--- a/embassy-executor/tests/ui/task_safety_attribute.rs
+++ b/embassy-executor/tests/ui/task_safety_attribute.rs
@@ -9,7 +9,7 @@ async fn safe() {}
 #[embassy_executor::task]
 async unsafe fn not_safe() {}
 
-#[export_name = "__pender"]
+#[unsafe(export_name = "__pender")]
 fn pender(_: *mut ()) {
     // The test doesn't link if we don't include this.
     // We never call this anyway.
diff --git a/embassy-executor/tests/ui/unsafe_op_in_unsafe_task.stderr b/embassy-executor/tests/ui/unsafe_op_in_unsafe_task.stderr
index d987a4b95..033395584 100644
--- a/embassy-executor/tests/ui/unsafe_op_in_unsafe_task.stderr
+++ b/embassy-executor/tests/ui/unsafe_op_in_unsafe_task.stderr
@@ -4,7 +4,7 @@ error[E0133]: call to unsafe function `std::ptr::const_ptr::<impl *const T>::rea
 7 |     (&x as *const i32).read();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function
   |
-  = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/unsafe-op-in-unsafe-fn.html>
+  = note: for more information, see <https://doc.rust-lang.org/edition-guide/rust-2024/unsafe-op-in-unsafe-fn.html>
   = note: consult the function's documentation for information on how to avoid undefined behavior
 note: an unsafe function restricts its caller, but its body is safe by default
  --> tests/ui/unsafe_op_in_unsafe_task.rs:5:1