From 98d2af9d73da56910c8bb6cb662fbc4d609a704a Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Wed, 7 Jul 2021 22:50:59 +0200 Subject: Fixing tests --- macros/src/codegen/local_resources.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'macros/src/codegen/local_resources.rs') diff --git a/macros/src/codegen/local_resources.rs b/macros/src/codegen/local_resources.rs index 70f7580..c5cddfb 100644 --- a/macros/src/codegen/local_resources.rs +++ b/macros/src/codegen/local_resources.rs @@ -44,13 +44,16 @@ pub fn codegen( } // All declared `local = [NAME: TY = EXPR]` local resources - for (name, task_local) in app.declared_local_resources() { + for (task_name, resource_name, task_local) in app.declared_local_resources() { let cfgs = &task_local.cfgs; let ty = &task_local.ty; let expr = &task_local.expr; let attrs = &task_local.attrs; - let mangled_name = util::mark_internal_ident(&util::static_local_resource_ident(name)); + let mangled_name = util::mark_internal_ident(&util::declared_static_local_resource_ident( + resource_name, + &task_name, + )); // For future use // let doc = format!(" RTIC internal: {}:{}", file!(), line!()); @@ -64,13 +67,5 @@ pub fn codegen( )); } - // let mod_resources = if mod_resources.is_empty() { - // quote!() - // } else { - // quote!(mod local_resources { - // #(#mod_resources)* - // }) - // }; - (mod_app, TokenStream2::new()) } -- cgit v1.2.3