diff options
Diffstat (limited to 'macros/src/codegen.rs')
| -rw-r--r-- | macros/src/codegen.rs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs index 8b054ab5..1b3f67b8 100644 --- a/macros/src/codegen.rs +++ b/macros/src/codegen.rs @@ -136,7 +136,7 @@ pub fn app(app: &App, analysis: &Analysis) -> TokenStream { if res.expr.is_none() { let alias = &ctxt.statics[name]; - Some(quote!(#alias.set(res.#name);)) + Some(quote!(#alias.write(res.#name);)) } else { None } @@ -275,7 +275,7 @@ fn resources(ctxt: &mut Context, app: &App, analysis: &Analysis) -> proc_macro2: #(#cfgs)* #[doc = #symbol] static mut #alias: rtfm::export::MaybeUninit<#ty> = - rtfm::export::MaybeUninit::uninitialized(); + rtfm::export::MaybeUninit::uninit(); ) }), ); @@ -338,7 +338,7 @@ fn init(ctxt: &mut Context, app: &App, analysis: &Analysis) -> (proc_macro2::Tok let expr = &assign.right; quote!( #(#attrs)* - unsafe { #alias.set(#expr); } + unsafe { #alias.write(#expr); } ) } else { let left = &assign.left; @@ -1281,7 +1281,7 @@ fn tasks(ctxt: &mut Context, app: &App, analysis: &Analysis) -> proc_macro2::Tok if cfg!(feature = "nightly") { let inits = - (0..capacity).map(|_| quote!(rtfm::export::MaybeUninit::uninitialized())); + (0..capacity).map(|_| quote!(rtfm::export::MaybeUninit::uninit())); quote!( #[doc = #scheduleds_symbol] @@ -1294,7 +1294,7 @@ fn tasks(ctxt: &mut Context, app: &App, analysis: &Analysis) -> proc_macro2::Tok #[doc = #scheduleds_symbol] static mut #scheduleds_alias: rtfm::export::MaybeUninit<[rtfm::Instant; #capacity_lit]> = - rtfm::export::MaybeUninit::uninitialized(); + rtfm::export::MaybeUninit::uninit(); ) } } @@ -1305,7 +1305,7 @@ fn tasks(ctxt: &mut Context, app: &App, analysis: &Analysis) -> proc_macro2::Tok let inputs_symbol = format!("{}::INPUTS::{}", name, inputs_alias); let free_symbol = format!("{}::FREE_QUEUE::{}", name, free_alias); if cfg!(feature = "nightly") { - let inits = (0..capacity).map(|_| quote!(rtfm::export::MaybeUninit::uninitialized())); + let inits = (0..capacity).map(|_| quote!(rtfm::export::MaybeUninit::uninit())); items.push(quote!( #[doc = #free_symbol] @@ -1322,11 +1322,11 @@ fn tasks(ctxt: &mut Context, app: &App, analysis: &Analysis) -> proc_macro2::Tok #[doc = #free_symbol] static mut #free_alias: rtfm::export::MaybeUninit< rtfm::export::FreeQueue<#capacity_ty> - > = rtfm::export::MaybeUninit::uninitialized(); + > = rtfm::export::MaybeUninit::uninit(); #[doc = #inputs_symbol] static mut #inputs_alias: rtfm::export::MaybeUninit<[#ty; #capacity_lit]> = - rtfm::export::MaybeUninit::uninitialized(); + rtfm::export::MaybeUninit::uninit(); )); } @@ -1479,7 +1479,7 @@ fn dispatchers( } else { data.push(quote!( #[doc = #symbol] - static mut #ready_alias: #e::MaybeUninit<#ty> = #e::MaybeUninit::uninitialized(); + static mut #ready_alias: #e::MaybeUninit<#ty> = #e::MaybeUninit::uninit(); )); } data.push(quote!( @@ -1867,14 +1867,14 @@ fn timer_queue(ctxt: &mut Context, app: &App, analysis: &Analysis) -> proc_macro items.push(quote!( #[doc = #symbol] static mut #tq: rtfm::export::MaybeUninit<rtfm::export::TimerQueue<#enum_, #cap>> = - rtfm::export::MaybeUninit::uninitialized(); + rtfm::export::MaybeUninit::uninit(); )); } else { items.push(quote!( #[doc = #symbol] static mut #tq: rtfm::export::MaybeUninit<rtfm::export::TimerQueue<#enum_, #cap>> = - rtfm::export::MaybeUninit::uninitialized(); + rtfm::export::MaybeUninit::uninit(); )); } @@ -1945,32 +1945,32 @@ fn pre_init(ctxt: &Context, app: &App, analysis: &Analysis) -> proc_macro2::Toke // these are `MaybeUninit` arrays for task in ctxt.tasks.values() { let inputs = &task.inputs; - exprs.push(quote!(#inputs.set(core::mem::uninitialized());)) + exprs.push(quote!(#inputs.write(core::mem::uninitialized());)) } #[cfg(feature = "timer-queue")] for task in ctxt.tasks.values() { let scheduleds = &task.scheduleds; - exprs.push(quote!(#scheduleds.set(core::mem::uninitialized());)) + exprs.push(quote!(#scheduleds.write(core::mem::uninitialized());)) } // these are `MaybeUninit` `ReadyQueue`s for dispatcher in ctxt.dispatchers.values() { let rq = &dispatcher.ready_queue; - exprs.push(quote!(#rq.set(rtfm::export::ReadyQueue::new_sc());)) + exprs.push(quote!(#rq.write(rtfm::export::ReadyQueue::new_sc());)) } // these are `MaybeUninit` `FreeQueue`s for task in ctxt.tasks.values() { let fq = &task.free_queue; - exprs.push(quote!(#fq.set(rtfm::export::FreeQueue::new_sc());)) + exprs.push(quote!(#fq.write(rtfm::export::FreeQueue::new_sc());)) } } // Initialize the timer queue if !analysis.timer_queue.tasks.is_empty() { let tq = &ctxt.timer_queue; - exprs.push(quote!(#tq.set(rtfm::export::TimerQueue::new(p.SYST));)); + exprs.push(quote!(#tq.write(rtfm::export::TimerQueue::new(p.SYST));)); } // Populate the `FreeQueue`s |