Merge pull request #1469 from embassy-rs/update-nightly

Update Rust nightly.
This commit is contained in:
Dario Nieuwenhuis 2023-05-19 19:01:31 +02:00 committed by GitHub
commit d737e3dcbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 15 additions and 25 deletions

View File

@ -1,5 +1,4 @@
#![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))]
#![allow(incomplete_features)]
#![no_std] #![no_std]
#![warn(missing_docs)] #![warn(missing_docs)]
#![doc = include_str!("../README.md")] #![doc = include_str!("../README.md")]

View File

@ -1,6 +1,5 @@
#![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections, try_blocks))] #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections, try_blocks))]
#![cfg_attr(feature = "nightly", allow(incomplete_features))]
#![warn(missing_docs)] #![warn(missing_docs)]
//! Utilities to use `embedded-hal` traits with Embassy. //! Utilities to use `embedded-hal` traits with Embassy.

View File

@ -1,6 +1,5 @@
#![no_std] #![no_std]
#![feature(async_fn_in_trait, impl_trait_projections)] #![feature(async_fn_in_trait, impl_trait_projections)]
#![allow(incomplete_features)]
//! embassy-lora holds LoRa-specific functionality. //! embassy-lora holds LoRa-specific functionality.
pub(crate) mod fmt; pub(crate) mod fmt;

View File

@ -1,6 +1,5 @@
#![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))]
#![cfg_attr(feature = "nightly", allow(incomplete_features))]
#![warn(missing_docs)] #![warn(missing_docs)]
#![doc = include_str!("../README.md")] #![doc = include_str!("../README.md")]

View File

@ -1,6 +1,5 @@
#![no_std] #![no_std]
#![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))]
#![cfg_attr(feature = "nightly", allow(incomplete_features))]
#![doc = include_str!("../README.md")] #![doc = include_str!("../README.md")]
#![warn(missing_docs)] #![warn(missing_docs)]

View File

@ -791,20 +791,18 @@ impl<'d, T: Instance, U: TimerInstance> UarteRxWithIdle<'d, T, U> {
} }
} }
#[cfg(not(any(feature = "_nrf9160", feature = "nrf5340")))] #[cfg(not(any(feature = "_nrf9160", feature = "_nrf5340")))]
pub(crate) fn apply_workaround_for_enable_anomaly(_r: &crate::pac::uarte0::RegisterBlock) { pub(crate) fn apply_workaround_for_enable_anomaly(_r: &crate::pac::uarte0::RegisterBlock) {
// Do nothing // Do nothing
} }
#[cfg(any(feature = "_nrf9160", feature = "nrf5340"))] #[cfg(any(feature = "_nrf9160", feature = "_nrf5340"))]
pub(crate) fn apply_workaround_for_enable_anomaly(r: &crate::pac::uarte0::RegisterBlock) { pub(crate) fn apply_workaround_for_enable_anomaly(r: &crate::pac::uarte0::RegisterBlock) {
use core::ops::Deref;
// Apply workaround for anomalies: // Apply workaround for anomalies:
// - nRF9160 - anomaly 23 // - nRF9160 - anomaly 23
// - nRF5340 - anomaly 44 // - nRF5340 - anomaly 44
let rxenable_reg: *const u32 = ((r.deref() as *const _ as usize) + 0x564) as *const u32; let rxenable_reg: *const u32 = ((r as *const _ as usize) + 0x564) as *const u32;
let txenable_reg: *const u32 = ((r.deref() as *const _ as usize) + 0x568) as *const u32; let txenable_reg: *const u32 = ((r as *const _ as usize) + 0x568) as *const u32;
// NB Safety: This is taken from Nordic's driver - // NB Safety: This is taken from Nordic's driver -
// https://github.com/NordicSemiconductor/nrfx/blob/master/drivers/src/nrfx_uarte.c#L197 // https://github.com/NordicSemiconductor/nrfx/blob/master/drivers/src/nrfx_uarte.c#L197

View File

@ -1,6 +1,5 @@
#![no_std] #![no_std]
#![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))]
#![cfg_attr(feature = "nightly", allow(incomplete_features))]
// This mod MUST go first, so that the others see its macros. // This mod MUST go first, so that the others see its macros.
pub(crate) mod fmt; pub(crate) mod fmt;

View File

@ -1,6 +1,5 @@
#![no_std] #![no_std]
#![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))]
#![cfg_attr(feature = "nightly", allow(incomplete_features))]
// This must go FIRST so that all the other modules see its macros. // This must go FIRST so that all the other modules see its macros.
pub mod fmt; pub mod fmt;

View File

@ -188,7 +188,9 @@ fn clk_div(ker_ck: Hertz, sdmmc_ck: u32) -> Result<(bool, u16, Hertz), Error> {
#[cfg(sdmmc_v1)] #[cfg(sdmmc_v1)]
type Transfer<'a, C> = crate::dma::Transfer<'a, C>; type Transfer<'a, C> = crate::dma::Transfer<'a, C>;
#[cfg(sdmmc_v2)] #[cfg(sdmmc_v2)]
type Transfer<'a, C> = core::marker::PhantomData<&'a mut C>; struct Transfer<'a, C> {
_dummy: core::marker::PhantomData<&'a mut C>,
}
#[cfg(all(sdmmc_v1, dma))] #[cfg(all(sdmmc_v1, dma))]
const DMA_TRANSFER_OPTIONS: crate::dma::TransferOptions = crate::dma::TransferOptions { const DMA_TRANSFER_OPTIONS: crate::dma::TransferOptions = crate::dma::TransferOptions {
@ -539,7 +541,9 @@ impl<'d, T: Instance, Dma: SdmmcDma<T> + 'd> Sdmmc<'d, T, Dma> {
let transfer = { let transfer = {
regs.idmabase0r().write(|w| w.set_idmabase0(buffer.as_mut_ptr() as u32)); regs.idmabase0r().write(|w| w.set_idmabase0(buffer.as_mut_ptr() as u32));
regs.idmactrlr().modify(|w| w.set_idmaen(true)); regs.idmactrlr().modify(|w| w.set_idmaen(true));
core::marker::PhantomData Transfer {
_dummy: core::marker::PhantomData,
}
}; };
regs.dctrl().modify(|w| { regs.dctrl().modify(|w| {
@ -593,7 +597,9 @@ impl<'d, T: Instance, Dma: SdmmcDma<T> + 'd> Sdmmc<'d, T, Dma> {
let transfer = { let transfer = {
regs.idmabase0r().write(|w| w.set_idmabase0(buffer.as_ptr() as u32)); regs.idmabase0r().write(|w| w.set_idmabase0(buffer.as_ptr() as u32));
regs.idmactrlr().modify(|w| w.set_idmaen(true)); regs.idmactrlr().modify(|w| w.set_idmaen(true));
core::marker::PhantomData Transfer {
_dummy: core::marker::PhantomData,
}
}; };
regs.dctrl().modify(|w| { regs.dctrl().modify(|w| {

View File

@ -1,6 +1,5 @@
#![cfg_attr(not(any(feature = "std", feature = "wasm")), no_std)] #![cfg_attr(not(any(feature = "std", feature = "wasm")), no_std)]
#![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))]
#![cfg_attr(feature = "nightly", allow(incomplete_features))]
#![allow(clippy::new_without_default)] #![allow(clippy::new_without_default)]
#![doc = include_str!("../README.md")] #![doc = include_str!("../README.md")]
#![warn(missing_docs)] #![warn(missing_docs)]

View File

@ -1,6 +1,5 @@
#![cfg_attr(not(any(feature = "std", feature = "wasm", test)), no_std)] #![cfg_attr(not(any(feature = "std", feature = "wasm", test)), no_std)]
#![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))]
#![cfg_attr(feature = "nightly", allow(incomplete_features))]
#![doc = include_str!("../README.md")] #![doc = include_str!("../README.md")]
#![allow(clippy::new_without_default)] #![allow(clippy::new_without_default)]
#![warn(missing_docs)] #![warn(missing_docs)]

View File

@ -64,7 +64,7 @@ impl InnerQueue {
self.queue self.queue
.iter_mut() .iter_mut()
.find(|timer| timer.waker.will_wake(waker)) .find(|timer| timer.waker.will_wake(waker))
.map(|mut timer| { .map(|timer| {
timer.at = min(timer.at, at); timer.at = min(timer.at, at);
}) })
.unwrap_or_else(|| { .unwrap_or_else(|| {

View File

@ -1,6 +1,5 @@
#![no_std] #![no_std]
#![feature(async_fn_in_trait)] #![feature(async_fn_in_trait)]
#![allow(incomplete_features)]
#![doc = include_str!("../README.md")] #![doc = include_str!("../README.md")]
#![warn(missing_docs)] #![warn(missing_docs)]

View File

@ -4,7 +4,6 @@
#![no_main] #![no_main]
#![macro_use] #![macro_use]
#![feature(type_alias_impl_trait, async_fn_in_trait)] #![feature(type_alias_impl_trait, async_fn_in_trait)]
#![allow(incomplete_features)]
use defmt::info; use defmt::info;
use embassy_executor::Spawner; use embassy_executor::Spawner;

View File

@ -4,7 +4,6 @@
#![no_main] #![no_main]
#![macro_use] #![macro_use]
#![feature(type_alias_impl_trait, async_fn_in_trait)] #![feature(type_alias_impl_trait, async_fn_in_trait)]
#![allow(incomplete_features)]
use defmt::info; use defmt::info;
use embassy_executor::Spawner; use embassy_executor::Spawner;

View File

@ -4,7 +4,6 @@
#![no_main] #![no_main]
#![macro_use] #![macro_use]
#![feature(type_alias_impl_trait, async_fn_in_trait)] #![feature(type_alias_impl_trait, async_fn_in_trait)]
#![allow(incomplete_features)]
use defmt::info; use defmt::info;
use embassy_executor::Spawner; use embassy_executor::Spawner;

View File

@ -1,5 +1,4 @@
#![feature(type_alias_impl_trait)] #![feature(type_alias_impl_trait)]
#![allow(incomplete_features)]
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_time::{Duration, Timer}; use embassy_time::{Duration, Timer};

View File

@ -1,7 +1,7 @@
# Before upgrading check that everything is available on all tier1 targets here: # Before upgrading check that everything is available on all tier1 targets here:
# https://rust-lang.github.io/rustup-components-history # https://rust-lang.github.io/rustup-components-history
[toolchain] [toolchain]
channel = "nightly-2023-04-18" channel = "nightly-2023-05-18"
components = [ "rust-src", "rustfmt", "llvm-tools-preview" ] components = [ "rust-src", "rustfmt", "llvm-tools-preview" ]
targets = [ targets = [
"thumbv7em-none-eabi", "thumbv7em-none-eabi",