aboutsummaryrefslogtreecommitdiff
path: root/macros/src/codegen/shared_resources_struct.rs
diff options
context:
space:
mode:
authorGravatar Emil Fresk <emil.fresk@gmail.com> 2023-01-07 11:24:13 +0100
committerGravatar Henrik Tjäder <henrik@tjaders.com> 2023-03-01 00:31:06 +0100
commit714020a624ca93c42d5da7ebe612e7fc668e1471 (patch)
tree798716e0fd29d0b6235bb5bbec2dd11dba658ecc /macros/src/codegen/shared_resources_struct.rs
parent53f3d397e76383deabbe9579a3522174c422a958 (diff)
downloadrtic-714020a624ca93c42d5da7ebe612e7fc668e1471.tar.gz
rtic-714020a624ca93c42d5da7ebe612e7fc668e1471.tar.zst
rtic-714020a624ca93c42d5da7ebe612e7fc668e1471.zip
Removed Priority, simplified lifetime handling
Diffstat (limited to 'macros/src/codegen/shared_resources_struct.rs')
-rw-r--r--macros/src/codegen/shared_resources_struct.rs13
1 files changed, 3 insertions, 10 deletions
diff --git a/macros/src/codegen/shared_resources_struct.rs b/macros/src/codegen/shared_resources_struct.rs
index 1d46aa4e..de597cab 100644
--- a/macros/src/codegen/shared_resources_struct.rs
+++ b/macros/src/codegen/shared_resources_struct.rs
@@ -5,7 +5,7 @@ use quote::quote;
use crate::codegen::util;
/// Generate shared resources structs
-pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2, TokenStream2) {
+pub fn codegen(ctxt: Context, app: &App) -> (TokenStream2, TokenStream2) {
let mut lt = None;
let resources = match ctxt {
@@ -72,7 +72,7 @@ pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2,
values.push(quote!(
#(#cfgs)*
- #name: shared_resources::#shared_name::new(priority)
+ #name: shared_resources::#shared_name::new()
));
@@ -93,8 +93,6 @@ pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2,
}
if lt.is_some() {
- *needs_lt = true;
-
// The struct could end up empty due to `cfg`s leading to an error due to `'a` being unused
if has_cfgs {
fields.push(quote!(
@@ -117,15 +115,10 @@ pub fn codegen(ctxt: Context, needs_lt: &mut bool, app: &App) -> (TokenStream2,
}
);
- let arg = if ctxt.is_init() {
- None
- } else {
- Some(quote!(priority: &#lt rtic::export::Priority))
- };
let constructor = quote!(
impl<#lt> #ident<#lt> {
#[inline(always)]
- pub unsafe fn new(#arg) -> Self {
+ pub unsafe fn new() -> Self {
#ident {
#(#values,)*
}