From c6989dfbca51787146f50270c671af9db434f577 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 29 Nov 2023 17:23:48 +0100 Subject: Remove nightly and unstable-traits features in preparation for 1.75. --- embassy-embedded-hal/src/flash/concat_flash.rs | 3 --- embassy-embedded-hal/src/flash/mem_flash.rs | 3 --- embassy-embedded-hal/src/flash/partition/mod.rs | 2 -- embassy-embedded-hal/src/lib.rs | 8 +++----- embassy-embedded-hal/src/shared_bus/asynch/i2c.rs | 13 ++++++------- embassy-embedded-hal/src/shared_bus/asynch/spi.rs | 11 +++++------ embassy-embedded-hal/src/shared_bus/mod.rs | 2 -- 7 files changed, 14 insertions(+), 28 deletions(-) (limited to 'embassy-embedded-hal/src') diff --git a/embassy-embedded-hal/src/flash/concat_flash.rs b/embassy-embedded-hal/src/flash/concat_flash.rs index 1ea84269c..499941d19 100644 --- a/embassy-embedded-hal/src/flash/concat_flash.rs +++ b/embassy-embedded-hal/src/flash/concat_flash.rs @@ -1,5 +1,4 @@ use embedded_storage::nor_flash::{ErrorType, NorFlash, NorFlashError, ReadNorFlash}; -#[cfg(feature = "nightly")] use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; /// Convenience helper for concatenating two consecutive flashes into one. @@ -117,7 +116,6 @@ where } } -#[cfg(feature = "nightly")] impl AsyncReadNorFlash for ConcatFlash where First: AsyncReadNorFlash, @@ -146,7 +144,6 @@ where } } -#[cfg(feature = "nightly")] impl AsyncNorFlash for ConcatFlash where First: AsyncNorFlash, diff --git a/embassy-embedded-hal/src/flash/mem_flash.rs b/embassy-embedded-hal/src/flash/mem_flash.rs index afb0d1a15..d24c61823 100644 --- a/embassy-embedded-hal/src/flash/mem_flash.rs +++ b/embassy-embedded-hal/src/flash/mem_flash.rs @@ -1,7 +1,6 @@ use alloc::vec::Vec; use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash}; -#[cfg(feature = "nightly")] use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; extern crate alloc; @@ -93,7 +92,6 @@ impl NorFla } } -#[cfg(feature = "nightly")] impl AsyncReadNorFlash for MemFlash { @@ -109,7 +107,6 @@ impl AsyncR } } -#[cfg(feature = "nightly")] impl AsyncNorFlash for MemFlash { diff --git a/embassy-embedded-hal/src/flash/partition/mod.rs b/embassy-embedded-hal/src/flash/partition/mod.rs index 42c8a308d..6177ed9ab 100644 --- a/embassy-embedded-hal/src/flash/partition/mod.rs +++ b/embassy-embedded-hal/src/flash/partition/mod.rs @@ -2,11 +2,9 @@ use embedded_storage::nor_flash::{NorFlashError, NorFlashErrorKind}; -#[cfg(feature = "nightly")] mod asynch; mod blocking; -#[cfg(feature = "nightly")] pub use asynch::Partition; pub use blocking::BlockingPartition; diff --git a/embassy-embedded-hal/src/lib.rs b/embassy-embedded-hal/src/lib.rs index ce5fac3f0..b40f892f4 100644 --- a/embassy-embedded-hal/src/lib.rs +++ b/embassy-embedded-hal/src/lib.rs @@ -1,15 +1,13 @@ #![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] -#![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] +#![cfg_attr(nightly, feature(async_fn_in_trait, impl_trait_projections))] +#![cfg_attr(nightly, allow(stable_features, unknown_lints))] +#![allow(async_fn_in_trait)] #![warn(missing_docs)] //! Utilities to use `embedded-hal` traits with Embassy. -#[cfg(feature = "nightly")] pub mod adapter; - pub mod flash; - pub mod shared_bus; /// Set the configuration of a peripheral driver. diff --git a/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs b/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs index 1053d3849..779c04263 100644 --- a/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs +++ b/embassy-embedded-hal/src/shared_bus/asynch/i2c.rs @@ -2,16 +2,15 @@ //! //! # Example (nrf52) //! -//! ```rust -//! use embassy_embedded_hal::shared_bus::i2c::I2cDevice; +//! ```rust,ignore +//! use embassy_embedded_hal::shared_bus::asynch::i2c::I2cDevice; //! use embassy_sync::mutex::Mutex; -//! use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex; +//! use embassy_sync::blocking_mutex::raw::NoopRawMutex; //! -//! static I2C_BUS: StaticCell>> = StaticCell::new(); +//! static I2C_BUS: StaticCell>> = StaticCell::new(); //! let config = twim::Config::default(); -//! let irq = interrupt::take!(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0); -//! let i2c = Twim::new(p.TWISPI0, irq, p.P0_03, p.P0_04, config); -//! let i2c_bus = Mutex::::new(i2c); +//! let i2c = Twim::new(p.TWISPI0, Irqs, p.P0_03, p.P0_04, config); +//! let i2c_bus = Mutex::new(i2c); //! let i2c_bus = I2C_BUS.init(i2c_bus); //! //! // Device 1, using embedded-hal-async compatible driver for QMC5883L compass diff --git a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs index b4f53c623..62b2c92a0 100644 --- a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs +++ b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs @@ -2,17 +2,16 @@ //! //! # Example (nrf52) //! -//! ```rust +//! ```rust,ignore //! use embassy_embedded_hal::shared_bus::spi::SpiDevice; //! use embassy_sync::mutex::Mutex; -//! use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex; +//! use embassy_sync::blocking_mutex::raw::NoopRawMutex; //! -//! static SPI_BUS: StaticCell>> = StaticCell::new(); +//! static SPI_BUS: StaticCell>> = StaticCell::new(); //! let mut config = spim::Config::default(); //! config.frequency = spim::Frequency::M32; -//! let irq = interrupt::take!(SPIM3); -//! let spi = spim::Spim::new_txonly(p.SPI3, irq, p.P0_15, p.P0_18, config); -//! let spi_bus = Mutex::::new(spi); +//! let spi = spim::Spim::new_txonly(p.SPI3, Irqs, p.P0_15, p.P0_18, config); +//! let spi_bus = Mutex::new(spi); //! let spi_bus = SPI_BUS.init(spi_bus); //! //! // Device 1, using embedded-hal-async compatible driver for ST7735 LCD display diff --git a/embassy-embedded-hal/src/shared_bus/mod.rs b/embassy-embedded-hal/src/shared_bus/mod.rs index ab96df134..d835306bc 100644 --- a/embassy-embedded-hal/src/shared_bus/mod.rs +++ b/embassy-embedded-hal/src/shared_bus/mod.rs @@ -3,9 +3,7 @@ use core::fmt::Debug; use embedded_hal_1::{i2c, spi}; -#[cfg(feature = "nightly")] pub mod asynch; - pub mod blocking; /// Error returned by I2C device implementations in this crate. -- cgit