Merge #372

372: Now late resources are always used r=AfoHT a=korken89

Awaits the PR in `rtic-syntax`: https://github.com/rtic-rs/rtic-syntax/pull/32

Co-authored-by: Emil Fresk <emil.fresk@gmail.com>

2 files changed, 32 insertions, 43 deletions

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index 77d186e5..8942439b 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -36,47 +36,38 @@ pub fn codegen(
 
         let mut root_init = vec![];
 
-        let mut user_init_imports = vec![];
-
-        let ret = {
-            let late_fields = analysis
-                .late_resources
-                .iter()
-                .flat_map(|resources| {
-                    resources.iter().map(|name| {
-                        let ty = &app.late_resources[name].ty;
-                        let cfgs = &app.late_resources[name].cfgs;
-
-                        quote!(
+        let late_fields = analysis
+            .late_resources
+            .iter()
+            .flat_map(|resources| {
+                resources.iter().map(|name| {
+                    let ty = &app.late_resources[name].ty;
+                    let cfgs = &app.late_resources[name].cfgs;
+
+                    quote!(
                         #(#cfgs)*
                         pub #name: #ty
-                        )
-                    })
+                    )
                 })
-                .collect::<Vec<_>>();
+            })
+            .collect::<Vec<_>>();
 
-            if !late_fields.is_empty() {
-                let late_resources = util::late_resources_ident(&name);
+        let mut user_init_imports = vec![];
+        let late_resources = util::late_resources_ident(&name);
 
-                root_init.push(quote!(
-                    /// Resources initialized at runtime
-                    #[allow(non_snake_case)]
-                    pub struct #late_resources {
-                        #(#late_fields),*
-                    }
-                ));
-
-                let name_late = format_ident!("{}LateResources", name);
-                user_init_imports.push(quote!(
-                        #[allow(non_snake_case)]
-                        use super::#name_late;
-                ));
-
-                Some(quote!(-> #name::LateResources))
-            } else {
-                None
+        root_init.push(quote!(
+            /// Resources initialized at runtime
+            #[allow(non_snake_case)]
+            pub struct #late_resources {
+                #(#late_fields),*
             }
-        };
+        ));
+
+        let name_late = format_ident!("{}LateResources", name);
+        user_init_imports.push(quote!(
+                #[allow(non_snake_case)]
+                use super::#name_late;
+        ));
 
         let mut locals_pat = None;
         let mut locals_new = None;
@@ -95,7 +86,7 @@ pub fn codegen(
         let user_init = Some(quote!(
             #(#attrs)*
             #[allow(non_snake_case)]
-            fn #name(#(#locals_pat,)* #context: #name::Context) #ret {
+            fn #name(#(#locals_pat,)* #context: #name::Context) -> #name::LateResources {
                 #(#stmts)*
             }
         ));
diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 359c1cce..2e51e7db 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -261,14 +261,12 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) ->
 
     if let Context::Init = ctxt {
         let init = &app.inits.first().unwrap();
-        if init.returns_late_resources {
-            let late_resources = util::late_resources_ident(&init.name);
+        let late_resources = util::late_resources_ident(&init.name);
 
-            items.push(quote!(
-                #[doc(inline)]
-                pub use super::#late_resources as LateResources;
-            ));
-        }
+        items.push(quote!(
+            #[doc(inline)]
+            pub use super::#late_resources as LateResources;
+        ));
     }
 
     let doc = match ctxt {