From e47914ee50b838cceca77cd881dce9caaf689901 Mon Sep 17 00:00:00 2001 From: Andrew Gazelka Date: Tue, 11 Apr 2023 13:10:26 -0700 Subject: remove vis restriction for local and shared resources --- rtic-macros/src/codegen/init.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'rtic-macros/src/codegen/init.rs') diff --git a/rtic-macros/src/codegen/init.rs b/rtic-macros/src/codegen/init.rs index 6e1059f..b667ae0 100644 --- a/rtic-macros/src/codegen/init.rs +++ b/rtic-macros/src/codegen/init.rs @@ -18,7 +18,9 @@ pub fn codegen(app: &App, analysis: &Analysis) -> TokenStream2 { let attrs = &init.attrs; let stmts = &init.stmts; let shared = &init.user_shared_struct; + let shared_vis = &app.shared_resources_vis; let local = &init.user_local_struct; + let local_vis = &app.local_resources_vis; let shared_resources: Vec<_> = app .shared_resources @@ -27,10 +29,11 @@ pub fn codegen(app: &App, analysis: &Analysis) -> TokenStream2 { let ty = &v.ty; let cfgs = &v.cfgs; let docs = &v.docs; + let vis = &v.vis; quote!( #(#cfgs)* #(#docs)* - #k: #ty, + #vis #k: #ty, ) }) .collect(); @@ -41,20 +44,21 @@ pub fn codegen(app: &App, analysis: &Analysis) -> TokenStream2 { let ty = &v.ty; let cfgs = &v.cfgs; let docs = &v.docs; + let vis = &v.vis; quote!( #(#cfgs)* #(#docs)* - #k: #ty, + #vis #k: #ty, ) }) .collect(); root_init.push(quote! { - struct #shared { + #shared_vis struct #shared { #(#shared_resources)* } - struct #local { + #local_vis struct #local { #(#local_resources)* } }); -- cgit v1.2.3