From f96b25fdf2d7421cc16830a4ccac4ebb3e69cc5d Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 15 Oct 2020 18:50:17 +0200
Subject: Updated examples

More work
---
 macros/src/codegen/resources.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index 38ea524..d5ec583 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -24,6 +24,7 @@ pub fn codegen(
     for (name, res, expr, _) in app.resources(analysis) {
         let cfgs = &res.cfgs;
         let ty = &res.ty;
+        let mangled_name = util::mangle_ident(&name);
 
         {
             let section = if expr.is_none() {
@@ -47,7 +48,7 @@ pub fn codegen(
                 #(#attrs)*
                 #(#cfgs)*
                 #section
-                static mut #name: #ty = #expr;
+                static mut #mangled_name: #ty = #expr;
             ));
         }
 
@@ -76,12 +77,12 @@ pub fn codegen(
             let ptr = if expr.is_none() {
                 quote!(
                     #(#cfgs)*
-                    #name.as_mut_ptr()
+                    #mangled_name.as_mut_ptr()
                 )
             } else {
                 quote!(
                     #(#cfgs)*
-                    &mut #name
+                    &mut #mangled_name
                 )
             };
 
-- 
cgit v1.2.3


From f076b33bb91e9cd2cb1f71ba22ebfebab085d3a8 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Wed, 21 Oct 2020 20:20:26 +0200
Subject: Namespace cleanup

---
 macros/src/codegen/resources.rs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

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

diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index d5ec583..0db4f72 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -14,12 +14,9 @@ pub fn codegen(
     Vec<TokenStream2>,
     // mod_resources -- the `resources` module
     TokenStream2,
-    // mod_resources_imports -- the `resources` module imports
-    Vec<TokenStream2>,
 ) {
     let mut mod_app = vec![];
     let mut mod_resources = vec![];
-    let mut mod_resources_imports = vec![];
 
     for (name, res, expr, _) in app.resources(analysis) {
         let cfgs = &res.cfgs;
@@ -86,12 +83,6 @@ pub fn codegen(
                 )
             };
 
-            mod_resources_imports.push(quote!(
-                #[allow(non_camel_case_types)]
-                #(#cfgs)*
-                use super::resources::#name;
-            ));
-
             mod_app.push(util::impl_mutex(
                 extra,
                 cfgs,
@@ -107,11 +98,6 @@ pub fn codegen(
     let mod_resources = if mod_resources.is_empty() {
         quote!()
     } else {
-        // Also import the resource module
-        mod_resources_imports.push(quote!(
-            use super::resources;
-        ));
-
         quote!(mod resources {
             use rtic::export::Priority;
 
@@ -119,5 +105,5 @@ pub fn codegen(
         })
     };
 
-    (mod_app, mod_resources, mod_resources_imports)
+    (mod_app, mod_resources)
 }
-- 
cgit v1.2.3