From a0f1b0ee01d461607660d2d56b5b1bdc57e0d3fb Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Fri, 29 Jul 2022 21:58:35 +0200
Subject: Split embassy crate into embassy-executor, embassy-util.

---
 examples/std/Cargo.toml        | 3 ++-
 examples/std/src/bin/net.rs    | 8 ++++----
 examples/std/src/bin/serial.rs | 6 +++---
 examples/std/src/bin/tick.rs   | 8 ++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'examples/std')

diff --git a/examples/std/Cargo.toml b/examples/std/Cargo.toml
index 8787f3c92..54499796b 100644
--- a/examples/std/Cargo.toml
+++ b/examples/std/Cargo.toml
@@ -4,7 +4,8 @@ name = "embassy-std-examples"
 version = "0.1.0"
 
 [dependencies]
-embassy = { version = "0.1.0", path = "../../embassy", features = ["log", "std", "time", "nightly"] }
+embassy-util = { version = "0.1.0", path = "../../embassy-util", features = ["log"] }
+embassy-executor = { version = "0.1.0", path = "../../embassy-executor", features = ["log", "std", "time", "nightly"] }
 embassy-net = { version = "0.1.0", path = "../../embassy-net", features=[ "std", "log", "medium-ethernet", "tcp", "dhcpv4", "pool-16"] }
 embedded-io = { version = "0.3.0", features = ["async", "std", "futures"] }
 
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<TunTapDevice>) -> ! {
     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