Rustup

Cargo.toml

@@ -1,10 +1,13 @@
+cargo-features = ["default-run"]
+
 [package]
 authors = ["Philipp Oppermann <[email protected]>"]
 categories = ["embedded", "no-std"]
 license = "MIT OR Apache-2.0"
 name = "stm32f7-discovery"
 version = "0.1.0"
 edition = "2018"
+default-run = "async-await"
 
 [dependencies]
 cortex-m = "0.5.2"
@@ -45,10 +48,9 @@ default-features = false
 features = ["unicode"]
 
 [dependencies.futures-preview]
-git = "https://github.com/embed-rs/futures-rs.git"
-branch = "alloc-rebase"
+git = "https://github.com/rust-lang-nursery/futures-rs.git"
 default-features = false
-features = ["alloc"]
+features = ["alloc", "nightly"]
 
 [profile.release]
 codegen-units = 1 # better optimizations

rust-toolchain

@@ -1 +1 @@
-nightly-2019-03-15
+nightly-2019-03-23

src/bin/async-await.rs

@@ -183,7 +183,8 @@ fn run() -> ! {
         &mut nvic_stir,
         |_| {},
         |interrupt_table| {
-            use futures::{channel::mpsc, task::LocalSpawnExt, StreamExt};
+            use futures::{task::LocalSpawnExt, StreamExt};
+            use stm32f7_discovery::task_runtime::mpsc;
 
             // Future channels for passing interrupts events. The interrupt handler pushes
             // to a channel and the interrupt handler awaits the next item of the channel. There

src/interrupts/primask_mutex.rs

@@ -18,6 +18,7 @@ use cortex_m::register::primask;
 /// Since the access to the data is synchronized (no interrupt can preempt
 /// the current code in the critical section) the mutex implements `Send` and `Sync` when
 /// the synchronized data implements `Send`.
+#[derive(Debug)]
 pub struct PrimaskMutex<T> {
     data: UnsafeCell<T>,
 }

src/lib.rs

@@ -19,6 +19,7 @@
 #![feature(generators)]
 #![feature(async_await)]
 #![feature(const_transmute)]
+#![feature(alloc_prelude)]
 #![warn(missing_docs)]
 
 #[macro_use]

src/task_runtime.rs

@@ -3,18 +3,19 @@
 use crate::mpsc_queue::{PopResult, Queue};
 use alloc::{
     collections::BTreeMap,
-    prelude::*,
+    prelude::v1::*,
     sync::Arc,
 };
 use core::ops::{Add, AddAssign};
 use core::pin::Pin;
 use futures::{
-    channel::mpsc,
     future::{FutureObj, LocalFutureObj},
     prelude::*,
     task::{LocalSpawn, Poll, Spawn, SpawnError, Waker, RawWaker, RawWakerVTable},
 };
 
+pub mod mpsc;
+
 /// An executor that schedules tasks round-robin, and executes an idle_task
 /// if no task is ready to execute.
 pub struct Executor {