summaryrefslogtreecommitdiff
path: root/nrf-softdevice-macro
diff options
context:
space:
mode:
authoralexmoon <alex.r.moon@gmail.com>2022-07-14 15:45:28 -0400
committeralexmoon <alex.r.moon@gmail.com>2022-07-14 15:45:28 -0400
commit98a31ce672c3113a2c238dc4e2ae9d632e59713a (patch)
tree36af82b9b26b04e2a7738515d50fc6b189d540b0 /nrf-softdevice-macro
parent84006cd336adf2642cb5716433abb5540c4fb8b9 (diff)
downloadnrf-softdevice-98a31ce672c3113a2c238dc4e2ae9d632e59713a.zip
Add rustfmt.toml to match embassy formatting
Diffstat (limited to 'nrf-softdevice-macro')
-rw-r--r--nrf-softdevice-macro/src/lib.rs44
-rw-r--r--nrf-softdevice-macro/src/uuid.rs1
2 files changed, 17 insertions, 28 deletions
diff --git a/nrf-softdevice-macro/src/lib.rs b/nrf-softdevice-macro/src/lib.rs
index 020da80..3b71c6d 100644
--- a/nrf-softdevice-macro/src/lib.rs
+++ b/nrf-softdevice-macro/src/lib.rs
@@ -2,11 +2,12 @@
extern crate proc_macro;
+use std::iter::FromIterator;
+
use darling::FromMeta;
use proc_macro::TokenStream;
use proc_macro2::{Span, TokenStream as TokenStream2};
use quote::{format_ident, quote, quote_spanned};
-use std::iter::FromIterator;
use syn::spanned::Spanned;
mod uuid;
@@ -58,11 +59,7 @@ pub fn gatt_server(_args: TokenStream, item: TokenStream) -> TokenStream {
return TokenStream::new();
}
};
- let fields = struct_fields
- .named
- .iter()
- .cloned()
- .collect::<Vec<syn::Field>>();
+ let fields = struct_fields.named.iter().cloned().collect::<Vec<syn::Field>>();
let struct_name = struc.ident.clone();
let event_enum_name = format_ident!("{}Event", struct_name);
@@ -82,10 +79,7 @@ pub fn gatt_server(_args: TokenStream, item: TokenStream) -> TokenStream {
));
if let syn::Type::Path(p) = &field.ty {
- let name_pascal = format_ident!(
- "{}",
- inflector::cases::pascalcase::to_pascal_case(&name.to_string())
- );
+ let name_pascal = format_ident!("{}", inflector::cases::pascalcase::to_pascal_case(&name.to_string()));
let event_enum_ty = p.path.get_ident().unwrap();
let event_enum_variant = format_ident!("{}Event", event_enum_ty);
code_event_enum.extend(quote_spanned!(span=>
@@ -160,17 +154,14 @@ pub fn gatt_service(args: TokenStream, item: TokenStream) -> TokenStream {
return TokenStream::new();
}
};
- let mut fields = struct_fields
- .named
- .iter()
- .cloned()
- .collect::<Vec<syn::Field>>();
+ let mut fields = struct_fields.named.iter().cloned().collect::<Vec<syn::Field>>();
let mut err = None;
fields.retain(|field| {
- if let Some(attr) = field.attrs.iter().find(|attr| {
- attr.path.segments.len() == 1
- && attr.path.segments.first().unwrap().ident == "characteristic"
- }) {
+ if let Some(attr) = field
+ .attrs
+ .iter()
+ .find(|attr| attr.path.segments.len() == 1 && attr.path.segments.first().unwrap().ident == "characteristic")
+ {
let args = attr.parse_meta().unwrap();
let args = match CharacteristicArgs::from_meta(&args) {
@@ -450,17 +441,14 @@ pub fn gatt_client(args: TokenStream, item: TokenStream) -> TokenStream {
return TokenStream::new();
}
};
- let mut fields = struct_fields
- .named
- .iter()
- .cloned()
- .collect::<Vec<syn::Field>>();
+ let mut fields = struct_fields.named.iter().cloned().collect::<Vec<syn::Field>>();
let mut err = None;
fields.retain(|field| {
- if let Some(attr) = field.attrs.iter().find(|attr| {
- attr.path.segments.len() == 1
- && attr.path.segments.first().unwrap().ident == "characteristic"
- }) {
+ if let Some(attr) = field
+ .attrs
+ .iter()
+ .find(|attr| attr.path.segments.len() == 1 && attr.path.segments.first().unwrap().ident == "characteristic")
+ {
let args = attr.parse_meta().unwrap();
let args = match CharacteristicArgs::from_meta(&args) {
diff --git a/nrf-softdevice-macro/src/uuid.rs b/nrf-softdevice-macro/src/uuid.rs
index 0c8b59b..a2e4f3d 100644
--- a/nrf-softdevice-macro/src/uuid.rs
+++ b/nrf-softdevice-macro/src/uuid.rs
@@ -1,4 +1,5 @@
use core::str::FromStr;
+
use darling::FromMeta;
use proc_macro2::TokenStream as TokenStream2;
use quote::quote;