3 files changed, 14 insertions, 10 deletions

diff --git a/embassy-executor/tests/ui/bad_return_impl_future_nightly.stderr b/embassy-executor/tests/ui/bad_return_impl_future_nightly.stderr
index 3c3c9503b..e5e069ade 100644
--- a/embassy-executor/tests/ui/bad_return_impl_future_nightly.stderr
+++ b/embassy-executor/tests/ui/bad_return_impl_future_nightly.stderr
@@ -5,6 +5,10 @@ error[E0277]: task futures must resolve to `()` or `!`
   | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TaskReturnValue` is not implemented for `u32`
   |
   = note: use `async fn` or change the return type to `impl Future<Output = ()>`
-  = help: the following other types implement trait `TaskReturnValue`:
-            ()
-            <fn() -> ! as HasOutput>::Output
+help: the following other types implement trait `TaskReturnValue`
+ --> src/lib.rs
+  |
+  |     impl TaskReturnValue for () {}
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `()`
+  |     impl TaskReturnValue for Never {}
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `<fn() -> ! as HasOutput>::Output`
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/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.