Merge #306

306: Retain cfg-attributes on resources r=korken89 a=AfoHT

When rust 1.43 lands as stable this will resolve #301 and allow for the kind of conditional compilation exemplified in the issue.

Tested on beta and nightly.

Co-authored-by: Henrik Tjäder <henrik@tjaders.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/macros/src/codegen/post_init.rs b/macros/src/codegen/post_init.rs
index 19773e45..8578d5ac 100644
--- a/macros/src/codegen/post_init.rs
+++ b/macros/src/codegen/post_init.rs
@@ -1,11 +1,13 @@
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
+use rtfm_syntax::ast::App;
 
 use crate::{analyze::Analysis, check::Extra, codegen::util};
 
 /// Generates code that runs after `#[init]` returns
 pub fn codegen(
     core: u8,
+    app: &App,
     analysis: &Analysis,
     extra: &Extra,
 ) -> (Vec<TokenStream2>, Vec<TokenStream2>) {
@@ -14,10 +16,16 @@ pub fn codegen(
 
     // initialize late resources
     if let Some(late_resources) = analysis.late_resources.get(&core) {
+
         for name in late_resources {
             // if it's live
+            let cfgs = app.late_resources[name].cfgs.clone();
             if analysis.locations.get(name).is_some() {
-                stmts.push(quote!(#name.as_mut_ptr().write(late.#name);));
+                // Need to also include the cfgs
+                stmts.push(quote!(
+                        #(#cfgs)*
+                        #name.as_mut_ptr().write(late.#name);
+                        ));
             }
         }
     }