From e7f0d9c3e3fad77dace2ce63af02559fda46cb73 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 1 Oct 2020 19:38:49 +0200
Subject: Now late resources are always used

---
 macros/src/codegen/init.rs   | 52 +++++++++++++++++++-------------------------
 macros/src/codegen/module.rs | 12 +++++-----
 2 files changed, 27 insertions(+), 37 deletions(-)

(limited to 'macros/src')

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index e0b7d699..b41c3894 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -34,39 +34,31 @@ pub fn codegen(
 
         let mut root_init = 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!(
-                        #(#cfgs)*
-                        pub #name: #ty
-                        )
-                    })
+        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<_>>();
-
-            if !late_fields.is_empty() {
-                let late_resources = util::late_resources_ident(&name);
+            })
+            .collect::<Vec<_>>();
 
-                root_init.push(quote!(
-                    /// Resources initialized at runtime
-                    #[allow(non_snake_case)]
-                    pub struct #late_resources {
-                        #(#late_fields),*
-                    }
-                ));
+        let late_resources = util::late_resources_ident(&name);
 
-                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 mut locals_pat = None;
         let mut locals_new = None;
@@ -85,7 +77,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 863f6c5b..85bab3ab 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -253,14 +253,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 {
-- 
cgit v1.2.3


From 8ab7be98714d1ef6298e6feb19f16b84cd9bb4e6 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Mon, 5 Oct 2020 20:19:52 +0200
Subject: Added back accidentally removed block

---
 macros/src/codegen/init.rs | 6 ++++++
 macros/src/lib.rs          | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'macros/src')

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index 1ced68bc..8942439b 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -63,6 +63,12 @@ pub fn codegen(
             }
         ));
 
+        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;
         if !init.locals.is_empty() {
diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 94e7eec6..e659559e 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -35,8 +35,7 @@ mod tests;
 ///
 /// The items allowed in the module block are specified below:
 ///
-/// # 1. `#[resources]
-///       struct <resource-name>`
+/// # 1. `#[resources] struct <resource-name>`
 ///
 /// This structure contains the declaration of all the resources used by the application. Each field
 /// in this structure corresponds to a different resource. Each resource may optionally be given an
-- 
cgit v1.2.3