From c4b9c8ac8762fdca52b6c37dd99346b2371387ab Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 25 Aug 2021 20:34:25 +0200
Subject: std: fold into embassy core, add non-hacky time driver.

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

(limited to 'examples')

diff --git a/examples/std/Cargo.toml b/examples/std/Cargo.toml
index 466814850..34b8ebb67 100644
--- a/examples/std/Cargo.toml
+++ b/examples/std/Cargo.toml
@@ -5,8 +5,7 @@ name = "embassy-std-examples"
 version = "0.1.0"
 
 [dependencies]
-embassy = { version = "0.1.0", path = "../../embassy", features = ["log"] }
-embassy-std = { version = "0.1.0", path = "../../embassy-std" }
+embassy = { version = "0.1.0", path = "../../embassy", features = ["log", "std", "time"] }
 embassy-net = { version = "0.1.0", path = "../../embassy-net", features=["std", "log", "medium-ethernet", "tcp", "dhcpv4"] }
 smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp", rev="e4241510337e095b9d21136c5f58b2eaa1b78479", default-features = false }
 
diff --git a/examples/std/src/bin/net.rs b/examples/std/src/bin/net.rs
index 323d711a8..b98b97090 100644
--- a/examples/std/src/bin/net.rs
+++ b/examples/std/src/bin/net.rs
@@ -2,11 +2,10 @@
 #![allow(incomplete_features)]
 
 use clap::{AppSettings, Clap};
-use embassy::executor::Spawner;
+use embassy::executor::{Executor, Spawner};
 use embassy::io::AsyncWriteExt;
 use embassy::util::Forever;
 use embassy_net::*;
-use embassy_std::Executor;
 use heapless::Vec;
 use log::*;
 
diff --git a/examples/std/src/bin/serial.rs b/examples/std/src/bin/serial.rs
index ca596a34c..181c5dfaa 100644
--- a/examples/std/src/bin/serial.rs
+++ b/examples/std/src/bin/serial.rs
@@ -5,9 +5,9 @@
 mod serial_port;
 
 use async_io::Async;
+use embassy::executor::Executor;
 use embassy::io::AsyncBufReadExt;
 use embassy::util::Forever;
-use embassy_std::Executor;
 use log::*;
 use nix::sys::termios;
 
diff --git a/examples/std/src/bin/tick.rs b/examples/std/src/bin/tick.rs
index 16f54b2c6..385b317d4 100644
--- a/examples/std/src/bin/tick.rs
+++ b/examples/std/src/bin/tick.rs
@@ -1,9 +1,9 @@
 #![feature(type_alias_impl_trait)]
 #![allow(incomplete_features)]
 
+use embassy::executor::Executor;
 use embassy::time::{Duration, Timer};
 use embassy::util::Forever;
-use embassy_std::Executor;
 use log::*;
 
 #[embassy::task]
-- 
cgit