From aff840cf30eb85cf6df3c543fe5c047e3bbe5eef Mon Sep 17 00:00:00 2001
From: Jan Niehusmann <jan@gondor.com>
Date: Thu, 21 Jul 2022 19:45:04 +0000
Subject: [PATCH] Fix build of embassy-rp on stable channel
---
embassy-rp/Cargo.toml | 2 +-
embassy-rp/src/gpio.rs | 120 +++++++++++++++++++++--------------------
embassy-rp/src/lib.rs | 3 +-
3 files changed, 64 insertions(+), 61 deletions(-)
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index ffb4c9148..6529e1a37 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -27,7 +27,7 @@ nightly = ["embassy/nightly", "embedded-hal-1", "embedded-hal-async", "embassy-e
unstable-traits = ["embedded-hal-1"]
[dependencies]
-embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz", "nightly"] }
+embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] }
embassy-cortex-m = { version = "0.1.0", path = "../embassy-cortex-m", features = ["prio-bits-3"]}
embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" }
diff --git a/embassy-rp/src/gpio.rs b/embassy-rp/src/gpio.rs
index ef15a5eff..f205063c6 100644
--- a/embassy-rp/src/gpio.rs
+++ b/embassy-rp/src/gpio.rs
@@ -1,4 +1,3 @@
-use core::convert::Infallible;
use core::future::Future;
use core::marker::PhantomData;
use core::pin::Pin as FuturePin;
@@ -720,7 +719,7 @@ impl_pin!(PIN_QSPI_SD3, Bank::Qspi, 5);
// ====================
mod eh02 {
- use futures::FutureExt;
+ use core::convert::Infallible;
use super::*;
@@ -839,66 +838,15 @@ mod eh02 {
Ok(self.toggle())
}
}
-
- use core::convert::Infallible;
-
- impl<'d, T: Pin> embedded_hal_async::digital::Wait for Flex<'d, T> {
- type WaitForHighFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_high<'a>(&'a mut self) -> Self::WaitForHighFuture<'a> {
- self.wait_for_high().map(Ok)
- }
-
- type WaitForLowFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_low<'a>(&'a mut self) -> Self::WaitForLowFuture<'a> {
- self.wait_for_low().map(Ok)
- }
-
- type WaitForRisingEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_rising_edge<'a>(&'a mut self) -> Self::WaitForRisingEdgeFuture<'a> {
- self.wait_for_rising_edge().map(Ok)
- }
-
- type WaitForFallingEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_falling_edge<'a>(&'a mut self) -> Self::WaitForFallingEdgeFuture<'a> {
- self.wait_for_falling_edge().map(Ok)
- }
-
- type WaitForAnyEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_any_edge<'a>(&'a mut self) -> Self::WaitForAnyEdgeFuture<'a> {
- self.wait_for_any_edge().map(Ok)
- }
- }
-
- impl<'d, T: Pin> embedded_hal_async::digital::Wait for Input<'d, T> {
- type WaitForHighFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_high<'a>(&'a mut self) -> Self::WaitForHighFuture<'a> {
- self.wait_for_high().map(Ok)
- }
-
- type WaitForLowFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_low<'a>(&'a mut self) -> Self::WaitForLowFuture<'a> {
- self.wait_for_low().map(Ok)
- }
-
- type WaitForRisingEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_rising_edge<'a>(&'a mut self) -> Self::WaitForRisingEdgeFuture<'a> {
- self.wait_for_rising_edge().map(Ok)
- }
-
- type WaitForFallingEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_falling_edge<'a>(&'a mut self) -> Self::WaitForFallingEdgeFuture<'a> {
- self.wait_for_falling_edge().map(Ok)
- }
-
- type WaitForAnyEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
- fn wait_for_any_edge<'a>(&'a mut self) -> Self::WaitForAnyEdgeFuture<'a> {
- self.wait_for_any_edge().map(Ok)
- }
- }
}
#[cfg(feature = "unstable-traits")]
mod eh1 {
+ use core::convert::Infallible;
+
+ #[cfg(feature = "nightly")]
+ use futures::FutureExt;
+
use super::*;
impl<'d, T: Pin> embedded_hal_1::digital::ErrorType for Input<'d, T> {
@@ -1014,4 +962,60 @@ mod eh1 {
Ok(self.toggle())
}
}
+
+ #[cfg(feature = "nightly")]
+ impl<'d, T: Pin> embedded_hal_async::digital::Wait for Flex<'d, T> {
+ type WaitForHighFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_high<'a>(&'a mut self) -> Self::WaitForHighFuture<'a> {
+ self.wait_for_high().map(Ok)
+ }
+
+ type WaitForLowFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_low<'a>(&'a mut self) -> Self::WaitForLowFuture<'a> {
+ self.wait_for_low().map(Ok)
+ }
+
+ type WaitForRisingEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_rising_edge<'a>(&'a mut self) -> Self::WaitForRisingEdgeFuture<'a> {
+ self.wait_for_rising_edge().map(Ok)
+ }
+
+ type WaitForFallingEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_falling_edge<'a>(&'a mut self) -> Self::WaitForFallingEdgeFuture<'a> {
+ self.wait_for_falling_edge().map(Ok)
+ }
+
+ type WaitForAnyEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_any_edge<'a>(&'a mut self) -> Self::WaitForAnyEdgeFuture<'a> {
+ self.wait_for_any_edge().map(Ok)
+ }
+ }
+
+ #[cfg(feature = "nightly")]
+ impl<'d, T: Pin> embedded_hal_async::digital::Wait for Input<'d, T> {
+ type WaitForHighFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_high<'a>(&'a mut self) -> Self::WaitForHighFuture<'a> {
+ self.wait_for_high().map(Ok)
+ }
+
+ type WaitForLowFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_low<'a>(&'a mut self) -> Self::WaitForLowFuture<'a> {
+ self.wait_for_low().map(Ok)
+ }
+
+ type WaitForRisingEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_rising_edge<'a>(&'a mut self) -> Self::WaitForRisingEdgeFuture<'a> {
+ self.wait_for_rising_edge().map(Ok)
+ }
+
+ type WaitForFallingEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_falling_edge<'a>(&'a mut self) -> Self::WaitForFallingEdgeFuture<'a> {
+ self.wait_for_falling_edge().map(Ok)
+ }
+
+ type WaitForAnyEdgeFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
+ fn wait_for_any_edge<'a>(&'a mut self) -> Self::WaitForAnyEdgeFuture<'a> {
+ self.wait_for_any_edge().map(Ok)
+ }
+ }
}
diff --git a/embassy-rp/src/lib.rs b/embassy-rp/src/lib.rs
index 90ef1b170..7da0d30c1 100644
--- a/embassy-rp/src/lib.rs
+++ b/embassy-rp/src/lib.rs
@@ -1,6 +1,5 @@
#![no_std]
-#![feature(generic_associated_types)]
-#![feature(type_alias_impl_trait)]
+#![cfg_attr(feature = "nightly", feature(generic_associated_types, type_alias_impl_trait))]
// This mod MUST go first, so that the others see its macros.
pub(crate) mod fmt;