Merge branch 'main' into main

4 files changed, 10 insertions, 6 deletions

diff --git a/embassy-executor-macros/Cargo.toml b/embassy-executor-macros/Cargo.toml
index 9c2b40d03..3eeed5e4d 100644
--- a/embassy-executor-macros/Cargo.toml
+++ b/embassy-executor-macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "embassy-executor-macros"
 version = "0.7.0"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "macros for creating the entry point and tasks for embassy-executor"
 repository = "https://github.com/embassy-rs/embassy"
diff --git a/embassy-executor-macros/src/macros/main.rs b/embassy-executor-macros/src/macros/main.rs
index dc470e51c..c259c003f 100644
--- a/embassy-executor-macros/src/macros/main.rs
+++ b/embassy-executor-macros/src/macros/main.rs
@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
-use darling::export::NestedMeta;
 use darling::FromMeta;
+use darling::export::NestedMeta;
 use proc_macro2::TokenStream;
 use quote::quote;
 use syn::{ReturnType, Type};
@@ -183,7 +183,7 @@ For example: `#[embassy_executor::main(entry = ..., executor = \"some_crate::Exe
             quote!(!),
             quote! {
                 unsafe fn __make_static<T>(t: &mut T) -> &'static mut T {
-                    ::core::mem::transmute(t)
+                    unsafe { ::core::mem::transmute(t) }
                 }
 
                 let mut executor = #executor::new();
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 @@
 use std::str::FromStr;
 
-use darling::export::NestedMeta;
 use darling::FromMeta;
+use darling::export::NestedMeta;
 use proc_macro2::{Span, TokenStream};
 use quote::{format_ident, quote};
 use syn::visit::{self, Visit};
@@ -287,7 +287,11 @@ fn check_arg_ty(errors: &mut TokenStream, ty: &Type) {
         }
 
         fn visit_type_impl_trait(&mut self, i: &'ast syn::TypeImplTrait) {
-            error(self.errors, i, "`impl Trait` is not allowed in task arguments. It is syntax sugar for generics, and tasks can't be generic.");
+            error(
+                self.errors,
+                i,
+                "`impl Trait` is not allowed in task arguments. It is syntax sugar for generics, and tasks can't be generic.",
+            );
         }
     }
 
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;
 use proc_macro2::{TokenStream, TokenTree};
 use quote::{ToTokens, TokenStreamExt};
 use syn::parse::{Parse, ParseStream};
-use syn::{braced, bracketed, token, AttrStyle, Attribute, Signature, Token, Visibility};
+use syn::{AttrStyle, Attribute, Signature, Token, Visibility, braced, bracketed, token};
 
 pub fn token_stream_with_error(mut tokens: TokenStream, error: syn::Error) -> TokenStream {
     tokens.extend(error.into_compile_error());