aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2020-10-26 12:43:28 +0100
committerDario Nieuwenhuis <[email protected]>2020-10-26 12:43:28 +0100
commit878bfd2b7520631ab4b39dbe928dec6fc1a69f00 (patch)
tree3b0b81674098d733961b7801de58b5d0bc1daa6b
parenta0cc229a3a5d9c9a157ff9aa17e947bbfef32ef3 (diff)
Fixes
-rw-r--r--embassy/Cargo.toml8
-rw-r--r--embassy/src/executor/executor.rs3
-rw-r--r--embassy/src/util/macros.rs2
-rw-r--r--embassy/src/util/mod.rs2
4 files changed, 11 insertions, 4 deletions
diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml
index 4abcda99e..7e9ea91d8 100644
--- a/embassy/Cargo.toml
+++ b/embassy/Cargo.toml
@@ -6,11 +6,17 @@ edition = "2018"
6 6
7[features] 7[features]
8std = ["futures/std"] 8std = ["futures/std"]
9defmt-default = []
10defmt-trace = []
11defmt-debug = []
12defmt-info = []
13defmt-warn = []
14defmt-error = []
9 15
10[dependencies] 16[dependencies]
11defmt = "0.1.0" 17defmt = "0.1.0"
12cortex-m = "0.6.3" 18cortex-m = "0.6.3"
13futures = { version = "0.3.5", default-features = false, features = [ "async-await" ] } 19futures = { version = "0.3.5", default-features = false }
14pin-project = { version = "0.4.23", default-features = false } 20pin-project = { version = "0.4.23", default-features = false }
15futures-intrusive = { version = "0.3.1", default-features = false } 21futures-intrusive = { version = "0.3.1", default-features = false }
16embassy-macros = { version = "0.1.0", path = "../embassy-macros"} 22embassy-macros = { version = "0.1.0", path = "../embassy-macros"}
diff --git a/embassy/src/executor/executor.rs b/embassy/src/executor/executor.rs
index 43127d61c..e7bb659fb 100644
--- a/embassy/src/executor/executor.rs
+++ b/embassy/src/executor/executor.rs
@@ -1,6 +1,3 @@
1#![no_std]
2#![feature(const_fn)]
3
4use core::cell::Cell; 1use core::cell::Cell;
5use core::cell::UnsafeCell; 2use core::cell::UnsafeCell;
6use core::future::Future; 3use core::future::Future;
diff --git a/embassy/src/util/macros.rs b/embassy/src/util/macros.rs
index 69987e42c..3773af698 100644
--- a/embassy/src/util/macros.rs
+++ b/embassy/src/util/macros.rs
@@ -1,5 +1,6 @@
1#![macro_use] 1#![macro_use]
2 2
3#[macro_export]
3macro_rules! depanic { 4macro_rules! depanic {
4 ($( $i:expr ),*) => { 5 ($( $i:expr ),*) => {
5 { 6 {
@@ -9,6 +10,7 @@ macro_rules! depanic {
9 } 10 }
10} 11}
11 12
13#[macro_export]
12macro_rules! deassert { 14macro_rules! deassert {
13 ($cond:expr) => { 15 ($cond:expr) => {
14 deassert!($cond, "assertion failed"); 16 deassert!($cond, "assertion failed");
diff --git a/embassy/src/util/mod.rs b/embassy/src/util/mod.rs
index 601a9b4af..109cc35a8 100644
--- a/embassy/src/util/mod.rs
+++ b/embassy/src/util/mod.rs
@@ -13,6 +13,8 @@ pub use drop_bomb::*;
13 13
14use defmt::{debug, error, info, intern, trace, warn}; 14use defmt::{debug, error, info, intern, trace, warn};
15 15
16pub use macros::*;
17
16pub trait Dewrap<T> { 18pub trait Dewrap<T> {
17 /// dewrap = defmt unwrap 19 /// dewrap = defmt unwrap
18 fn dewrap(self) -> T; 20 fn dewrap(self) -> T;