From a0f1b0ee01d461607660d2d56b5b1bdc57e0d3fb Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Fri, 29 Jul 2022 21:58:35 +0200 Subject: Split embassy crate into embassy-executor, embassy-util. --- examples/std/src/bin/net.rs | 8 ++++---- examples/std/src/bin/serial.rs | 6 +++--- examples/std/src/bin/tick.rs | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/std/src') diff --git a/examples/std/src/bin/net.rs b/examples/std/src/bin/net.rs index 74073ee81..202585289 100644 --- a/examples/std/src/bin/net.rs +++ b/examples/std/src/bin/net.rs @@ -1,10 +1,10 @@ #![feature(type_alias_impl_trait)] use clap::Parser; -use embassy::executor::{Executor, Spawner}; -use embassy::util::Forever; +use embassy_executor::executor::{Executor, Spawner}; use embassy_net::tcp::TcpSocket; use embassy_net::{ConfigStrategy, Ipv4Address, Ipv4Cidr, Stack, StackResources}; +use embassy_util::Forever; use embedded_io::asynch::Write; use heapless::Vec; use log::*; @@ -34,12 +34,12 @@ struct Opts { static_ip: bool, } -#[embassy::task] +#[embassy_executor::task] async fn net_task(stack: &'static Stack) -> ! { stack.run().await } -#[embassy::task] +#[embassy_executor::task] async fn main_task(spawner: Spawner) { let opts: Opts = Opts::parse(); diff --git a/examples/std/src/bin/serial.rs b/examples/std/src/bin/serial.rs index b1e5b0142..b803d1ef7 100644 --- a/examples/std/src/bin/serial.rs +++ b/examples/std/src/bin/serial.rs @@ -4,15 +4,15 @@ mod serial_port; use async_io::Async; -use embassy::executor::Executor; -use embassy::util::Forever; +use embassy_executor::executor::Executor; +use embassy_util::Forever; use embedded_io::asynch::Read; use log::*; use nix::sys::termios; use self::serial_port::SerialPort; -#[embassy::task] +#[embassy_executor::task] async fn run() { // Open the serial port. let baudrate = termios::BaudRate::B115200; diff --git a/examples/std/src/bin/tick.rs b/examples/std/src/bin/tick.rs index bed9d7dc5..9ca900df8 100644 --- a/examples/std/src/bin/tick.rs +++ b/examples/std/src/bin/tick.rs @@ -1,10 +1,10 @@ #![feature(type_alias_impl_trait)] -use embassy::executor::Spawner; -use embassy::time::{Duration, Timer}; +use embassy_executor::executor::Spawner; +use embassy_executor::time::{Duration, Timer}; use log::*; -#[embassy::task] +#[embassy_executor::task] async fn run() { loop { info!("tick"); @@ -12,7 +12,7 @@ async fn run() { } } -#[embassy::main] +#[embassy_executor::main] async fn main(spawner: Spawner) { env_logger::builder() .filter_level(log::LevelFilter::Debug) -- cgit