mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-25 21:19:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #318

Browse source 
318: Run cargo fmt r=korken89 a=AfoHT

Fix style issues reported by cargo fmt

Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
This commit is contained in:
bors[bot] 2020-06-09 19:24:48 +00:00 committed by GitHub
commit 7b7dc01005
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/t-cfg-resources.rs
View file

@ -28,7 +28,7 @@ mod example {
// The feature needs to be applied everywhere x is defined or used
#[cfg(feature = "feature_x")]
x: 0,
dummy: () // dummy such that we have at least one late resource
dummy: (), // dummy such that we have at least one late resource
}
}

3
macros/src/codegen.rs
View file

@ -39,7 +39,8 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
let (const_app_init, root_init, user_init, call_init) =
init::codegen(core, app, analysis, extra);
let (const_app_post_init, post_init_stmts) = post_init::codegen(core, &app, analysis, extra);
let (const_app_post_init, post_init_stmts) =
post_init::codegen(core, &app, analysis, extra);
let (const_app_idle, root_idle, user_idle, call_idle) =
idle::codegen(core, app, analysis, extra);

6
macros/src/codegen/init.rs
View file

@ -47,9 +47,9 @@ pub fn codegen(
let cfgs = &app.late_resources[name].cfgs;
quote!(
#(#cfgs)*
pub #name: #ty
)
#(#cfgs)*
pub #name: #ty
)
})
.collect::<Vec<_>>()
})

7
macros/src/codegen/post_init.rs
View file

@ -16,16 +16,15 @@ pub fn codegen(
// initialize late resources
if let Some(late_resources) = analysis.late_resources.get(&core) {
for name in late_resources {
// if it's live
let cfgs = app.late_resources[name].cfgs.clone();
if analysis.locations.get(name).is_some() {
// Need to also include the cfgs
stmts.push(quote!(
#(#cfgs)*
#name.as_mut_ptr().write(late.#name);
));
#(#cfgs)*
#name.as_mut_ptr().write(late.#name);
));
}
}
}