Remove feature(impl_trait_in_bindings), update nightly

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)]
 

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<Output = ()>;
-            type WriteFuture<'a> = impl Future<Output = ()>;
+            type ReadFuture<'a> = impl Future<Output = ()> + 'a;
+            type WriteFuture<'a> = impl Future<Output = ()> + 'a;
 
             fn read<'a>(
                 &'a mut self,

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<Output = ()>;
-            type WriteFuture<'a> = impl Future<Output = ()>;
+            type ReadFuture<'a> = impl Future<Output = ()> + 'a;
+            type WriteFuture<'a> = impl Future<Output = ()> + 'a;
 
             fn read<'a>(
                 &'a mut self,

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)]
 

embassy-stm32/src/rng.rs

@@ -84,7 +84,7 @@ impl<T: Instance> CryptoRng for Random<T> {}
 impl<T: Instance> traits::rng::Rng for Random<T> {
     type Error = Error;
     #[rustfmt::skip]
-    type RngFuture<'a> where Self: 'a = impl Future<Output=Result<(), Self::Error>>;
+    type RngFuture<'a> where Self: 'a = impl Future<Output=Result<(), Self::Error>> + 'a;
 
     fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a> {
         unsafe {

embassy-stm32/src/usart/v1.rs

@@ -153,7 +153,7 @@ impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write<u8>
 impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma>
     where TxDma: crate::usart::TxDma<T>
 {
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>;
+    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + '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<T>
 {
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>;
+    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + '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)

embassy-stm32/src/usart/v2.rs

@@ -157,7 +157,7 @@ impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write<u8>
 impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma>
     where TxDma: crate::usart::TxDma<T>
 {
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>;
+    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + '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<T>
 {
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>;
+    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + '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)

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;

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.

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};

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
                 }
             },

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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};

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]
 

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)]