diff options
| author |  Jorge Aparicio <jorge@japaric.io>
| 2017-12-09 13:38:41 +0100 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io>
| 2017-12-09 17:15:15 +0100 |
| commit | 219e17268018f397ff3c8a41519c8345aeab7f2f (patch) | |
| tree | 5022a7640b4eae2174fe37f8f9943335f2fb7a0a /macros/src | |
| parent | 0f5784c2401d4b12004f34345e721598fa21219a (diff) | |
| download | rtic-219e17268018f397ff3c8a41519c8345aeab7f2f.tar.gz rtic-219e17268018f397ff3c8a41519c8345aeab7f2f.tar.zst rtic-219e17268018f397ff3c8a41519c8345aeab7f2f.zip | |
drop the Static wrapper
Diffstat (limited to 'macros/src')
| -rw-r--r-- | macros/src/trans.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/macros/src/trans.rs b/macros/src/trans.rs index 9bf1e2a9..b209b8ef 100644 --- a/macros/src/trans.rs +++ b/macros/src/trans.rs @@ -176,11 +176,11 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) { let ty = &resource.ty; fields.push(quote! { - pub #name: &'a mut #krate::Static<#ty>, + pub #name: &'a mut #ty, }); rexprs.push(quote! { - #name: ::#krate::Static::ref_mut(&mut ::#_name), + #name: &mut ::#_name, }); } @@ -369,20 +369,20 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) { fn borrow<'cs>( &'cs self, t: &'cs #krate::Threshold, - ) -> &'cs #krate::Static<#ty> { + ) -> &'cs #ty { assert!(t.value() >= #ceiling); - unsafe { #krate::Static::ref_(&#res_rvalue) } + unsafe { &#res_rvalue } } fn borrow_mut<'cs>( &'cs mut self, t: &'cs #krate::Threshold, - ) -> &'cs mut #krate::Static<#ty> { + ) -> &'cs mut #ty { assert!(t.value() >= #ceiling); unsafe { - #krate::Static::ref_mut(&mut #res_rvalue) + &mut #res_rvalue } } @@ -393,12 +393,12 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) { ) -> R where F: FnOnce( - &#krate::Static<#ty>, + &#ty, &mut #krate::Threshold) -> R { unsafe { #krate::claim( - #krate::Static::ref_(&#res_rvalue), + &#res_rvalue, #ceiling, #device::NVIC_PRIO_BITS, t, @@ -414,12 +414,12 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) { ) -> R where F: FnOnce( - &mut #krate::Static<#ty>, + &mut #ty, &mut #krate::Threshold) -> R { unsafe { #krate::claim( - #krate::Static::ref_mut(&mut #res_rvalue), + &mut #res_rvalue, #ceiling, #device::NVIC_PRIO_BITS, t, @@ -510,16 +510,16 @@ fn tasks(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) { let ty = &resource.ty; fields.push(quote! { - pub #name: &'a mut ::#krate::Static<#ty>, + pub #name: &'a mut #ty, }); exprs.push(if resource.expr.is_some() { quote! { - #name: ::#krate::Static::ref_mut(&mut ::#_name), + #name: &mut ::#_name, } } else { quote! { - #name: ::#krate::Static::ref_mut(::#_name.as_mut()), + #name: ::#_name.as_mut(), } }); } |