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/idle.rs | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

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

diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index d0bff3e..db454a5 100644
--- a/macros/src/codegen/idle.rs
+++ b/macros/src/codegen/idle.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::{
@@ -23,6 +23,8 @@ pub fn codegen(
     Vec<TokenStream2>,
     // user_idle
     Option<TokenStream2>,
+    // user_idle_imports
+    Vec<TokenStream2>,
     // call_idle
     TokenStream2,
 ) {
@@ -34,15 +36,25 @@ pub fn codegen(
         let mut locals_pat = None;
         let mut locals_new = None;
 
+        let mut user_idle_imports = vec![];
+
+        let name = &idle.name;
+
         if !idle.args.resources.is_empty() {
             let (item, constructor) =
                 resources_struct::codegen(Context::Idle, 0, &mut needs_lt, app, analysis);
 
             root_idle.push(item);
             const_app = Some(constructor);
+
+            let name_resource = format_ident!("{}Resources", name);
+            user_idle_imports.push(quote!(
+                    #[allow(non_snake_case)]
+                    use super::#name_resource;
+            ));
+
         }
 
-        let name = &idle.name;
         if !idle.locals.is_empty() {
             let (locals, pat) = locals::codegen(Context::Idle, &idle.locals, app);
 
@@ -66,6 +78,12 @@ pub fn codegen(
                 #(#stmts)*
             }
         ));
+        user_idle_imports.push(quote!(
+            #(#attrs)*
+            #[allow(non_snake_case)]
+            #cfg_core
+            use super::#name;
+        ));
 
         let locals_new = locals_new.iter();
         let call_idle = quote!(crate::#name(
@@ -73,12 +91,13 @@ pub fn codegen(
             #name::Context::new(&rtic::export::Priority::new(0))
         ));
 
-        (const_app, root_idle, user_idle, call_idle)
+        (const_app, root_idle, user_idle, user_idle_imports, call_idle)
     } else {
         (
             None,
             vec![],
             None,
+            vec![],
             quote!(loop {
                 rtic::export::wfi()
             }),
-- 
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/idle.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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

diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index db454a5..2aa9975 100644
--- a/macros/src/codegen/idle.rs
+++ b/macros/src/codegen/idle.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::{
@@ -52,7 +52,6 @@ pub fn codegen(
                     #[allow(non_snake_case)]
                     use super::#name_resource;
             ));
-
         }
 
         if !idle.locals.is_empty() {
@@ -81,7 +80,6 @@ pub fn codegen(
         user_idle_imports.push(quote!(
             #(#attrs)*
             #[allow(non_snake_case)]
-            #cfg_core
             use super::#name;
         ));
 
@@ -91,7 +89,13 @@ pub fn codegen(
             #name::Context::new(&rtic::export::Priority::new(0))
         ));
 
-        (const_app, root_idle, user_idle, user_idle_imports, call_idle)
+        (
+            const_app,
+            root_idle,
+            user_idle,
+            user_idle_imports,
+            call_idle,
+        )
     } else {
         (
             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/idle.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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

diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index 2aa9975..2e2932d 100644
--- a/macros/src/codegen/idle.rs
+++ b/macros/src/codegen/idle.rs
@@ -14,7 +14,7 @@ pub fn codegen(
     analysis: &Analysis,
     extra: &Extra,
 ) -> (
-    // const_app_idle -- the `${idle}Resources` constructor
+    // mod_app_idle -- the `${idle}Resources` constructor
     Option<TokenStream2>,
     // root_idle -- items that must be placed in the root of the crate:
     // - the `${idle}Locals` struct
@@ -31,7 +31,7 @@ pub fn codegen(
     if app.idles.len() > 0 {
         let idle = &app.idles.first().unwrap();
         let mut needs_lt = false;
-        let mut const_app = None;
+        let mut mod_app = None;
         let mut root_idle = vec![];
         let mut locals_pat = None;
         let mut locals_new = None;
@@ -45,7 +45,7 @@ pub fn codegen(
                 resources_struct::codegen(Context::Idle, 0, &mut needs_lt, app, analysis);
 
             root_idle.push(item);
-            const_app = Some(constructor);
+            mod_app = Some(constructor);
 
             let name_resource = format_ident!("{}Resources", name);
             user_idle_imports.push(quote!(
@@ -89,13 +89,7 @@ pub fn codegen(
             #name::Context::new(&rtic::export::Priority::new(0))
         ));
 
-        (
-            const_app,
-            root_idle,
-            user_idle,
-            user_idle_imports,
-            call_idle,
-        )
+        (mod_app, root_idle, user_idle, user_idle_imports, call_idle)
     } else {
         (
             None,
-- 
cgit v1.2.3