Remove cfg_if

This commit is contained in:
Henrik Alsér 2022-08-31 22:03:34 +02:00 committed by Henrik Alsér
parent 3fce6ec649
commit b934f3f12e

View File

@ -556,9 +556,11 @@ mod eh1 {
} }
} }
cfg_if::cfg_if! { #[cfg(all(feature = "unstable-traits", feature = "nightly"))]
if #[cfg(all(feature = "unstable-traits", feature = "nightly"))] { mod eha {
use super::*;
use core::future::Future; use core::future::Future;
impl<'d, T: Instance> embedded_hal_async::spi::SpiBusFlush for Spi<'d, T, Async> { impl<'d, T: Instance> embedded_hal_async::spi::SpiBusFlush for Spi<'d, T, Async> {
type FlushFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a; type FlushFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
@ -567,9 +569,7 @@ cfg_if::cfg_if! {
} }
} }
impl<'d, T: Instance> embedded_hal_async::spi::SpiBusWrite<u8> impl<'d, T: Instance> embedded_hal_async::spi::SpiBusWrite<u8> for Spi<'d, T, Async> {
for Spi<'d, T, Async>
{
type WriteFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a; type WriteFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
fn write<'a>(&'a mut self, data: &'a [u8]) -> Self::WriteFuture<'a> { fn write<'a>(&'a mut self, data: &'a [u8]) -> Self::WriteFuture<'a> {
@ -577,9 +577,7 @@ cfg_if::cfg_if! {
} }
} }
impl<'d, T: Instance> embedded_hal_async::spi::SpiBusRead<u8> impl<'d, T: Instance> embedded_hal_async::spi::SpiBusRead<u8> for Spi<'d, T, Async> {
for Spi<'d, T, Async>
{
type ReadFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a; type ReadFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
fn read<'a>(&'a mut self, data: &'a mut [u8]) -> Self::ReadFuture<'a> { fn read<'a>(&'a mut self, data: &'a mut [u8]) -> Self::ReadFuture<'a> {
@ -587,9 +585,7 @@ cfg_if::cfg_if! {
} }
} }
impl<'d, T: Instance> embedded_hal_async::spi::SpiBus<u8> impl<'d, T: Instance> embedded_hal_async::spi::SpiBus<u8> for Spi<'d, T, Async> {
for Spi<'d, T, Async>
{
type TransferFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a; type TransferFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a where Self: 'a;
fn transfer<'a>(&'a mut self, rx: &'a mut [u8], tx: &'a [u8]) -> Self::TransferFuture<'a> { fn transfer<'a>(&'a mut self, rx: &'a mut [u8], tx: &'a [u8]) -> Self::TransferFuture<'a> {
@ -603,7 +599,6 @@ cfg_if::cfg_if! {
} }
} }
} }
}
impl<'d, T: Instance, M: Mode> SetConfig for Spi<'d, T, M> { impl<'d, T: Instance, M: Mode> SetConfig for Spi<'d, T, M> {
type Config = Config; type Config = Config;