From 5b8e6a22ab68e316e11641dedf5b39e20878c7b7 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 11 Oct 2020 19:41:57 +0200
Subject: Fixing examples and tests, modules now import user imports correctly

Fmt

Correct syntax crate

UI test fix

Fix build script

Cleanup

More cleanup
---
 macros/src/codegen.rs | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

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

diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs
index 2be265d..9ea6165 100644
--- a/macros/src/codegen.rs
+++ b/macros/src/codegen.rs
@@ -15,11 +15,7 @@ mod post_init;
 mod pre_init;
 mod resources;
 mod resources_struct;
-// mod schedule;
-// mod schedule_body;
 mod software_tasks;
-// mod spawn;
-// mod spawn_body;
 mod timer_queue;
 mod util;
 
@@ -115,17 +111,12 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
     ) = software_tasks::codegen(app, analysis, extra);
 
     let mod_app_dispatchers = dispatchers::codegen(app, analysis, extra);
-
-    // let mod_app_spawn = spawn::codegen(app, analysis, extra);
-
     let mod_app_timer_queue = timer_queue::codegen(app, analysis, extra);
-
-    // let mod_app_schedule = schedule::codegen(app, extra);
-
-    let user_imports = app.user_imports.clone();
-    let user_code = app.user_code.clone();
+    let user_imports = &app.user_imports;
+    let user_code = &app.user_code;
     let name = &app.name;
     let device = extra.device;
+
     quote!(
         #(#user)*
 
@@ -170,12 +161,8 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
 
             #(#mod_app_dispatchers)*
 
-            // #(#mod_app_spawn)*
-
             #(#mod_app_timer_queue)*
 
-            // #(#mod_app_schedule)*
-
             #(#mains)*
         }
     )
-- 
cgit v1.2.3