diff options
| author |  Per Lindgren <per.lindgren@ltu.se>
| 2021-11-01 22:40:49 +0100 |
|---|---|---|
| committer | Per Lindgren <per.lindgren@ltu.se>
| 2021-11-03 10:23:49 +0100 |
| commit | de9430612858add7baa447e2a898608f13bc9633 (patch) | |
| tree | 2f76c4dd8cae8f08496d101f5b4480378dfc1f13 /macros/src/codegen/shared_resources_struct.rs | |
| parent | 426522df6eb97ae19e6a4570fbb4252de9a870ea (diff) | |
| download | rtic-de9430612858add7baa447e2a898608f13bc9633.tar.gz rtic-de9430612858add7baa447e2a898608f13bc9633.tar.zst rtic-de9430612858add7baa447e2a898608f13bc9633.zip | |
attempt to pass Fn closure instead of pointer
Diffstat (limited to 'macros/src/codegen/shared_resources_struct.rs')
| -rw-r--r-- | macros/src/codegen/shared_resources_struct.rs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/macros/src/codegen/shared_resources_struct.rs b/macros/src/codegen/shared_resources_struct.rs index f2767244..d6acce19 100644 --- a/macros/src/codegen/shared_resources_struct.rs +++ b/macros/src/codegen/shared_resources_struct.rs @@ -47,18 +47,15 @@ pub fn codegen( let mangled_name = util::static_shared_resource_ident(&name); if !res.properties.lock_free { + lt = Some(quote!('a)); if access.is_shared() { // [&x] (shared) - lt = Some(quote!('a)); - fields.push(quote!( #(#cfgs)* pub #name: &'a #ty )); } else { // Resource proxy - lt = Some(quote!('a)); - fields.push(quote!( #(#cfgs)* pub #name: shared_resources::#name<'a> @@ -76,7 +73,7 @@ pub fn codegen( // Lock-all related fields_mut.push(quote!( #(#cfgs)* - pub #name: &'static mut #ty + pub #name: &#lt mut #ty )); values_mut.push(quote!( @@ -159,7 +156,7 @@ pub fn codegen( #[allow(non_snake_case)] #[allow(non_camel_case_types)] #[doc = #doc_mut] - pub struct #ident_mut { + pub struct #ident_mut<#lt> { #(#fields_mut,)* } ); @@ -176,16 +173,15 @@ pub fn codegen( extra, &vec![], // TODO: what cfg should go here? quote!(#ident), - quote!(#ident_mut), + quote!(#ident_mut<#lt>), max_ceiling, quote!(self.priority()), - quote!(&mut #ident_mut::new()), + quote!(|| { &mut #ident_mut::new() }), ), quote!( // Used by the lock-all API #[inline(always)] pub unsafe fn priority(&self) -> &rtic::export::Priority { - //panic!("here {:?}", self); self.#name.priority() } ), @@ -207,7 +203,7 @@ pub fn codegen( } // Used by the lock-all API - impl #ident_mut { + impl<#lt> #ident_mut<#lt> { #[inline(always)] pub unsafe fn new() -> Self { #ident_mut { |