From 9fd052b876581e5aef3442b17c17b0b597f84a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Tue, 26 May 2020 10:52:10 +0000
Subject: Collect and generate required use-statements

---
 macros/src/codegen/init.rs | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'macros/src/codegen/init.rs')

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index e0b7d69..88a7a23 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -1,5 +1,5 @@
 use proc_macro2::TokenStream as TokenStream2;
-use quote::quote;
+use quote::{quote, format_ident};
 use rtic_syntax::{ast::App, Context};
 
 use crate::{
@@ -24,6 +24,8 @@ pub fn codegen(
     Vec<TokenStream2>,
     // user_init -- the `#[init]` function written by the user
     Option<TokenStream2>,
+    // user_init_imports -- the imports for `#[init]` functio written by the user
+    Vec<TokenStream2>,
     // call_init -- the call to the user `#[init]` if there's one
     Option<TokenStream2>,
 ) {
@@ -34,6 +36,8 @@ pub fn codegen(
 
         let mut root_init = vec![];
 
+        let mut user_init_imports = vec![];
+
         let ret = {
             let late_fields = analysis
                 .late_resources
@@ -62,6 +66,12 @@ pub fn codegen(
                     }
                 ));
 
+                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
@@ -89,6 +99,12 @@ pub fn codegen(
                 #(#stmts)*
             }
         ));
+        user_init_imports.push(quote!(
+                #(#attrs)*
+                #cfg_core
+                #[allow(non_snake_case)]
+                use super::#name;
+        ));
 
         let mut const_app = None;
         if !init.args.resources.is_empty() {
@@ -97,6 +113,12 @@ pub fn codegen(
 
             root_init.push(item);
             const_app = Some(constructor);
+
+            let name_late = format_ident!("{}Resources", name);
+            user_init_imports.push(quote!(
+                    #[allow(non_snake_case)]
+                    use super::#name_late;
+            ));
         }
 
         let locals_new = locals_new.iter();
@@ -106,8 +128,8 @@ pub fn codegen(
 
         root_init.push(module::codegen(Context::Init, needs_lt, app, extra));
 
-        (const_app, root_init, user_init, call_init)
+        (const_app, root_init, user_init, user_init_imports, call_init)
     } else {
-        (None, vec![], None, None)
+        (None, vec![], None, vec![], None)
     }
 }
-- 
cgit v1.2.3


From a151974245a994ec4c30bb0518677c4b99dce7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Tue, 8 Sep 2020 15:22:32 +0000
Subject: cfg_core is gone, cargo fmt

---
 macros/src/codegen/init.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'macros/src/codegen/init.rs')

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index 88a7a23..b350298 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -1,5 +1,5 @@
 use proc_macro2::TokenStream as TokenStream2;
-use quote::{quote, format_ident};
+use quote::{format_ident, quote};
 use rtic_syntax::{ast::App, Context};
 
 use crate::{
@@ -101,7 +101,6 @@ pub fn codegen(
         ));
         user_init_imports.push(quote!(
                 #(#attrs)*
-                #cfg_core
                 #[allow(non_snake_case)]
                 use super::#name;
         ));
@@ -128,7 +127,13 @@ pub fn codegen(
 
         root_init.push(module::codegen(Context::Init, needs_lt, app, extra));
 
-        (const_app, root_init, user_init, user_init_imports, call_init)
+        (
+            const_app,
+            root_init,
+            user_init,
+            user_init_imports,
+            call_init,
+        )
     } else {
         (None, vec![], None, vec![], None)
     }
-- 
cgit v1.2.3


From 96e6350c0dfae37c3ea8032b4cc3113e37323ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Thu, 1 Oct 2020 16:17:15 +0000
Subject: Rename const_app to mod_app

---
 macros/src/codegen/init.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'macros/src/codegen/init.rs')

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index b350298..77d186e 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -14,7 +14,7 @@ pub fn codegen(
     analysis: &Analysis,
     extra: &Extra,
 ) -> (
-    // const_app_idle -- the `${init}Resources` constructor
+    // mod_app_idle -- the `${init}Resources` constructor
     Option<TokenStream2>,
     // root_init -- items that must be placed in the root of the crate:
     // - the `${init}Locals` struct
@@ -105,13 +105,13 @@ pub fn codegen(
                 use super::#name;
         ));
 
-        let mut const_app = None;
+        let mut mod_app = None;
         if !init.args.resources.is_empty() {
             let (item, constructor) =
                 resources_struct::codegen(Context::Init, 0, &mut needs_lt, app, analysis);
 
             root_init.push(item);
-            const_app = Some(constructor);
+            mod_app = Some(constructor);
 
             let name_late = format_ident!("{}Resources", name);
             user_init_imports.push(quote!(
@@ -127,13 +127,7 @@ pub fn codegen(
 
         root_init.push(module::codegen(Context::Init, needs_lt, app, extra));
 
-        (
-            const_app,
-            root_init,
-            user_init,
-            user_init_imports,
-            call_init,
-        )
+        (mod_app, root_init, user_init, user_init_imports, call_init)
     } else {
         (None, vec![], None, vec![], None)
     }
-- 
cgit v1.2.3