aboutsummaryrefslogtreecommitdiff
path: root/embassy-macros
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-06-12 22:15:44 +0200
committerDario Nieuwenhuis <[email protected]>2022-06-12 22:22:31 +0200
commita8703b75988e1e700af701116464025679d2feb8 (patch)
treef4ec5de70ec05e793a774049e010935ac45853ed /embassy-macros
parent6199bdea710cde33e5d5381b6d6abfc8af46df19 (diff)
Run rustfmt.
Diffstat (limited to 'embassy-macros')
-rw-r--r--embassy-macros/src/lib.rs12
-rw-r--r--embassy-macros/src/macros/cortex_m_interrupt.rs6
-rw-r--r--embassy-macros/src/macros/main.rs13
-rw-r--r--embassy-macros/src/macros/task.rs5
-rw-r--r--embassy-macros/src/util/ctxt.rs5
5 files changed, 15 insertions, 26 deletions
diff --git a/embassy-macros/src/lib.rs b/embassy-macros/src/lib.rs
index 50f442438..ec8498f9f 100644
--- a/embassy-macros/src/lib.rs
+++ b/embassy-macros/src/lib.rs
@@ -25,17 +25,13 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
25pub fn cortex_m_interrupt(args: TokenStream, item: TokenStream) -> TokenStream { 25pub fn cortex_m_interrupt(args: TokenStream, item: TokenStream) -> TokenStream {
26 let args = syn::parse_macro_input!(args as syn::AttributeArgs); 26 let args = syn::parse_macro_input!(args as syn::AttributeArgs);
27 let f = syn::parse_macro_input!(item as syn::ItemFn); 27 let f = syn::parse_macro_input!(item as syn::ItemFn);
28 cortex_m_interrupt::run(args, f) 28 cortex_m_interrupt::run(args, f).unwrap_or_else(|x| x).into()
29 .unwrap_or_else(|x| x)
30 .into()
31} 29}
32 30
33#[proc_macro] 31#[proc_macro]
34pub fn cortex_m_interrupt_declare(item: TokenStream) -> TokenStream { 32pub fn cortex_m_interrupt_declare(item: TokenStream) -> TokenStream {
35 let name = syn::parse_macro_input!(item as syn::Ident); 33 let name = syn::parse_macro_input!(item as syn::Ident);
36 cortex_m_interrupt_declare::run(name) 34 cortex_m_interrupt_declare::run(name).unwrap_or_else(|x| x).into()
37 .unwrap_or_else(|x| x)
38 .into()
39} 35}
40 36
41/// # interrupt_take procedural macro 37/// # interrupt_take procedural macro
@@ -46,7 +42,5 @@ pub fn cortex_m_interrupt_declare(item: TokenStream) -> TokenStream {
46#[proc_macro] 42#[proc_macro]
47pub fn cortex_m_interrupt_take(item: TokenStream) -> TokenStream { 43pub fn cortex_m_interrupt_take(item: TokenStream) -> TokenStream {
48 let name = syn::parse_macro_input!(item as syn::Ident); 44 let name = syn::parse_macro_input!(item as syn::Ident);
49 cortex_m_interrupt_take::run(name) 45 cortex_m_interrupt_take::run(name).unwrap_or_else(|x| x).into()
50 .unwrap_or_else(|x| x)
51 .into()
52} 46}
diff --git a/embassy-macros/src/macros/cortex_m_interrupt.rs b/embassy-macros/src/macros/cortex_m_interrupt.rs
index 32cc0e010..13af8ca07 100644
--- a/embassy-macros/src/macros/cortex_m_interrupt.rs
+++ b/embassy-macros/src/macros/cortex_m_interrupt.rs
@@ -1,9 +1,9 @@
1use std::iter;
2
1use darling::FromMeta; 3use darling::FromMeta;
2use proc_macro2::TokenStream; 4use proc_macro2::TokenStream;
3use quote::quote; 5use quote::quote;
4use std::iter; 6use syn::{ReturnType, Type, Visibility};
5use syn::ReturnType;
6use syn::{Type, Visibility};
7 7
8use crate::util::ctxt::Ctxt; 8use crate::util::ctxt::Ctxt;
9 9
diff --git a/embassy-macros/src/macros/main.rs b/embassy-macros/src/macros/main.rs
index b7ce9dda4..5638276b2 100644
--- a/embassy-macros/src/macros/main.rs
+++ b/embassy-macros/src/macros/main.rs
@@ -81,14 +81,11 @@ pub fn run(args: syn::AttributeArgs, f: syn::ItemFn) -> Result<TokenStream, Toke
81 81
82 #[cfg(all(not(feature = "std"), not(feature = "wasm")))] 82 #[cfg(all(not(feature = "std"), not(feature = "wasm")))]
83 let main = { 83 let main = {
84 let config = args 84 let config = args.config.map(|s| s.parse::<syn::Expr>().unwrap()).unwrap_or_else(|| {
85 .config 85 syn::Expr::Verbatim(quote! {
86 .map(|s| s.parse::<syn::Expr>().unwrap()) 86 Default::default()
87 .unwrap_or_else(|| { 87 })
88 syn::Expr::Verbatim(quote! { 88 });
89 Default::default()
90 })
91 });
92 89
93 let (hal_setup, peris_arg) = match HAL { 90 let (hal_setup, peris_arg) = match HAL {
94 Some(hal) => { 91 Some(hal) => {
diff --git a/embassy-macros/src/macros/task.rs b/embassy-macros/src/macros/task.rs
index e48de3d63..53c9af546 100644
--- a/embassy-macros/src/macros/task.rs
+++ b/embassy-macros/src/macros/task.rs
@@ -47,10 +47,7 @@ pub fn run(args: syn::AttributeArgs, f: syn::ItemFn) -> Result<TokenStream, Toke
47 id.mutability = None; 47 id.mutability = None;
48 } 48 }
49 _ => { 49 _ => {
50 ctxt.error_spanned_by( 50 ctxt.error_spanned_by(arg, "pattern matching in task arguments is not yet supported");
51 arg,
52 "pattern matching in task arguments is not yet supported",
53 );
54 } 51 }
55 }, 52 },
56 } 53 }
diff --git a/embassy-macros/src/util/ctxt.rs b/embassy-macros/src/util/ctxt.rs
index d668ae780..74c872c3c 100644
--- a/embassy-macros/src/util/ctxt.rs
+++ b/embassy-macros/src/util/ctxt.rs
@@ -1,11 +1,12 @@
1// nifty utility borrowed from serde :) 1// nifty utility borrowed from serde :)
2// https://github.com/serde-rs/serde/blob/master/serde_derive/src/internals/ctxt.rs 2// https://github.com/serde-rs/serde/blob/master/serde_derive/src/internals/ctxt.rs
3 3
4use proc_macro2::TokenStream;
5use quote::{quote, ToTokens};
6use std::cell::RefCell; 4use std::cell::RefCell;
7use std::fmt::Display; 5use std::fmt::Display;
8use std::thread; 6use std::thread;
7
8use proc_macro2::TokenStream;
9use quote::{quote, ToTokens};
9use syn; 10use syn;
10 11
11/// A type to collect errors together and format them. 12/// A type to collect errors together and format them.