Reexport macros at root, use eveywhere as `#[embassy::task]`

3 files changed, 11 insertions, 11 deletions

diff --git a/embassy-nrf-examples/src/bin/executor_fairness_test.rs b/embassy-nrf-examples/src/bin/executor_fairness_test.rs
index e82e5475b..3ea74316e 100644
--- a/embassy-nrf-examples/src/bin/executor_fairness_test.rs
+++ b/embassy-nrf-examples/src/bin/executor_fairness_test.rs
@@ -11,11 +11,11 @@ use example_common::*;
 
 use core::task::Poll;
 use defmt::panic;
-use embassy::executor::{task, Spawner};
+use embassy::executor::Spawner;
 use embassy::time::{Duration, Instant, Timer};
 use embassy_nrf::interrupt;
 
-#[task]
+#[embassy::task]
 async fn run1() {
     loop {
         info!("DING DONG");
@@ -23,14 +23,14 @@ async fn run1() {
     }
 }
 
-#[task]
+#[embassy::task]
 async fn run2() {
     loop {
         Timer::at(Instant::from_ticks(0)).await;
     }
 }
 
-#[task]
+#[embassy::task]
 async fn run3() {
     futures::future::poll_fn(|cx| {
         cx.waker().wake_by_ref();
diff --git a/embassy-nrf-examples/src/bin/multiprio.rs b/embassy-nrf-examples/src/bin/multiprio.rs
index aa2824f6b..c6228a1ea 100644
--- a/embassy-nrf-examples/src/bin/multiprio.rs
+++ b/embassy-nrf-examples/src/bin/multiprio.rs
@@ -66,13 +66,13 @@ use example_common::*;
 
 use cortex_m_rt::entry;
 use defmt::panic;
-use embassy::executor::{task, Executor, InterruptExecutor};
+use embassy::executor::{Executor, InterruptExecutor};
 use embassy::interrupt::InterruptExt;
 use embassy::time::{Duration, Instant, Timer};
 use embassy::util::Forever;
 use embassy_nrf::{interrupt, peripherals, rtc};
 
-#[task]
+#[embassy::task]
 async fn run_high() {
     loop {
         info!("        [high] tick!");
@@ -80,7 +80,7 @@ async fn run_high() {
     }
 }
 
-#[task]
+#[embassy::task]
 async fn run_med() {
     loop {
         let start = Instant::now();
@@ -97,7 +97,7 @@ async fn run_med() {
     }
 }
 
-#[task]
+#[embassy::task]
 async fn run_low() {
     loop {
         let start = Instant::now();
diff --git a/embassy-nrf-examples/src/bin/timer.rs b/embassy-nrf-examples/src/bin/timer.rs
index 6116aa60d..a2b717bc1 100644
--- a/embassy-nrf-examples/src/bin/timer.rs
+++ b/embassy-nrf-examples/src/bin/timer.rs
@@ -10,10 +10,10 @@ mod example_common;
 use example_common::*;
 
 use defmt::panic;
-use embassy::executor::{task, Spawner};
+use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 
-#[task]
+#[embassy::task]
 async fn run1() {
     loop {
         info!("BIG INFREQUENT TICK");
@@ -21,7 +21,7 @@ async fn run1() {
     }
 }
 
-#[task]
+#[embassy::task]
 async fn run2() {
     loop {
         info!("tick");