From 5f04d6e6c51fd5f13c04aa122ba9811d97d8a116 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Thu, 2 Sep 2021 14:45:20 +0200 Subject: Fix embassy::main macros for std target --- examples/std/src/bin/tick.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'examples') diff --git a/examples/std/src/bin/tick.rs b/examples/std/src/bin/tick.rs index 385b317d4..7de78040f 100644 --- a/examples/std/src/bin/tick.rs +++ b/examples/std/src/bin/tick.rs @@ -1,9 +1,8 @@ #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] -use embassy::executor::Executor; +use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; -use embassy::util::Forever; use log::*; #[embassy::task] @@ -14,16 +13,12 @@ async fn run() { } } -static EXECUTOR: Forever = Forever::new(); - -fn main() { +#[embassy::main] +async fn main(spawner: Spawner) { env_logger::builder() .filter_level(log::LevelFilter::Debug) .format_timestamp_nanos() .init(); - let executor = EXECUTOR.put(Executor::new()); - executor.run(|spawner| { - spawner.spawn(run()).unwrap(); - }); + spawner.spawn(run()).unwrap(); } -- cgit