diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-10-06 22:56:31 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2025-10-06 23:19:53 +0200 |
| commit | 8730a013c395cf0bf4c2fa8eeb7f138288103039 (patch) | |
| tree | 39eca5fbc4570bd0129c9a291f134de5dab98820 /embassy-executor-macros | |
| parent | abc8e450f936567ad42cb34b5d2a7941b206aa5d (diff) | |
Rustfmt for edition 2024.
Diffstat (limited to 'embassy-executor-macros')
| -rw-r--r-- | embassy-executor-macros/src/macros/main.rs | 2 | ||||
| -rw-r--r-- | embassy-executor-macros/src/macros/task.rs | 8 | ||||
| -rw-r--r-- | embassy-executor-macros/src/util.rs | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/embassy-executor-macros/src/macros/main.rs b/embassy-executor-macros/src/macros/main.rs index 3d52ebfe1..c259c003f 100644 --- a/embassy-executor-macros/src/macros/main.rs +++ b/embassy-executor-macros/src/macros/main.rs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | use std::str::FromStr; | 1 | use std::str::FromStr; |
| 2 | 2 | ||
| 3 | use darling::export::NestedMeta; | ||
| 4 | use darling::FromMeta; | 3 | use darling::FromMeta; |
| 4 | use darling::export::NestedMeta; | ||
| 5 | use proc_macro2::TokenStream; | 5 | use proc_macro2::TokenStream; |
| 6 | use quote::quote; | 6 | use quote::quote; |
| 7 | use syn::{ReturnType, Type}; | 7 | use syn::{ReturnType, Type}; |
diff --git a/embassy-executor-macros/src/macros/task.rs b/embassy-executor-macros/src/macros/task.rs index 755948882..8ce8d6726 100644 --- a/embassy-executor-macros/src/macros/task.rs +++ b/embassy-executor-macros/src/macros/task.rs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | use std::str::FromStr; | 1 | use std::str::FromStr; |
| 2 | 2 | ||
| 3 | use darling::export::NestedMeta; | ||
| 4 | use darling::FromMeta; | 3 | use darling::FromMeta; |
| 4 | use darling::export::NestedMeta; | ||
| 5 | use proc_macro2::{Span, TokenStream}; | 5 | use proc_macro2::{Span, TokenStream}; |
| 6 | use quote::{format_ident, quote}; | 6 | use quote::{format_ident, quote}; |
| 7 | use syn::visit::{self, Visit}; | 7 | use syn::visit::{self, Visit}; |
| @@ -287,7 +287,11 @@ fn check_arg_ty(errors: &mut TokenStream, ty: &Type) { | |||
| 287 | } | 287 | } |
| 288 | 288 | ||
| 289 | fn visit_type_impl_trait(&mut self, i: &'ast syn::TypeImplTrait) { | 289 | fn visit_type_impl_trait(&mut self, i: &'ast syn::TypeImplTrait) { |
| 290 | error(self.errors, i, "`impl Trait` is not allowed in task arguments. It is syntax sugar for generics, and tasks can't be generic."); | 290 | error( |
| 291 | self.errors, | ||
| 292 | i, | ||
| 293 | "`impl Trait` is not allowed in task arguments. It is syntax sugar for generics, and tasks can't be generic.", | ||
| 294 | ); | ||
| 291 | } | 295 | } |
| 292 | } | 296 | } |
| 293 | 297 | ||
diff --git a/embassy-executor-macros/src/util.rs b/embassy-executor-macros/src/util.rs index ebd032a62..5a13f2121 100644 --- a/embassy-executor-macros/src/util.rs +++ b/embassy-executor-macros/src/util.rs | |||
| @@ -3,7 +3,7 @@ use std::fmt::Display; | |||
| 3 | use proc_macro2::{TokenStream, TokenTree}; | 3 | use proc_macro2::{TokenStream, TokenTree}; |
| 4 | use quote::{ToTokens, TokenStreamExt}; | 4 | use quote::{ToTokens, TokenStreamExt}; |
| 5 | use syn::parse::{Parse, ParseStream}; | 5 | use syn::parse::{Parse, ParseStream}; |
| 6 | use syn::{braced, bracketed, token, AttrStyle, Attribute, Signature, Token, Visibility}; | 6 | use syn::{AttrStyle, Attribute, Signature, Token, Visibility, braced, bracketed, token}; |
| 7 | 7 | ||
| 8 | pub fn token_stream_with_error(mut tokens: TokenStream, error: syn::Error) -> TokenStream { | 8 | pub fn token_stream_with_error(mut tokens: TokenStream, error: syn::Error) -> TokenStream { |
| 9 | tokens.extend(error.into_compile_error()); | 9 | tokens.extend(error.into_compile_error()); |
