From 250f1cd0a5a73db1cdd0f0858e54883fec5011a2 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 4 Aug 2021 19:38:05 +0200 Subject: [PATCH 1/3] util: fix unused return warning --- embassy/src/util/mpsc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embassy/src/util/mpsc.rs b/embassy/src/util/mpsc.rs index 4a934eb2fc..bad1058a3b 100644 --- a/embassy/src/util/mpsc.rs +++ b/embassy/src/util/mpsc.rs @@ -325,7 +325,7 @@ where Ok(..) => Poll::Ready(Ok(())), Err(TrySendError::Closed(m)) => Poll::Ready(Err(SendError(m))), Err(TrySendError::Full(m)) => { - self.message.insert(m); + self.message = Some(m); Poll::Pending } }, From 9bd34429f3366dd7ac52f85064af5899bd3296f3 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 4 Aug 2021 19:39:54 +0200 Subject: [PATCH 2/3] stm32: add missing `+ 'a` bounds on trait GATs --- embassy-stm32/src/dma/bdma.rs | 4 ++-- embassy-stm32/src/dma/dma.rs | 4 ++-- embassy-stm32/src/rng.rs | 2 +- embassy-stm32/src/usart/v1.rs | 4 ++-- embassy-stm32/src/usart/v2.rs | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/embassy-stm32/src/dma/bdma.rs b/embassy-stm32/src/dma/bdma.rs index 2aa00ebee5..d262caeb65 100644 --- a/embassy-stm32/src/dma/bdma.rs +++ b/embassy-stm32/src/dma/bdma.rs @@ -159,8 +159,8 @@ pac::dma_channels! { impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {} impl Channel for crate::peripherals::$channel_peri { - type ReadFuture<'a> = impl Future; - type WriteFuture<'a> = impl Future; + type ReadFuture<'a> = impl Future + 'a; + type WriteFuture<'a> = impl Future + 'a; fn read<'a>( &'a mut self, diff --git a/embassy-stm32/src/dma/dma.rs b/embassy-stm32/src/dma/dma.rs index 47120c39d3..9bf083de46 100644 --- a/embassy-stm32/src/dma/dma.rs +++ b/embassy-stm32/src/dma/dma.rs @@ -165,8 +165,8 @@ pac::dma_channels! { impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {} impl Channel for crate::peripherals::$channel_peri { - type ReadFuture<'a> = impl Future; - type WriteFuture<'a> = impl Future; + type ReadFuture<'a> = impl Future + 'a; + type WriteFuture<'a> = impl Future + 'a; fn read<'a>( &'a mut self, diff --git a/embassy-stm32/src/rng.rs b/embassy-stm32/src/rng.rs index d93a25f5ad..a56fba19b4 100644 --- a/embassy-stm32/src/rng.rs +++ b/embassy-stm32/src/rng.rs @@ -84,7 +84,7 @@ impl CryptoRng for Random {} impl traits::rng::Rng for Random { type Error = Error; #[rustfmt::skip] - type RngFuture<'a> where Self: 'a = impl Future>; + type RngFuture<'a> where Self: 'a = impl Future> + 'a; fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a> { unsafe { diff --git a/embassy-stm32/src/usart/v1.rs b/embassy-stm32/src/usart/v1.rs index 9e9b493068..ec66776991 100644 --- a/embassy-stm32/src/usart/v1.rs +++ b/embassy-stm32/src/usart/v1.rs @@ -153,7 +153,7 @@ impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma> where TxDma: crate::usart::TxDma { - type WriteFuture<'a> where Self: 'a = impl Future>; + type WriteFuture<'a> where Self: 'a = impl Future> + 'a; fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> { self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) @@ -165,7 +165,7 @@ impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma> where RxDma: crate::usart::RxDma { - type ReadFuture<'a> where Self: 'a = impl Future>; + type ReadFuture<'a> where Self: 'a = impl Future> + 'a; fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> { self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) diff --git a/embassy-stm32/src/usart/v2.rs b/embassy-stm32/src/usart/v2.rs index 694b161858..50996dbbfe 100644 --- a/embassy-stm32/src/usart/v2.rs +++ b/embassy-stm32/src/usart/v2.rs @@ -157,7 +157,7 @@ impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma> where TxDma: crate::usart::TxDma { - type WriteFuture<'a> where Self: 'a = impl Future>; + type WriteFuture<'a> where Self: 'a = impl Future> + 'a; fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> { self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) @@ -169,7 +169,7 @@ impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma> where RxDma: crate::usart::RxDma { - type ReadFuture<'a> where Self: 'a = impl Future>; + type ReadFuture<'a> where Self: 'a = impl Future> + 'a; fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> { self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) From 07d4b196f718038b34091f4520b440fcf41e9ece Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 4 Aug 2021 19:48:14 +0200 Subject: [PATCH 3/3] Update nightly, remove removed features. --- embassy-nrf/src/lib.rs | 2 -- embassy-stm32/src/lib.rs | 2 -- embassy-traits/src/lib.rs | 2 -- embassy/src/lib.rs | 2 -- embassy/src/time/timer.rs | 6 ------ examples/nrf/src/bin/blinky.rs | 2 -- examples/nrf/src/bin/buffered_uart.rs | 2 -- examples/nrf/src/bin/executor_fairness_test.rs | 2 -- examples/nrf/src/bin/gpiote_channel.rs | 2 -- examples/nrf/src/bin/gpiote_port.rs | 2 -- examples/nrf/src/bin/mpsc.rs | 2 -- examples/nrf/src/bin/multiprio.rs | 2 -- examples/nrf/src/bin/ppi.rs | 2 -- examples/nrf/src/bin/pwm.rs | 2 -- examples/nrf/src/bin/qspi.rs | 2 -- examples/nrf/src/bin/qspi_lowpower.rs | 2 -- examples/nrf/src/bin/rng.rs | 2 -- examples/nrf/src/bin/spim.rs | 2 -- examples/nrf/src/bin/timer.rs | 2 -- examples/nrf/src/bin/twim.rs | 2 -- examples/nrf/src/bin/twim_lowpower.rs | 2 -- examples/nrf/src/bin/uart.rs | 2 -- examples/nrf/src/bin/uart_idle.rs | 2 -- examples/rp/src/bin/blinky.rs | 2 -- examples/rp/src/bin/button.rs | 2 -- examples/rp/src/bin/spi.rs | 2 -- examples/rp/src/bin/spi_display.rs | 2 -- examples/rp/src/bin/uart.rs | 2 -- examples/std/src/bin/net.rs | 2 -- examples/std/src/bin/serial.rs | 2 -- examples/std/src/bin/tick.rs | 2 -- examples/stm32f0/src/bin/hello.rs | 2 -- examples/stm32f4/src/bin/blinky.rs | 2 -- examples/stm32f4/src/bin/button.rs | 2 -- examples/stm32f4/src/bin/button_exti.rs | 2 -- examples/stm32f4/src/bin/hello.rs | 2 -- examples/stm32f4/src/bin/spi.rs | 2 -- examples/stm32f4/src/bin/spi_dma.rs | 2 -- examples/stm32f4/src/bin/usart.rs | 2 -- examples/stm32f4/src/bin/usart_dma.rs | 2 -- examples/stm32h7/src/bin/blinky.rs | 2 -- examples/stm32h7/src/bin/dac.rs | 2 -- examples/stm32h7/src/bin/eth.rs | 2 -- examples/stm32h7/src/bin/spi.rs | 2 -- examples/stm32h7/src/bin/spi_dma.rs | 2 -- examples/stm32h7/src/bin/usart.rs | 2 -- examples/stm32h7/src/bin/usart_dma.rs | 2 -- examples/stm32l0/src/bin/blinky.rs | 2 -- examples/stm32l0/src/bin/button.rs | 2 -- examples/stm32l0/src/bin/button_exti.rs | 2 -- examples/stm32l0/src/bin/spi.rs | 2 -- examples/stm32l0/src/bin/usart_dma.rs | 2 -- examples/stm32l4/src/bin/adc.rs | 2 -- examples/stm32l4/src/bin/blinky.rs | 2 -- examples/stm32l4/src/bin/button.rs | 2 -- examples/stm32l4/src/bin/button_exti.rs | 2 -- examples/stm32l4/src/bin/dac.rs | 2 -- examples/stm32l4/src/bin/spi.rs | 2 -- examples/stm32l4/src/bin/spi_dma.rs | 2 -- examples/stm32l4/src/bin/usart.rs | 2 -- examples/stm32l4/src/bin/usart_dma.rs | 2 -- examples/stm32wb55/src/bin/blinky.rs | 2 -- rust-toolchain.toml | 2 +- 63 files changed, 1 insertion(+), 129 deletions(-) diff --git a/embassy-nrf/src/lib.rs b/embassy-nrf/src/lib.rs index 1275a64f32..9054ba8911 100644 --- a/embassy-nrf/src/lib.rs +++ b/embassy-nrf/src/lib.rs @@ -1,8 +1,6 @@ #![no_std] #![feature(generic_associated_types)] #![feature(asm)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs index 0567aa72a2..7df5f9246e 100644 --- a/embassy-stm32/src/lib.rs +++ b/embassy-stm32/src/lib.rs @@ -1,8 +1,6 @@ #![no_std] #![feature(generic_associated_types)] #![feature(asm)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/embassy-traits/src/lib.rs b/embassy-traits/src/lib.rs index 3d84cf0786..819673a36b 100644 --- a/embassy-traits/src/lib.rs +++ b/embassy-traits/src/lib.rs @@ -3,8 +3,6 @@ #![feature(const_fn_fn_ptr_basics)] #![feature(const_option)] #![allow(incomplete_features)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] pub mod delay; diff --git a/embassy/src/lib.rs b/embassy/src/lib.rs index 41102a180f..32e65c65c7 100644 --- a/embassy/src/lib.rs +++ b/embassy/src/lib.rs @@ -4,8 +4,6 @@ #![feature(const_fn_fn_ptr_basics)] #![feature(const_option)] #![allow(incomplete_features)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] // This mod MUST go first, so that the others see its macros. diff --git a/embassy/src/time/timer.rs b/embassy/src/time/timer.rs index a2a37f7069..22f1ffe309 100644 --- a/embassy/src/time/timer.rs +++ b/embassy/src/time/timer.rs @@ -37,8 +37,6 @@ impl Timer { /// Example: /// ``` no_run /// # #![feature(trait_alias)] - /// # #![feature(min_type_alias_impl_trait)] - /// # #![feature(impl_trait_in_bindings)] /// # #![feature(type_alias_impl_trait)] /// # /// # fn foo() {} @@ -80,8 +78,6 @@ impl Future for Timer { /// For instance, consider the following code fragment. /// ``` no_run /// # #![feature(trait_alias)] -/// # #![feature(min_type_alias_impl_trait)] -/// # #![feature(impl_trait_in_bindings)] /// # #![feature(type_alias_impl_trait)] /// # /// use embassy::time::{Duration, Timer}; @@ -103,8 +99,6 @@ impl Future for Timer { /// /// ``` no_run /// # #![feature(trait_alias)] -/// # #![feature(min_type_alias_impl_trait)] -/// # #![feature(impl_trait_in_bindings)] /// # #![feature(type_alias_impl_trait)] /// # /// use embassy::time::{Duration, Ticker}; diff --git a/examples/nrf/src/bin/blinky.rs b/examples/nrf/src/bin/blinky.rs index 8f12cfda95..77b08b09bb 100644 --- a/examples/nrf/src/bin/blinky.rs +++ b/examples/nrf/src/bin/blinky.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/buffered_uart.rs b/examples/nrf/src/bin/buffered_uart.rs index a78d2df443..3201ec9a03 100644 --- a/examples/nrf/src/bin/buffered_uart.rs +++ b/examples/nrf/src/bin/buffered_uart.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/executor_fairness_test.rs b/examples/nrf/src/bin/executor_fairness_test.rs index 797be43351..d874013f6b 100644 --- a/examples/nrf/src/bin/executor_fairness_test.rs +++ b/examples/nrf/src/bin/executor_fairness_test.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/gpiote_channel.rs b/examples/nrf/src/bin/gpiote_channel.rs index 9800aed980..a132f846e8 100644 --- a/examples/nrf/src/bin/gpiote_channel.rs +++ b/examples/nrf/src/bin/gpiote_channel.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/gpiote_port.rs b/examples/nrf/src/bin/gpiote_port.rs index 4a7951cd37..a782d89356 100644 --- a/examples/nrf/src/bin/gpiote_port.rs +++ b/examples/nrf/src/bin/gpiote_port.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/mpsc.rs b/examples/nrf/src/bin/mpsc.rs index cdc7d0822e..c4c0572bdb 100644 --- a/examples/nrf/src/bin/mpsc.rs +++ b/examples/nrf/src/bin/mpsc.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/multiprio.rs b/examples/nrf/src/bin/multiprio.rs index 79fa029b38..7ce79168bf 100644 --- a/examples/nrf/src/bin/multiprio.rs +++ b/examples/nrf/src/bin/multiprio.rs @@ -55,8 +55,6 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/ppi.rs b/examples/nrf/src/bin/ppi.rs index 717604b9e3..0bac875bdd 100644 --- a/examples/nrf/src/bin/ppi.rs +++ b/examples/nrf/src/bin/ppi.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/pwm.rs b/examples/nrf/src/bin/pwm.rs index d2874a29b7..d2bc81ceaa 100644 --- a/examples/nrf/src/bin/pwm.rs +++ b/examples/nrf/src/bin/pwm.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/qspi.rs b/examples/nrf/src/bin/qspi.rs index 6e49887a4b..43bfb83ca0 100644 --- a/examples/nrf/src/bin/qspi.rs +++ b/examples/nrf/src/bin/qspi.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/qspi_lowpower.rs b/examples/nrf/src/bin/qspi_lowpower.rs index ece3243b67..502710db99 100644 --- a/examples/nrf/src/bin/qspi_lowpower.rs +++ b/examples/nrf/src/bin/qspi_lowpower.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/rng.rs b/examples/nrf/src/bin/rng.rs index 6aa43d0dbd..e199823122 100644 --- a/examples/nrf/src/bin/rng.rs +++ b/examples/nrf/src/bin/rng.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/spim.rs b/examples/nrf/src/bin/spim.rs index c42cc6015f..444e50bcfb 100644 --- a/examples/nrf/src/bin/spim.rs +++ b/examples/nrf/src/bin/spim.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/timer.rs b/examples/nrf/src/bin/timer.rs index 43f6d76ce5..630ea87a57 100644 --- a/examples/nrf/src/bin/timer.rs +++ b/examples/nrf/src/bin/timer.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/twim.rs b/examples/nrf/src/bin/twim.rs index 537cea1607..ad5653cfc2 100644 --- a/examples/nrf/src/bin/twim.rs +++ b/examples/nrf/src/bin/twim.rs @@ -4,8 +4,6 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/twim_lowpower.rs b/examples/nrf/src/bin/twim_lowpower.rs index 1cd66a18eb..f8cba24969 100644 --- a/examples/nrf/src/bin/twim_lowpower.rs +++ b/examples/nrf/src/bin/twim_lowpower.rs @@ -6,8 +6,6 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/uart.rs b/examples/nrf/src/bin/uart.rs index e65e2fe518..76f940b49a 100644 --- a/examples/nrf/src/bin/uart.rs +++ b/examples/nrf/src/bin/uart.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/nrf/src/bin/uart_idle.rs b/examples/nrf/src/bin/uart_idle.rs index dc2c73433b..4fb5129cbf 100644 --- a/examples/nrf/src/bin/uart_idle.rs +++ b/examples/nrf/src/bin/uart_idle.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/rp/src/bin/blinky.rs b/examples/rp/src/bin/blinky.rs index 9c47674583..e79ca21f26 100644 --- a/examples/rp/src/bin/blinky.rs +++ b/examples/rp/src/bin/blinky.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(asm)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/rp/src/bin/button.rs b/examples/rp/src/bin/button.rs index b0c3347f42..c9e99ec231 100644 --- a/examples/rp/src/bin/button.rs +++ b/examples/rp/src/bin/button.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(asm)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/rp/src/bin/spi.rs b/examples/rp/src/bin/spi.rs index 26faa2ba52..0b922625c1 100644 --- a/examples/rp/src/bin/spi.rs +++ b/examples/rp/src/bin/spi.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(asm)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/rp/src/bin/spi_display.rs b/examples/rp/src/bin/spi_display.rs index 467cdf4264..8e8342d802 100644 --- a/examples/rp/src/bin/spi_display.rs +++ b/examples/rp/src/bin/spi_display.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(asm)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/rp/src/bin/uart.rs b/examples/rp/src/bin/uart.rs index 8b5f2a53b8..93848c7feb 100644 --- a/examples/rp/src/bin/uart.rs +++ b/examples/rp/src/bin/uart.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(asm)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/std/src/bin/net.rs b/examples/std/src/bin/net.rs index 73c8e14945..323d711a81 100644 --- a/examples/std/src/bin/net.rs +++ b/examples/std/src/bin/net.rs @@ -1,6 +1,4 @@ #![feature(type_alias_impl_trait)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![allow(incomplete_features)] use clap::{AppSettings, Clap}; diff --git a/examples/std/src/bin/serial.rs b/examples/std/src/bin/serial.rs index 1b22dc0de0..ca596a34cf 100644 --- a/examples/std/src/bin/serial.rs +++ b/examples/std/src/bin/serial.rs @@ -1,5 +1,3 @@ -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/std/src/bin/tick.rs b/examples/std/src/bin/tick.rs index 6f30edb349..16f54b2c68 100644 --- a/examples/std/src/bin/tick.rs +++ b/examples/std/src/bin/tick.rs @@ -1,5 +1,3 @@ -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f0/src/bin/hello.rs b/examples/stm32f0/src/bin/hello.rs index 6ebb5cd4d4..8429cc6035 100644 --- a/examples/stm32f0/src/bin/hello.rs +++ b/examples/stm32f0/src/bin/hello.rs @@ -1,7 +1,5 @@ #![no_std] #![no_main] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f4/src/bin/blinky.rs b/examples/stm32f4/src/bin/blinky.rs index 9f86515ea2..9c695a809e 100644 --- a/examples/stm32f4/src/bin/blinky.rs +++ b/examples/stm32f4/src/bin/blinky.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f4/src/bin/button.rs b/examples/stm32f4/src/bin/button.rs index c61e85f090..82c83e80ef 100644 --- a/examples/stm32f4/src/bin/button.rs +++ b/examples/stm32f4/src/bin/button.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f4/src/bin/button_exti.rs b/examples/stm32f4/src/bin/button_exti.rs index d685b66083..caebdac1f8 100644 --- a/examples/stm32f4/src/bin/button_exti.rs +++ b/examples/stm32f4/src/bin/button_exti.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f4/src/bin/hello.rs b/examples/stm32f4/src/bin/hello.rs index 8ee6c1ef8b..a16748f4e3 100644 --- a/examples/stm32f4/src/bin/hello.rs +++ b/examples/stm32f4/src/bin/hello.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs index 6e2b703f2f..bb130a2e20 100644 --- a/examples/stm32f4/src/bin/spi.rs +++ b/examples/stm32f4/src/bin/spi.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f4/src/bin/spi_dma.rs b/examples/stm32f4/src/bin/spi_dma.rs index ccabbed9ef..9f7101122b 100644 --- a/examples/stm32f4/src/bin/spi_dma.rs +++ b/examples/stm32f4/src/bin/spi_dma.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f4/src/bin/usart.rs b/examples/stm32f4/src/bin/usart.rs index a068df5203..da32619497 100644 --- a/examples/stm32f4/src/bin/usart.rs +++ b/examples/stm32f4/src/bin/usart.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32f4/src/bin/usart_dma.rs b/examples/stm32f4/src/bin/usart_dma.rs index 3b86f78cd4..5023075ff6 100644 --- a/examples/stm32f4/src/bin/usart_dma.rs +++ b/examples/stm32f4/src/bin/usart_dma.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32h7/src/bin/blinky.rs b/examples/stm32h7/src/bin/blinky.rs index 3db2650918..3291f5e811 100644 --- a/examples/stm32h7/src/bin/blinky.rs +++ b/examples/stm32h7/src/bin/blinky.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32h7/src/bin/dac.rs b/examples/stm32h7/src/bin/dac.rs index 658449f11e..fcbb0c2363 100644 --- a/examples/stm32h7/src/bin/dac.rs +++ b/examples/stm32h7/src/bin/dac.rs @@ -2,8 +2,6 @@ #![no_main] #![allow(incomplete_features)] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #[path = "../example_common.rs"] diff --git a/examples/stm32h7/src/bin/eth.rs b/examples/stm32h7/src/bin/eth.rs index e49a101bf3..0c544a879a 100644 --- a/examples/stm32h7/src/bin/eth.rs +++ b/examples/stm32h7/src/bin/eth.rs @@ -2,8 +2,6 @@ #![no_main] #![allow(incomplete_features)] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] use core::sync::atomic::{AtomicUsize, Ordering}; diff --git a/examples/stm32h7/src/bin/spi.rs b/examples/stm32h7/src/bin/spi.rs index 3ae2ae7d79..026960a140 100644 --- a/examples/stm32h7/src/bin/spi.rs +++ b/examples/stm32h7/src/bin/spi.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32h7/src/bin/spi_dma.rs b/examples/stm32h7/src/bin/spi_dma.rs index 17cc98f955..7750ad1923 100644 --- a/examples/stm32h7/src/bin/spi_dma.rs +++ b/examples/stm32h7/src/bin/spi_dma.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32h7/src/bin/usart.rs b/examples/stm32h7/src/bin/usart.rs index 3e3e5b1697..5fa21b6a2b 100644 --- a/examples/stm32h7/src/bin/usart.rs +++ b/examples/stm32h7/src/bin/usart.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32h7/src/bin/usart_dma.rs b/examples/stm32h7/src/bin/usart_dma.rs index 553cf506fe..26cc3c5da4 100644 --- a/examples/stm32h7/src/bin/usart_dma.rs +++ b/examples/stm32h7/src/bin/usart_dma.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l0/src/bin/blinky.rs b/examples/stm32l0/src/bin/blinky.rs index 7ccebae55c..27060edcad 100644 --- a/examples/stm32l0/src/bin/blinky.rs +++ b/examples/stm32l0/src/bin/blinky.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l0/src/bin/button.rs b/examples/stm32l0/src/bin/button.rs index 5f46ec794d..6b75de5092 100644 --- a/examples/stm32l0/src/bin/button.rs +++ b/examples/stm32l0/src/bin/button.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l0/src/bin/button_exti.rs b/examples/stm32l0/src/bin/button_exti.rs index 6ea0d9cc98..9f0b0bde60 100644 --- a/examples/stm32l0/src/bin/button_exti.rs +++ b/examples/stm32l0/src/bin/button_exti.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l0/src/bin/spi.rs b/examples/stm32l0/src/bin/spi.rs index 6a43a96548..43ffb55393 100644 --- a/examples/stm32l0/src/bin/spi.rs +++ b/examples/stm32l0/src/bin/spi.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l0/src/bin/usart_dma.rs b/examples/stm32l0/src/bin/usart_dma.rs index 0a5859b756..2c0690d0e1 100644 --- a/examples/stm32l0/src/bin/usart_dma.rs +++ b/examples/stm32l0/src/bin/usart_dma.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l4/src/bin/adc.rs b/examples/stm32l4/src/bin/adc.rs index 457def6c2c..c778d9c3f5 100644 --- a/examples/stm32l4/src/bin/adc.rs +++ b/examples/stm32l4/src/bin/adc.rs @@ -2,8 +2,6 @@ #![no_main] #![allow(incomplete_features)] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #[path = "../example_common.rs"] diff --git a/examples/stm32l4/src/bin/blinky.rs b/examples/stm32l4/src/bin/blinky.rs index c980338318..c929335dc5 100644 --- a/examples/stm32l4/src/bin/blinky.rs +++ b/examples/stm32l4/src/bin/blinky.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l4/src/bin/button.rs b/examples/stm32l4/src/bin/button.rs index 5bebfae7f7..e2756b7117 100644 --- a/examples/stm32l4/src/bin/button.rs +++ b/examples/stm32l4/src/bin/button.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l4/src/bin/button_exti.rs b/examples/stm32l4/src/bin/button_exti.rs index 42efa0d6ce..a702b5ba1b 100644 --- a/examples/stm32l4/src/bin/button_exti.rs +++ b/examples/stm32l4/src/bin/button_exti.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l4/src/bin/dac.rs b/examples/stm32l4/src/bin/dac.rs index 8e2431ec7e..c479f86c74 100644 --- a/examples/stm32l4/src/bin/dac.rs +++ b/examples/stm32l4/src/bin/dac.rs @@ -2,8 +2,6 @@ #![no_main] #![allow(incomplete_features)] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #[path = "../example_common.rs"] diff --git a/examples/stm32l4/src/bin/spi.rs b/examples/stm32l4/src/bin/spi.rs index e082b74e5d..ef6e2fcad4 100644 --- a/examples/stm32l4/src/bin/spi.rs +++ b/examples/stm32l4/src/bin/spi.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l4/src/bin/spi_dma.rs b/examples/stm32l4/src/bin/spi_dma.rs index e32ff17f90..aa0762589a 100644 --- a/examples/stm32l4/src/bin/spi_dma.rs +++ b/examples/stm32l4/src/bin/spi_dma.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l4/src/bin/usart.rs b/examples/stm32l4/src/bin/usart.rs index ebe06dc261..ccb82b8d40 100644 --- a/examples/stm32l4/src/bin/usart.rs +++ b/examples/stm32l4/src/bin/usart.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32l4/src/bin/usart_dma.rs b/examples/stm32l4/src/bin/usart_dma.rs index a90732ae03..b15bba76e2 100644 --- a/examples/stm32l4/src/bin/usart_dma.rs +++ b/examples/stm32l4/src/bin/usart_dma.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/examples/stm32wb55/src/bin/blinky.rs b/examples/stm32wb55/src/bin/blinky.rs index ae11c9861c..2eba361ae3 100644 --- a/examples/stm32wb55/src/bin/blinky.rs +++ b/examples/stm32wb55/src/bin/blinky.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] #![feature(trait_alias)] -#![feature(min_type_alias_impl_trait)] -#![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] #![allow(incomplete_features)] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5eae998f5b..c33666618f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ # Before upgrading check that everything is available on all tier1 targets here: # https://rust-lang.github.io/rustup-components-history [toolchain] -channel = "nightly-2021-07-13" +channel = "nightly-2021-08-03" components = [ "rust-src", "rustfmt" ] targets = [ "thumbv7em-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf" ]