diff options
author | 2023-01-03 07:51:35 +0100 | |
---|---|---|
committer | 2023-03-01 00:31:04 +0100 | |
commit | d7ed7a8b9f78344f6855fa1c2655ae0d85e44068 (patch) | |
tree | a5888257f8047b3ba67e143aa5104c1f496ad036 /macros/src/syntax/parse.rs | |
parent | 9829d0ac07180967208403610bc9a25249b9fe85 (diff) | |
download | rtic-d7ed7a8b9f78344f6855fa1c2655ae0d85e44068.tar.gz rtic-d7ed7a8b9f78344f6855fa1c2655ae0d85e44068.tar.zst rtic-d7ed7a8b9f78344f6855fa1c2655ae0d85e44068.zip |
syntax: Remove parse settings struct
Diffstat (limited to 'macros/src/syntax/parse.rs')
-rw-r--r-- | macros/src/syntax/parse.rs | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/macros/src/syntax/parse.rs b/macros/src/syntax/parse.rs index 74f94f2b..ceedaa98 100644 --- a/macros/src/syntax/parse.rs +++ b/macros/src/syntax/parse.rs @@ -20,15 +20,15 @@ use crate::syntax::{ App, AppArgs, HardwareTaskArgs, IdleArgs, InitArgs, MonotonicArgs, SoftwareTaskArgs, TaskLocal, }, - Either, Settings, + Either, }; // Parse the app, both app arguments and body (input) -pub fn app(args: TokenStream2, input: TokenStream2, settings: &Settings) -> parse::Result<App> { +pub fn app(args: TokenStream2, input: TokenStream2) -> parse::Result<App> { let args = AppArgs::parse(args)?; let input: Input = syn::parse2(input)?; - App::parse(args, input, settings) + App::parse(args, input) } pub(crate) struct Input { @@ -188,10 +188,7 @@ fn idle_args(tokens: TokenStream2) -> parse::Result<IdleArgs> { .parse2(tokens) } -fn task_args( - tokens: TokenStream2, - settings: &Settings, -) -> parse::Result<Either<HardwareTaskArgs, SoftwareTaskArgs>> { +fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, SoftwareTaskArgs>> { (|input: ParseStream<'_>| -> parse::Result<Either<HardwareTaskArgs, SoftwareTaskArgs>> { if input.is_empty() { return Ok(Either::Right(SoftwareTaskArgs::default())); @@ -242,14 +239,7 @@ fn task_args( let _: Token![=] = content.parse()?; match &*ident_s { - "binds" if !settings.parse_binds => { - return Err(parse::Error::new( - ident.span(), - "Unexpected bind in task argument. Binds are only parsed if Settings::parse_binds is set.", - )); - } - - "binds" if settings.parse_binds => { + "binds" => { if binds.is_some() { return Err(parse::Error::new( ident.span(), |