Cleanup

Author: usbalbin

rtic-macros/src/codegen/module.rs

@@ -2,7 +2,7 @@ use crate::syntax::{ast::App, Context};
 use crate::{analyze::Analysis, codegen::bindings::interrupt_mod, codegen::util};
 
 use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::quote;
 
 #[allow(clippy::too_many_lines)]
 pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
@@ -132,19 +132,9 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
         let internal_spawn_helper_ident = util::internal_task_ident(name, "spawn_helper");
         let internal_waker_ident = util::internal_task_ident(name, "waker");
         let from_ptr_n_args = util::from_ptr_n_args_ident(spawnee.inputs.len());
-        let (input_args, input_tupled, input_untupled, input_ty) =
+        let (generic_input_args, input_args, input_tupled, input_untupled, input_ty) =
             util::regroup_inputs(&spawnee.inputs);
 
-        let generics: Vec<_> = spawnee.inputs.iter().enumerate().map(|(i, _)| format_ident!("T{i}")).collect();
-        let generic_input_args = generics.iter().enumerate().map(|(i, generic)| {
-            let ident = format_ident!("_{i}");
-            quote! { #ident: #generic }
-        });
-        let constraints = generics.iter().zip(&spawnee.inputs).map(|(generic, input)| {
-            let ty = &input.ty;
-            quote!{ #generic: rtic::export::dummy::Dummy<T=#ty> + Send + Sync }
-        });
-
         // Spawn caller
         items.push(quote!(
             #(#cfgs)*
@@ -171,9 +161,8 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
             /// Spawns the task directly
             #[allow(non_snake_case)]
             #[doc(hidden)]
-            pub fn #internal_spawn_ident<#(#generics),*>(#(#generic_input_args,)*) -> ::core::result::Result<(), #input_ty>
-                where #(#constraints),*
-            {
+            pub fn #internal_spawn_ident(#(#generic_input_args,)*) -> ::core::result::Result<(), #input_ty> {
+                // SAFETY: The generic args require Send + Sync
                 unsafe { #internal_spawn_helper_ident(#(#input_untupled.to()),*) }
             }
         ));
@@ -224,27 +213,21 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
                     let internal_spawn_ident = util::internal_task_ident(ident, "spawn_helper");
                     let attrs = &task.attrs;
                     let cfgs = &task.cfgs;
-                    let inputs = &task.inputs;
                     let generics = if task.is_bottom {
                         quote!()
                     } else {
                         quote!(<'a>)
                     };
 
-                    let input_vals = inputs.iter().map(|i| match &*i.pat {
-                        syn::Pat::Ident(pat_ident) => pat_ident.ident.clone(),
-                        _ => todo!(),
-                    }).collect::<Vec<_>>();
-
-                    let (_input_args, _input_tupled, _input_untupled, input_ty) = util::regroup_inputs(&task.inputs);
+                    let (_generic_input_args, 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 #(,#[allow(unused_mut)] #inputs)*) -> ::core::result::Result<(), #input_ty> {
+                        pub(super) fn #ident #generics(&self #(,#input_args)*) -> ::core::result::Result<(), #input_ty> {
                             // SAFETY: This is safe to call since this can only be called
                             // from the same executor
-                            unsafe { #internal_spawn_ident(#(#input_vals,)*) }
+                            unsafe { #internal_spawn_ident(#(#input_untupled,)*) }
                         }
                     }
                 })

rtic-macros/src/codegen/util.rs

@@ -35,6 +35,8 @@ pub fn link_section_uninit() -> TokenStream2 {
 pub fn regroup_inputs(
     inputs: &[PatType],
 ) -> (
+    // Generic args e.g. &[`_0: Dummy<T=i32>`, `_1: Dummy<T=i64>`]
+    Vec<TokenStream2>,
     // args e.g. &[`_0`],  &[`_0: i32`, `_1: i64`]
     Vec<TokenStream2>,
     // tupled e.g. `_0`, `(_0, _1)`
@@ -48,12 +50,14 @@ pub fn regroup_inputs(
         let ty = &inputs[0].ty;
 
         (
+            vec![quote!(_0: impl rtic::export::dummy::Dummy<T=#ty> + Send + Sync)],
             vec![quote!(_0: #ty)],
             quote!(_0),
             vec![quote!(_0)],
             quote!(#ty),
         )
     } else {
+        let mut generic_args = vec![];
         let mut args = vec![];
         let mut pats = vec![];
         let mut tys = vec![];
@@ -62,6 +66,8 @@ pub fn regroup_inputs(
             let i = Ident::new(&format!("_{i}"), Span::call_site());
             let ty = &input.ty;
 
+            generic_args.push(quote!(#i: impl rtic::export::dummy::Dummy<T=#ty> + Send + Sync));
+
             args.push(quote!(#i: #ty));
 
             pats.push(quote!(#i));
@@ -74,7 +80,7 @@ pub fn regroup_inputs(
             quote!((#(#pats,)*))
         };
         let ty = quote!((#(#tys,)*));
-        (args, tupled, pats, ty)
+        (generic_args, args, tupled, pats, ty)
     }
 }