Fixed it for real, i think...

Author: usbalbin

examples/embassy-stm32g4/src/bin/spawn_local.rs

@@ -41,7 +41,7 @@ mod app {
     #[task(priority = 1)]
     async fn task1(cx: task1::Context) {
         defmt::info!("Hello from task1!");
-        cx.local_spawner.task2(Default::default());
+        cx.local_spawner.task2(Default::default()).ok();
     }
 
     #[task(priority = 1, is_local_task = true)]

rtic-macros/src/codegen/module.rs

@@ -198,7 +198,7 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
             .collect();
 
         if !local_tasks_on_same_executor.is_empty() {
-            let local_spawner = util::internal_task_ident(ident, "LocalSpawner");
+            let local_spawner = util::internal_task_ident(t, "LocalSpawner");
             fields.push(quote! {
                 /// Used to spawn tasks on the same executor
                 ///
@@ -223,19 +223,20 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
                         quote!(<'a>)
                     };
                     let input_vals = inputs.iter().map(|i| &i.pat).collect::<Vec<_>>();
+                    let (_input_args, _input_tupled, _input_untupled, input_ty) = util::regroup_inputs(&task.inputs);
                     quote! {
                         #(#attrs)*
                         #(#cfgs)*
                         #[allow(non_snake_case)]
-                        pub(super) fn #ident #generics(&self #(,#inputs)*) {
+                        pub(super) fn #ident #generics(&self #(,#inputs)*) -> ::core::result::Result<(), #input_ty> {
                             // SAFETY: This is safe to call since this can only be called
                             // from the same executor
-                            unsafe { super::#internal_spawn_ident(#(#input_vals,)*) }
+                            unsafe { #internal_spawn_ident(#(#input_vals,)*) }
                         }
                     }
                 })
                 .collect::<Vec<_>>();
-            values.push(quote!(local_spawner: #t::LocalSpawner { _p: core::marker::PhantomData }));
+            values.push(quote!(local_spawner: #local_spawner { _p: core::marker::PhantomData }));
             items.push(quote! {
                 struct #local_spawner {
                     _p: core::marker::PhantomData<*mut ()>,