All codegen is now explicit

1 files changed, 8 insertions, 15 deletions

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index 3b2bcd47..6e1059f7 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -7,21 +7,8 @@ use crate::{
     syntax::{ast::App, Context},
 };
 
-type CodegenResult = (
-    // 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
-    // - the `${init}Resources` struct
-    // - the `${init}LateResources` struct
-    // - the `${init}` module, which contains types like `${init}::Context`
-    Vec<TokenStream2>,
-    // user_init -- the `#[init]` function written by the user
-    TokenStream2,
-);
-
 /// Generates support code for `#[init]` functions
-pub fn codegen(app: &App, analysis: &Analysis) -> CodegenResult {
+pub fn codegen(app: &App, analysis: &Analysis) -> TokenStream2 {
     let init = &app.init;
     let name = &init.name;
 
@@ -98,5 +85,11 @@ pub fn codegen(app: &App, analysis: &Analysis) -> CodegenResult {
 
     root_init.push(module::codegen(Context::Init, app, analysis));
 
-    (mod_app, root_init, user_init)
+    quote!(
+        #mod_app
+
+        #(#root_init)*
+
+        #user_init
+    )
 }