Merge branch 'main' into add-nrf-rtc-driver

3 files changed, 10 insertions, 4 deletions

diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
index f6dce5c0e..61d060630 100644
--- a/embassy-executor/Cargo.toml
+++ b/embassy-executor/Cargo.toml
@@ -123,6 +123,12 @@ rustversion = "1.0.21"
 ## Enable nightly-only features
 nightly = ["embassy-executor-macros/nightly"]
 
+## Enable defmt logging
+defmt = ["dep:defmt"]
+
+## Enable log logging  
+log = ["dep:log"]
+
 # Enables turbo wakers, which requires patching core. Not surfaced in the docs by default due to
 # being an complicated advanced and undocumented feature.
 # See: https://github.com/embassy-rs/embassy/pull/1263
diff --git a/embassy-executor/tests/ui/spawn_nonsend.stderr b/embassy-executor/tests/ui/spawn_nonsend.stderr
index 25bd7d78d..5a3131602 100644
--- a/embassy-executor/tests/ui/spawn_nonsend.stderr
+++ b/embassy-executor/tests/ui/spawn_nonsend.stderr
@@ -9,7 +9,7 @@ warning: unused import: `core::future::Future`
 error[E0277]: `*mut ()` cannot be sent between threads safely
   --> tests/ui/spawn_nonsend.rs:13:13
    |
-7  | #[embassy_executor::task]
+ 7 | #[embassy_executor::task]
    | ------------------------- within this `impl Sized`
 ...
 13 |     s.spawn(task(core::ptr::null_mut()).unwrap());
@@ -21,7 +21,7 @@ error[E0277]: `*mut ()` cannot be sent between threads safely
 note: required because it's used within this closure
   --> tests/ui/spawn_nonsend.rs:7:1
    |
-7  | #[embassy_executor::task]
+ 7 | #[embassy_executor::task]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: required because it appears within the type `impl Sized`
   --> src/raw/mod.rs
@@ -31,7 +31,7 @@ note: required because it appears within the type `impl Sized`
 note: required because it appears within the type `impl Sized`
   --> tests/ui/spawn_nonsend.rs:7:1
    |
-7  | #[embassy_executor::task]
+ 7 | #[embassy_executor::task]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: required by a bound in `SendSpawner::spawn`
   --> src/spawner.rs
diff --git a/embassy-executor/tests/ui/unsafe_op_in_unsafe_task.stderr b/embassy-executor/tests/ui/unsafe_op_in_unsafe_task.stderr
index d987a4b95..033395584 100644
--- a/embassy-executor/tests/ui/unsafe_op_in_unsafe_task.stderr
+++ b/embassy-executor/tests/ui/unsafe_op_in_unsafe_task.stderr
@@ -4,7 +4,7 @@ error[E0133]: call to unsafe function `std::ptr::const_ptr::<impl *const T>::rea
 7 |     (&x as *const i32).read();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function
   |
-  = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/unsafe-op-in-unsafe-fn.html>
+  = note: for more information, see <https://doc.rust-lang.org/edition-guide/rust-2024/unsafe-op-in-unsafe-fn.html>
   = note: consult the function's documentation for information on how to avoid undefined behavior
 note: an unsafe function restricts its caller, but its body is safe by default
  --> tests/ui/unsafe_op_in_unsafe_task.rs:5:1