mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-27 14:04:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

more nightly fixes

Browse source
This commit is contained in:
Jorge Aparicio 2019-04-16 23:41:00 +02:00
parent 10d2638488
commit 53f0ca1504
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
macros/src/codegen.rs
View file

@ -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();
)
}),
);
@ -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,13 +1945,13 @@ 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.write(core::mem::uninitialized());))
exprs.push(quote!(#inputs.write(core::mem::uninit());))
}
#[cfg(feature = "timer-queue")]
for task in ctxt.tasks.values() {
let scheduleds = &task.scheduleds;
exprs.push(quote!(#scheduleds.write(core::mem::uninitialized());))
exprs.push(quote!(#scheduleds.write(core::mem::uninit());))
}
// these are `MaybeUninit` `ReadyQueue`s

6
src/export.rs
View file

@ -72,9 +72,9 @@ pub struct MaybeUninit<T> {
#[cfg(feature = "nightly")]
impl<T> MaybeUninit<T> {
pub const fn uninitialized() -> Self {
pub const fn uninit() -> Self {
MaybeUninit {
inner: core::mem::MaybeUninit::uninitialized(),
inner: core::mem::MaybeUninit::uninit(),
}
}
@ -102,7 +102,7 @@ const MSG: &str =
#[cfg(not(feature = "nightly"))]
impl<T> MaybeUninit<T> {
pub const fn uninitialized() -> Self {
pub const fn uninit() -> Self {
MaybeUninit { value: None }
}