From 3d842dac85a4ea21519f56d4ec6342b528805b8a Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 20 Mar 2024 14:53:19 +0100
Subject: [PATCH 1/3] fmt: disable "unused" warnings.
---
cyw43/src/fmt.rs | 3 +--
embassy-boot-nrf/src/fmt.rs | 3 +--
embassy-boot-rp/src/fmt.rs | 3 +--
embassy-boot-stm32/src/fmt.rs | 3 +--
embassy-boot/src/fmt.rs | 3 +--
embassy-executor/src/fmt.rs | 3 +--
embassy-futures/src/fmt.rs | 3 +--
embassy-hal-internal/src/fmt.rs | 3 +--
embassy-net-adin1110/src/fmt.rs | 29 +++++++++++++++------------
embassy-net-driver-channel/src/fmt.rs | 3 +--
embassy-net-enc28j60/src/fmt.rs | 3 +--
embassy-net-esp-hosted/src/fmt.rs | 3 +--
embassy-net-ppp/src/fmt.rs | 3 +--
embassy-net/src/fmt.rs | 3 +--
embassy-nrf/src/fmt.rs | 3 +--
embassy-rp/src/fmt.rs | 3 +--
embassy-stm32-wpan/src/fmt.rs | 3 +--
embassy-stm32/src/fmt.rs | 3 +--
embassy-sync/src/fmt.rs | 3 +--
embassy-time/src/fmt.rs | 3 +--
embassy-usb-dfu/src/fmt.rs | 3 +--
embassy-usb/src/fmt.rs | 3 +--
22 files changed, 37 insertions(+), 55 deletions(-)
diff --git a/cyw43/src/fmt.rs b/cyw43/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/cyw43/src/fmt.rs
+++ b/cyw43/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-boot-nrf/src/fmt.rs b/embassy-boot-nrf/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-boot-nrf/src/fmt.rs
+++ b/embassy-boot-nrf/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-boot-rp/src/fmt.rs b/embassy-boot-rp/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-boot-rp/src/fmt.rs
+++ b/embassy-boot-rp/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-boot-stm32/src/fmt.rs b/embassy-boot-stm32/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-boot-stm32/src/fmt.rs
+++ b/embassy-boot-stm32/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-boot/src/fmt.rs b/embassy-boot/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-boot/src/fmt.rs
+++ b/embassy-boot/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-executor/src/fmt.rs b/embassy-executor/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-executor/src/fmt.rs
+++ b/embassy-executor/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-futures/src/fmt.rs b/embassy-futures/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-futures/src/fmt.rs
+++ b/embassy-futures/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-hal-internal/src/fmt.rs b/embassy-hal-internal/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-hal-internal/src/fmt.rs
+++ b/embassy-hal-internal/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-net-adin1110/src/fmt.rs b/embassy-net-adin1110/src/fmt.rs
index 12737c690..2ac42c557 100644
--- a/embassy-net-adin1110/src/fmt.rs
+++ b/embassy-net-adin1110/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -83,14 +83,17 @@ macro_rules! todo {
};
}
+#[cfg(not(feature = "defmt"))]
macro_rules! unreachable {
($($x:tt)*) => {
- {
- #[cfg(not(feature = "defmt"))]
- ::core::unreachable!($($x)*);
- #[cfg(feature = "defmt")]
- ::defmt::unreachable!($($x)*);
- }
+ ::core::unreachable!($($x)*)
+ };
+}
+
+#[cfg(feature = "defmt")]
+macro_rules! unreachable {
+ ($($x:tt)*) => {
+ ::defmt::unreachable!($($x)*)
};
}
@@ -113,7 +116,7 @@ macro_rules! trace {
#[cfg(feature = "defmt")]
::defmt::trace!($s $(, $x)*);
#[cfg(not(any(feature = "log", feature="defmt")))]
- let _ignored = ($( & $x ),*);
+ let _ = ($( & $x ),*);
}
};
}
@@ -126,7 +129,7 @@ macro_rules! debug {
#[cfg(feature = "defmt")]
::defmt::debug!($s $(, $x)*);
#[cfg(not(any(feature = "log", feature="defmt")))]
- let _ignored = ($( & $x ),*);
+ let _ = ($( & $x ),*);
}
};
}
@@ -139,7 +142,7 @@ macro_rules! info {
#[cfg(feature = "defmt")]
::defmt::info!($s $(, $x)*);
#[cfg(not(any(feature = "log", feature="defmt")))]
- let _ignored = ($( & $x ),*);
+ let _ = ($( & $x ),*);
}
};
}
@@ -152,7 +155,7 @@ macro_rules! warn {
#[cfg(feature = "defmt")]
::defmt::warn!($s $(, $x)*);
#[cfg(not(any(feature = "log", feature="defmt")))]
- let _ignored = ($( & $x ),*);
+ let _ = ($( & $x ),*);
}
};
}
@@ -165,7 +168,7 @@ macro_rules! error {
#[cfg(feature = "defmt")]
::defmt::error!($s $(, $x)*);
#[cfg(not(any(feature = "log", feature="defmt")))]
- let _ignored = ($( & $x ),*);
+ let _ = ($( & $x ),*);
}
};
}
@@ -226,7 +229,7 @@ impl<T, E> Try for Result<T, E> {
}
}
-pub struct Bytes<'a>(pub &'a [u8]);
+pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
diff --git a/embassy-net-driver-channel/src/fmt.rs b/embassy-net-driver-channel/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-net-driver-channel/src/fmt.rs
+++ b/embassy-net-driver-channel/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-net-enc28j60/src/fmt.rs b/embassy-net-enc28j60/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-net-enc28j60/src/fmt.rs
+++ b/embassy-net-enc28j60/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-net-esp-hosted/src/fmt.rs b/embassy-net-esp-hosted/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-net-esp-hosted/src/fmt.rs
+++ b/embassy-net-esp-hosted/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-net-ppp/src/fmt.rs b/embassy-net-ppp/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-net-ppp/src/fmt.rs
+++ b/embassy-net-ppp/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-net/src/fmt.rs b/embassy-net/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-net/src/fmt.rs
+++ b/embassy-net/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-nrf/src/fmt.rs b/embassy-nrf/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-nrf/src/fmt.rs
+++ b/embassy-nrf/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-rp/src/fmt.rs b/embassy-rp/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-rp/src/fmt.rs
+++ b/embassy-rp/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-stm32-wpan/src/fmt.rs b/embassy-stm32-wpan/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-stm32-wpan/src/fmt.rs
+++ b/embassy-stm32-wpan/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-stm32/src/fmt.rs b/embassy-stm32/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-stm32/src/fmt.rs
+++ b/embassy-stm32/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-sync/src/fmt.rs b/embassy-sync/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-sync/src/fmt.rs
+++ b/embassy-sync/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-time/src/fmt.rs b/embassy-time/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-time/src/fmt.rs
+++ b/embassy-time/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-usb-dfu/src/fmt.rs b/embassy-usb-dfu/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-usb-dfu/src/fmt.rs
+++ b/embassy-usb-dfu/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
diff --git a/embassy-usb/src/fmt.rs b/embassy-usb/src/fmt.rs
index 78e583c1c..2ac42c557 100644
--- a/embassy-usb/src/fmt.rs
+++ b/embassy-usb/src/fmt.rs
@@ -1,5 +1,5 @@
#![macro_use]
-#![allow(unused_macros)]
+#![allow(unused)]
use core::fmt::{Debug, Display, LowerHex};
@@ -229,7 +229,6 @@ impl<T, E> Try for Result<T, E> {
}
}
-#[allow(unused)]
pub(crate) struct Bytes<'a>(pub &'a [u8]);
impl<'a> Debug for Bytes<'a> {
From eca9aac194580956c851e42565546e5fc50d8070 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 20 Mar 2024 14:54:25 +0100
Subject: [PATCH 2/3] Fix warnings in recent nightly.
---
embassy-executor-macros/src/util/ctxt.rs | 1 -
embassy-executor/src/raw/mod.rs | 2 +-
embassy-net-enc28j60/src/lib.rs | 7 +++----
embassy-net-tuntap/src/lib.rs | 2 +-
embassy-nrf/src/gpio.rs | 2 ++
embassy-nrf/src/gpiote.rs | 2 ++
embassy-nrf/src/timer.rs | 2 --
embassy-rp/src/dma.rs | 2 +-
embassy-rp/src/flash.rs | 2 --
embassy-rp/src/float/mod.rs | 1 +
embassy-rp/src/gpio.rs | 2 --
embassy-rp/src/lib.rs | 3 ++-
embassy-rp/src/relocate.rs | 2 --
embassy-rp/src/uart/buffered.rs | 10 ++--------
embassy-rp/src/usb.rs | 11 ----------
embassy-stm32-wpan/src/consts.rs | 2 --
embassy-stm32/src/can/bx/mod.rs | 2 +-
embassy-stm32/src/can/bxcan.rs | 1 -
embassy-stm32/src/can/fd/message_ram/mod.rs | 20 -------------------
embassy-stm32/src/can/fdcan.rs | 4 ++--
embassy-stm32/src/dma/mod.rs | 1 +
embassy-stm32/src/flash/f0.rs | 1 -
embassy-stm32/src/flash/f1f3.rs | 1 -
embassy-stm32/src/flash/f4.rs | 1 -
embassy-stm32/src/flash/f7.rs | 1 -
embassy-stm32/src/flash/g.rs | 1 -
embassy-stm32/src/flash/h7.rs | 1 -
embassy-stm32/src/flash/u5.rs | 1 -
embassy-stm32/src/i2c/v1.rs | 1 -
embassy-stm32/src/i2c/v2.rs | 1 -
embassy-stm32/src/rtc/datetime.rs | 5 +----
embassy-stm32/src/sdmmc/mod.rs | 2 --
embassy-stm32/src/time_driver.rs | 1 -
embassy-stm32/src/timer/complementary_pwm.rs | 1 -
embassy-stm32/src/timer/simple_pwm.rs | 1 -
embassy-stm32/src/uid.rs | 2 +-
embassy-stm32/src/usart/buffered.rs | 5 +----
embassy-stm32/src/usb/otg.rs | 4 ++--
embassy-stm32/src/usb/usb.rs | 11 ----------
examples/rp/src/bin/multicore.rs | 12 +++++++----
examples/std/src/bin/net.rs | 2 --
examples/std/src/bin/net_dns.rs | 2 --
examples/std/src/bin/tcp_accept.rs | 1 -
examples/stm32f2/src/bin/pll.rs | 2 --
examples/stm32h7/src/bin/camera.rs | 4 ++--
.../src/bin/spe_adin1110_http_server.rs | 2 +-
tests/rp/src/bin/gpio_multicore.rs | 12 +++++++----
tests/rp/src/bin/i2c.rs | 12 +++++++----
tests/rp/src/bin/multicore.rs | 12 +++++++----
49 files changed, 59 insertions(+), 124 deletions(-)
diff --git a/embassy-executor-macros/src/util/ctxt.rs b/embassy-executor-macros/src/util/ctxt.rs
index 74c872c3c..9c78cda01 100644
--- a/embassy-executor-macros/src/util/ctxt.rs
+++ b/embassy-executor-macros/src/util/ctxt.rs
@@ -7,7 +7,6 @@ use std::thread;
use proc_macro2::TokenStream;
use quote::{quote, ToTokens};
-use syn;
/// A type to collect errors together and format them.
///
diff --git a/embassy-executor/src/raw/mod.rs b/embassy-executor/src/raw/mod.rs
index 3d5e3ab9f..d9ea5c005 100644
--- a/embassy-executor/src/raw/mod.rs
+++ b/embassy-executor/src/raw/mod.rs
@@ -30,7 +30,7 @@ use core::ptr::NonNull;
use core::task::{Context, Poll};
#[cfg(feature = "integrated-timers")]
-use embassy_time_driver::{self, AlarmHandle};
+use embassy_time_driver::AlarmHandle;
#[cfg(feature = "rtos-trace")]
use rtos_trace::trace;
diff --git a/embassy-net-enc28j60/src/lib.rs b/embassy-net-enc28j60/src/lib.rs
index f18134927..dda35f498 100644
--- a/embassy-net-enc28j60/src/lib.rs
+++ b/embassy-net-enc28j60/src/lib.rs
@@ -17,7 +17,6 @@ mod phy;
mod traits;
use core::cmp;
-use core::convert::TryInto;
use embassy_net_driver::{Capabilities, HardwareAddress, LinkState};
use embassy_time::Duration;
@@ -645,8 +644,8 @@ where
Self: 'a;
fn receive(&mut self, cx: &mut core::task::Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> {
- let rx_buf = unsafe { &mut RX_BUF };
- let tx_buf = unsafe { &mut TX_BUF };
+ let rx_buf = unsafe { &mut *core::ptr::addr_of_mut!(RX_BUF) };
+ let tx_buf = unsafe { &mut *core::ptr::addr_of_mut!(TX_BUF) };
if let Some(n) = self.receive(rx_buf) {
Some((RxToken { buf: &mut rx_buf[..n] }, TxToken { buf: tx_buf, eth: self }))
} else {
@@ -656,7 +655,7 @@ where
}
fn transmit(&mut self, _cx: &mut core::task::Context) -> Option<Self::TxToken<'_>> {
- let tx_buf = unsafe { &mut TX_BUF };
+ let tx_buf = unsafe { &mut *core::ptr::addr_of_mut!(TX_BUF) };
Some(TxToken { buf: tx_buf, eth: self })
}
diff --git a/embassy-net-tuntap/src/lib.rs b/embassy-net-tuntap/src/lib.rs
index de30934eb..56f55fba1 100644
--- a/embassy-net-tuntap/src/lib.rs
+++ b/embassy-net-tuntap/src/lib.rs
@@ -6,7 +6,7 @@ use std::os::unix::io::{AsRawFd, RawFd};
use std::task::Context;
use async_io::Async;
-use embassy_net_driver::{self, Capabilities, Driver, HardwareAddress, LinkState};
+use embassy_net_driver::{Capabilities, Driver, HardwareAddress, LinkState};
use log::*;
/// Get the MTU of the given interface.
diff --git a/embassy-nrf/src/gpio.rs b/embassy-nrf/src/gpio.rs
index 3649ea61a..f2353f21d 100644
--- a/embassy-nrf/src/gpio.rs
+++ b/embassy-nrf/src/gpio.rs
@@ -473,10 +473,12 @@ impl sealed::Pin for AnyPin {
// ====================
+#[cfg(not(feature = "_nrf51"))]
pub(crate) trait PselBits {
fn psel_bits(&self) -> u32;
}
+#[cfg(not(feature = "_nrf51"))]
impl<'a, P: Pin> PselBits for Option<PeripheralRef<'a, P>> {
#[inline]
fn psel_bits(&self) -> u32 {
diff --git a/embassy-nrf/src/gpiote.rs b/embassy-nrf/src/gpiote.rs
index 12f4ed0a0..4a28279a9 100644
--- a/embassy-nrf/src/gpiote.rs
+++ b/embassy-nrf/src/gpiote.rs
@@ -167,8 +167,10 @@ unsafe fn handle_gpiote_interrupt() {
}
}
+#[cfg(not(feature = "_nrf51"))]
struct BitIter(u32);
+#[cfg(not(feature = "_nrf51"))]
impl Iterator for BitIter {
type Item = u32;
diff --git a/embassy-nrf/src/timer.rs b/embassy-nrf/src/timer.rs
index 3c35baee5..2970ad3f2 100644
--- a/embassy-nrf/src/timer.rs
+++ b/embassy-nrf/src/timer.rs
@@ -21,8 +21,6 @@ pub(crate) mod sealed {
fn regs() -> &'static pac::timer0::RegisterBlock;
}
pub trait ExtendedInstance {}
-
- pub trait TimerType {}
}
/// Basic Timer instance.
diff --git a/embassy-rp/src/dma.rs b/embassy-rp/src/dma.rs
index 088a842a1..44aabce6b 100644
--- a/embassy-rp/src/dma.rs
+++ b/embassy-rp/src/dma.rs
@@ -96,7 +96,7 @@ pub unsafe fn write_repeated<'a, C: Channel, W: Word>(
) -> Transfer<'a, C> {
copy_inner(
ch,
- &mut DUMMY as *const u32,
+ core::ptr::addr_of_mut!(DUMMY) as *const u32,
to as *mut u32,
len,
W::size(),
diff --git a/embassy-rp/src/flash.rs b/embassy-rp/src/flash.rs
index 2d673cf6c..68b1ecab3 100644
--- a/embassy-rp/src/flash.rs
+++ b/embassy-rp/src/flash.rs
@@ -420,8 +420,6 @@ impl<'d, T: Instance, const FLASH_SIZE: usize> embedded_storage_async::nor_flash
#[allow(dead_code)]
mod ram_helpers {
- use core::marker::PhantomData;
-
use super::*;
use crate::rom_data;
diff --git a/embassy-rp/src/float/mod.rs b/embassy-rp/src/float/mod.rs
index 945afff90..3ad6f1c50 100644
--- a/embassy-rp/src/float/mod.rs
+++ b/embassy-rp/src/float/mod.rs
@@ -89,6 +89,7 @@ pub(crate) trait Float:
}
/// Returns true if `self` is infinity
+ #[allow(unused)]
fn is_infinity(self) -> bool {
(self.repr() & (Self::EXPONENT_MASK | Self::SIGNIFICAND_MASK)) == Self::EXPONENT_MASK
}
diff --git a/embassy-rp/src/gpio.rs b/embassy-rp/src/gpio.rs
index 62eeb4cf6..ddba8f8fb 100644
--- a/embassy-rp/src/gpio.rs
+++ b/embassy-rp/src/gpio.rs
@@ -976,8 +976,6 @@ impl_pin!(PIN_QSPI_SD3, Bank::Qspi, 5);
// ====================
mod eh02 {
- use core::convert::Infallible;
-
use super::*;
impl<'d> embedded_hal_02::digital::v2::InputPin for Input<'d> {
diff --git a/embassy-rp/src/lib.rs b/embassy-rp/src/lib.rs
index 7092b3fab..d91cea410 100644
--- a/embassy-rp/src/lib.rs
+++ b/embassy-rp/src/lib.rs
@@ -274,7 +274,7 @@ pub fn install_core0_stack_guard() -> Result<(), ()> {
extern "C" {
static mut _stack_end: usize;
}
- unsafe { install_stack_guard(&mut _stack_end as *mut usize) }
+ unsafe { install_stack_guard(core::ptr::addr_of_mut!(_stack_end)) }
}
#[inline(always)]
@@ -354,6 +354,7 @@ pub fn init(config: config::Config) -> Peripherals {
/// Extension trait for PAC regs, adding atomic xor/bitset/bitclear writes.
trait RegExt<T: Copy> {
+ #[allow(unused)]
fn write_xor<R>(&self, f: impl FnOnce(&mut T) -> R) -> R;
fn write_set<R>(&self, f: impl FnOnce(&mut T) -> R) -> R;
fn write_clear<R>(&self, f: impl FnOnce(&mut T) -> R) -> R;
diff --git a/embassy-rp/src/relocate.rs b/embassy-rp/src/relocate.rs
index b35b4ed72..6139d892f 100644
--- a/embassy-rp/src/relocate.rs
+++ b/embassy-rp/src/relocate.rs
@@ -1,5 +1,3 @@
-use core::iter::Iterator;
-
use pio::{Program, SideSet, Wrap};
pub struct CodeIterator<'a, I>
diff --git a/embassy-rp/src/uart/buffered.rs b/embassy-rp/src/uart/buffered.rs
index 99c958129..8178cd801 100644
--- a/embassy-rp/src/uart/buffered.rs
+++ b/embassy-rp/src/uart/buffered.rs
@@ -1,17 +1,11 @@
//! Buffered UART driver.
-use core::future::{poll_fn, Future};
+use core::future::Future;
use core::slice;
-use core::task::Poll;
-use atomic_polyfill::{AtomicU8, Ordering};
+use atomic_polyfill::AtomicU8;
use embassy_hal_internal::atomic_ring_buffer::RingBuffer;
-use embassy_sync::waitqueue::AtomicWaker;
-use embassy_time::Timer;
use super::*;
-use crate::clocks::clk_peri_freq;
-use crate::interrupt::typelevel::{Binding, Interrupt};
-use crate::{interrupt, RegExt};
pub struct State {
tx_waker: AtomicWaker,
diff --git a/embassy-rp/src/usb.rs b/embassy-rp/src/usb.rs
index 905661d64..d68dee4a3 100644
--- a/embassy-rp/src/usb.rs
+++ b/embassy-rp/src/usb.rs
@@ -465,7 +465,6 @@ impl<'d, T: Instance> driver::Bus for Bus<'d, T> {
trait Dir {
fn dir() -> Direction;
- fn waker(i: usize) -> &'static AtomicWaker;
}
/// Type for In direction.
@@ -474,11 +473,6 @@ impl Dir for In {
fn dir() -> Direction {
Direction::In
}
-
- #[inline]
- fn waker(i: usize) -> &'static AtomicWaker {
- &EP_IN_WAKERS[i]
- }
}
/// Type for Out direction.
@@ -487,11 +481,6 @@ impl Dir for Out {
fn dir() -> Direction {
Direction::Out
}
-
- #[inline]
- fn waker(i: usize) -> &'static AtomicWaker {
- &EP_OUT_WAKERS[i]
- }
}
/// Endpoint for RP USB driver.
diff --git a/embassy-stm32-wpan/src/consts.rs b/embassy-stm32-wpan/src/consts.rs
index bd70851ea..6aaef1d35 100644
--- a/embassy-stm32-wpan/src/consts.rs
+++ b/embassy-stm32-wpan/src/consts.rs
@@ -1,5 +1,3 @@
-use core::convert::TryFrom;
-
use crate::evt::CsEvt;
use crate::PacketHeader;
diff --git a/embassy-stm32/src/can/bx/mod.rs b/embassy-stm32/src/can/bx/mod.rs
index 33e702c6e..a369ae6fd 100644
--- a/embassy-stm32/src/can/bx/mod.rs
+++ b/embassy-stm32/src/can/bx/mod.rs
@@ -28,7 +28,7 @@ pub mod filter;
#[allow(clippy::all)] // generated code
use core::cmp::{Ord, Ordering};
-use core::convert::{Infallible, Into, TryInto};
+use core::convert::Infallible;
use core::marker::PhantomData;
use core::mem;
diff --git a/embassy-stm32/src/can/bxcan.rs b/embassy-stm32/src/can/bxcan.rs
index bb7cc3d7f..1a625bdc4 100644
--- a/embassy-stm32/src/can/bxcan.rs
+++ b/embassy-stm32/src/can/bxcan.rs
@@ -1,4 +1,3 @@
-use core::convert::AsMut;
use core::future::poll_fn;
use core::marker::PhantomData;
use core::ops::{Deref, DerefMut};
diff --git a/embassy-stm32/src/can/fd/message_ram/mod.rs b/embassy-stm32/src/can/fd/message_ram/mod.rs
index 830edf3bb..040a999b4 100644
--- a/embassy-stm32/src/can/fd/message_ram/mod.rs
+++ b/embassy-stm32/src/can/fd/message_ram/mod.rs
@@ -140,26 +140,6 @@ pub(crate) struct _TxBufferElement;
impl generic::Readable for TxBufferElementHeader {}
impl generic::Writable for TxBufferElementHeader {}
-/// FdCan Message RAM instance.
-///
-/// # Safety
-///
-/// It is only safe to implement this trait, when:
-///
-/// * The implementing type has ownership of the Message RAM, preventing any
-/// other accesses to the register block.
-/// * `MSG_RAM` is a pointer to the Message RAM block and can be safely accessed
-/// for as long as ownership or a borrow of the implementing type is present.
-pub unsafe trait Instance {
- const MSG_RAM: *mut RegisterBlock;
- fn msg_ram(&self) -> &RegisterBlock {
- unsafe { &*Self::MSG_RAM }
- }
- fn msg_ram_mut(&mut self) -> &mut RegisterBlock {
- unsafe { &mut *Self::MSG_RAM }
- }
-}
-
// Ensure the RegisterBlock is the same size as on pg 1957 of RM0440.
static_assertions::assert_eq_size!(Filters, [u32; 28 + 16]);
static_assertions::assert_eq_size!(Receive, [u32; 54]);
diff --git a/embassy-stm32/src/can/fdcan.rs b/embassy-stm32/src/can/fdcan.rs
index fe8969a5a..4c40f10e3 100644
--- a/embassy-stm32/src/can/fdcan.rs
+++ b/embassy-stm32/src/can/fdcan.rs
@@ -883,9 +883,9 @@ macro_rules! impl_fdcan {
fn ram() -> &'static crate::pac::fdcanram::Fdcanram {
&crate::pac::$msg_ram_inst
}
- unsafe fn mut_state() -> & 'static mut sealed::State {
+ unsafe fn mut_state() -> &'static mut sealed::State {
static mut STATE: sealed::State = sealed::State::new();
- & mut STATE
+ &mut *core::ptr::addr_of_mut!(STATE)
}
fn state() -> &'static sealed::State {
unsafe { peripherals::$inst::mut_state() }
diff --git a/embassy-stm32/src/dma/mod.rs b/embassy-stm32/src/dma/mod.rs
index d5e88a20a..2f98b9857 100644
--- a/embassy-stm32/src/dma/mod.rs
+++ b/embassy-stm32/src/dma/mod.rs
@@ -44,6 +44,7 @@ pub(crate) mod sealed {
fn id(&self) -> u8;
}
pub trait ChannelInterrupt {
+ #[cfg_attr(not(feature = "rt"), allow(unused))]
unsafe fn on_irq();
}
}
diff --git a/embassy-stm32/src/flash/f0.rs b/embassy-stm32/src/flash/f0.rs
index e0c76e6b2..e2f135208 100644
--- a/embassy-stm32/src/flash/f0.rs
+++ b/embassy-stm32/src/flash/f0.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
use core::ptr::write_volatile;
use core::sync::atomic::{fence, Ordering};
diff --git a/embassy-stm32/src/flash/f1f3.rs b/embassy-stm32/src/flash/f1f3.rs
index e7790369a..b16354a74 100644
--- a/embassy-stm32/src/flash/f1f3.rs
+++ b/embassy-stm32/src/flash/f1f3.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
use core::ptr::write_volatile;
use core::sync::atomic::{fence, Ordering};
diff --git a/embassy-stm32/src/flash/f4.rs b/embassy-stm32/src/flash/f4.rs
index 57447bea5..00e61f2d2 100644
--- a/embassy-stm32/src/flash/f4.rs
+++ b/embassy-stm32/src/flash/f4.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
use core::ptr::write_volatile;
use core::sync::atomic::{fence, AtomicBool, Ordering};
diff --git a/embassy-stm32/src/flash/f7.rs b/embassy-stm32/src/flash/f7.rs
index 0f512bbc4..72de0b445 100644
--- a/embassy-stm32/src/flash/f7.rs
+++ b/embassy-stm32/src/flash/f7.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
use core::ptr::write_volatile;
use core::sync::atomic::{fence, Ordering};
diff --git a/embassy-stm32/src/flash/g.rs b/embassy-stm32/src/flash/g.rs
index b69c4343b..6a5adc941 100644
--- a/embassy-stm32/src/flash/g.rs
+++ b/embassy-stm32/src/flash/g.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
use core::ptr::write_volatile;
use core::sync::atomic::{fence, Ordering};
diff --git a/embassy-stm32/src/flash/h7.rs b/embassy-stm32/src/flash/h7.rs
index 743925e17..e32a82eef 100644
--- a/embassy-stm32/src/flash/h7.rs
+++ b/embassy-stm32/src/flash/h7.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
use core::ptr::write_volatile;
use core::sync::atomic::{fence, Ordering};
diff --git a/embassy-stm32/src/flash/u5.rs b/embassy-stm32/src/flash/u5.rs
index 3787082f9..580c490da 100644
--- a/embassy-stm32/src/flash/u5.rs
+++ b/embassy-stm32/src/flash/u5.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
use core::ptr::write_volatile;
use core::sync::atomic::{fence, Ordering};
diff --git a/embassy-stm32/src/i2c/v1.rs b/embassy-stm32/src/i2c/v1.rs
index f1ed7ca40..9f29ed5e0 100644
--- a/embassy-stm32/src/i2c/v1.rs
+++ b/embassy-stm32/src/i2c/v1.rs
@@ -15,7 +15,6 @@ use embedded_hal_1::i2c::Operation;
use super::*;
use crate::dma::Transfer;
use crate::pac::i2c;
-use crate::time::Hertz;
// /!\ /!\
// /!\ Implementation note! /!\
diff --git a/embassy-stm32/src/i2c/v2.rs b/embassy-stm32/src/i2c/v2.rs
index 1ac2740df..8baf2849d 100644
--- a/embassy-stm32/src/i2c/v2.rs
+++ b/embassy-stm32/src/i2c/v2.rs
@@ -9,7 +9,6 @@ use embedded_hal_1::i2c::Operation;
use super::*;
use crate::dma::Transfer;
use crate::pac::i2c;
-use crate::time::Hertz;
pub(crate) unsafe fn on_interrupt<T: Instance>() {
let regs = T::regs();
diff --git a/embassy-stm32/src/rtc/datetime.rs b/embassy-stm32/src/rtc/datetime.rs
index ef92fa4bb..2bad79923 100644
--- a/embassy-stm32/src/rtc/datetime.rs
+++ b/embassy-stm32/src/rtc/datetime.rs
@@ -1,8 +1,5 @@
#[cfg(feature = "chrono")]
-use core::convert::From;
-
-#[cfg(feature = "chrono")]
-use chrono::{self, Datelike, NaiveDate, Timelike, Weekday};
+use chrono::{Datelike, NaiveDate, Timelike, Weekday};
#[cfg(any(feature = "defmt", feature = "time"))]
use crate::peripherals::RTC;
diff --git a/embassy-stm32/src/sdmmc/mod.rs b/embassy-stm32/src/sdmmc/mod.rs
index fa1f710d8..c0b3a2183 100644
--- a/embassy-stm32/src/sdmmc/mod.rs
+++ b/embassy-stm32/src/sdmmc/mod.rs
@@ -1427,8 +1427,6 @@ pub(crate) mod sealed {
fn regs() -> RegBlock;
fn state() -> &'static AtomicWaker;
}
-
- pub trait Pins<T: Instance> {}
}
/// SDMMC instance trait.
diff --git a/embassy-stm32/src/time_driver.rs b/embassy-stm32/src/time_driver.rs
index 37b2e7526..9be56d3d1 100644
--- a/embassy-stm32/src/time_driver.rs
+++ b/embassy-stm32/src/time_driver.rs
@@ -1,7 +1,6 @@
#![allow(non_snake_case)]
use core::cell::Cell;
-use core::convert::TryInto;
use core::sync::atomic::{compiler_fence, AtomicU32, AtomicU8, Ordering};
use core::{mem, ptr};
diff --git a/embassy-stm32/src/timer/complementary_pwm.rs b/embassy-stm32/src/timer/complementary_pwm.rs
index 72f1ec864..723e8506b 100644
--- a/embassy-stm32/src/timer/complementary_pwm.rs
+++ b/embassy-stm32/src/timer/complementary_pwm.rs
@@ -10,7 +10,6 @@ use super::*;
#[allow(unused_imports)]
use crate::gpio::sealed::{AFType, Pin};
use crate::gpio::{AnyPin, OutputType};
-use crate::time::Hertz;
use crate::Peripheral;
/// Complementary PWM pin wrapper.
diff --git a/embassy-stm32/src/timer/simple_pwm.rs b/embassy-stm32/src/timer/simple_pwm.rs
index 6df2f66ec..4669fc6cc 100644
--- a/embassy-stm32/src/timer/simple_pwm.rs
+++ b/embassy-stm32/src/timer/simple_pwm.rs
@@ -8,7 +8,6 @@ use super::*;
#[allow(unused_imports)]
use crate::gpio::sealed::{AFType, Pin};
use crate::gpio::{AnyPin, OutputType};
-use crate::time::Hertz;
use crate::Peripheral;
/// Channel 1 marker type.
diff --git a/embassy-stm32/src/uid.rs b/embassy-stm32/src/uid.rs
index aa13586f8..5e38532bd 100644
--- a/embassy-stm32/src/uid.rs
+++ b/embassy-stm32/src/uid.rs
@@ -27,5 +27,5 @@ pub fn uid_hex_bytes() -> &'static [u8; 24] {
LOADED = true;
}
});
- unsafe { &UID_HEX }
+ unsafe { &*core::ptr::addr_of!(UID_HEX) }
}
diff --git a/embassy-stm32/src/usart/buffered.rs b/embassy-stm32/src/usart/buffered.rs
index c11e3382f..683b0f8b2 100644
--- a/embassy-stm32/src/usart/buffered.rs
+++ b/embassy-stm32/src/usart/buffered.rs
@@ -1,13 +1,10 @@
-use core::future::poll_fn;
use core::slice;
-use core::sync::atomic::{AtomicBool, Ordering};
-use core::task::Poll;
+use core::sync::atomic::AtomicBool;
use embassy_hal_internal::atomic_ring_buffer::RingBuffer;
use embassy_sync::waitqueue::AtomicWaker;
use super::*;
-use crate::interrupt::typelevel::Interrupt;
/// Interrupt handler.
pub struct InterruptHandler<T: BasicInstance> {
diff --git a/embassy-stm32/src/usb/otg.rs b/embassy-stm32/src/usb/otg.rs
index 80a08f3c5..d4095b466 100644
--- a/embassy-stm32/src/usb/otg.rs
+++ b/embassy-stm32/src/usb/otg.rs
@@ -6,8 +6,8 @@ use core::task::Poll;
use embassy_hal_internal::{into_ref, Peripheral};
use embassy_sync::waitqueue::AtomicWaker;
use embassy_usb_driver::{
- self, Bus as _, Direction, EndpointAddress, EndpointAllocError, EndpointError, EndpointIn, EndpointInfo,
- EndpointOut, EndpointType, Event, Unsupported,
+ Bus as _, Direction, EndpointAddress, EndpointAllocError, EndpointError, EndpointIn, EndpointInfo, EndpointOut,
+ EndpointType, Event, Unsupported,
};
use futures::future::poll_fn;
diff --git a/embassy-stm32/src/usb/usb.rs b/embassy-stm32/src/usb/usb.rs
index 1fb2c9ebb..c4f9140da 100644
--- a/embassy-stm32/src/usb/usb.rs
+++ b/embassy-stm32/src/usb/usb.rs
@@ -637,7 +637,6 @@ impl<'d, T: Instance> driver::Bus for Bus<'d, T> {
trait Dir {
fn dir() -> Direction;
- fn waker(i: usize) -> &'static AtomicWaker;
}
/// Marker type for the "IN" direction.
@@ -646,11 +645,6 @@ impl Dir for In {
fn dir() -> Direction {
Direction::In
}
-
- #[inline]
- fn waker(i: usize) -> &'static AtomicWaker {
- &EP_IN_WAKERS[i]
- }
}
/// Marker type for the "OUT" direction.
@@ -659,11 +653,6 @@ impl Dir for Out {
fn dir() -> Direction {
Direction::Out
}
-
- #[inline]
- fn waker(i: usize) -> &'static AtomicWaker {
- &EP_OUT_WAKERS[i]
- }
}
/// USB endpoint.
diff --git a/examples/rp/src/bin/multicore.rs b/examples/rp/src/bin/multicore.rs
index c7b087476..7cb546c91 100644
--- a/examples/rp/src/bin/multicore.rs
+++ b/examples/rp/src/bin/multicore.rs
@@ -30,10 +30,14 @@ fn main() -> ! {
let p = embassy_rp::init(Default::default());
let led = Output::new(p.PIN_25, Level::Low);
- spawn_core1(p.CORE1, unsafe { &mut CORE1_STACK }, move || {
- let executor1 = EXECUTOR1.init(Executor::new());
- executor1.run(|spawner| unwrap!(spawner.spawn(core1_task(led))));
- });
+ spawn_core1(
+ p.CORE1,
+ unsafe { &mut *core::ptr::addr_of_mut!(CORE1_STACK) },
+ move || {
+ let executor1 = EXECUTOR1.init(Executor::new());
+ executor1.run(|spawner| unwrap!(spawner.spawn(core1_task(led))));
+ },
+ );
let executor0 = EXECUTOR0.init(Executor::new());
executor0.run(|spawner| unwrap!(spawner.spawn(core0_task())));
diff --git a/examples/std/src/bin/net.rs b/examples/std/src/bin/net.rs
index dad93d0a1..59813d8cb 100644
--- a/examples/std/src/bin/net.rs
+++ b/examples/std/src/bin/net.rs
@@ -1,5 +1,3 @@
-use std::default::Default;
-
use clap::Parser;
use embassy_executor::{Executor, Spawner};
use embassy_net::tcp::TcpSocket;
diff --git a/examples/std/src/bin/net_dns.rs b/examples/std/src/bin/net_dns.rs
index fca1e076e..3b6a3de37 100644
--- a/examples/std/src/bin/net_dns.rs
+++ b/examples/std/src/bin/net_dns.rs
@@ -1,5 +1,3 @@
-use std::default::Default;
-
use clap::Parser;
use embassy_executor::{Executor, Spawner};
use embassy_net::dns::DnsQueryType;
diff --git a/examples/std/src/bin/tcp_accept.rs b/examples/std/src/bin/tcp_accept.rs
index 00ccd83a7..e8b6eaa6c 100644
--- a/examples/std/src/bin/tcp_accept.rs
+++ b/examples/std/src/bin/tcp_accept.rs
@@ -1,5 +1,4 @@
use core::fmt::Write as _;
-use std::default::Default;
use clap::Parser;
use embassy_executor::{Executor, Spawner};
diff --git a/examples/stm32f2/src/bin/pll.rs b/examples/stm32f2/src/bin/pll.rs
index e32f283d1..e39e2daec 100644
--- a/examples/stm32f2/src/bin/pll.rs
+++ b/examples/stm32f2/src/bin/pll.rs
@@ -1,8 +1,6 @@
#![no_std]
#![no_main]
-use core::convert::TryFrom;
-
use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::time::Hertz;
diff --git a/examples/stm32h7/src/bin/camera.rs b/examples/stm32h7/src/bin/camera.rs
index e5a104baf..170a5aa28 100644
--- a/examples/stm32h7/src/bin/camera.rs
+++ b/examples/stm32h7/src/bin/camera.rs
@@ -78,9 +78,9 @@ async fn main(_spawner: Spawner) {
);
defmt::info!("attempting capture");
- defmt::unwrap!(dcmi.capture(unsafe { &mut FRAME }).await);
+ defmt::unwrap!(dcmi.capture(unsafe { &mut *core::ptr::addr_of_mut!(FRAME) }).await);
- defmt::info!("captured frame: {:x}", unsafe { &FRAME });
+ defmt::info!("captured frame: {:x}", unsafe { &*core::ptr::addr_of!(FRAME) });
defmt::info!("main loop running");
loop {
diff --git a/examples/stm32l4/src/bin/spe_adin1110_http_server.rs b/examples/stm32l4/src/bin/spe_adin1110_http_server.rs
index 32bfab6eb..343e09e68 100644
--- a/examples/stm32l4/src/bin/spe_adin1110_http_server.rs
+++ b/examples/stm32l4/src/bin/spe_adin1110_http_server.rs
@@ -42,7 +42,7 @@ bind_interrupts!(struct Irqs {
RNG => rng::InterruptHandler<peripherals::RNG>;
});
-use embassy_net_adin1110::{self, Device, Runner, ADIN1110};
+use embassy_net_adin1110::{Device, Runner, ADIN1110};
use embedded_hal_bus::spi::ExclusiveDevice;
use hal::gpio::Pull;
use hal::i2c::Config as I2C_Config;
diff --git a/tests/rp/src/bin/gpio_multicore.rs b/tests/rp/src/bin/gpio_multicore.rs
index 8aed9b80c..e9c6f3122 100644
--- a/tests/rp/src/bin/gpio_multicore.rs
+++ b/tests/rp/src/bin/gpio_multicore.rs
@@ -21,10 +21,14 @@ static CHANNEL1: Channel<CriticalSectionRawMutex, (), 1> = Channel::new();
#[cortex_m_rt::entry]
fn main() -> ! {
let p = embassy_rp::init(Default::default());
- spawn_core1(p.CORE1, unsafe { &mut CORE1_STACK }, move || {
- let executor1 = EXECUTOR1.init(Executor::new());
- executor1.run(|spawner| unwrap!(spawner.spawn(core1_task(p.PIN_1))));
- });
+ spawn_core1(
+ p.CORE1,
+ unsafe { &mut *core::ptr::addr_of_mut!(CORE1_STACK) },
+ move || {
+ let executor1 = EXECUTOR1.init(Executor::new());
+ executor1.run(|spawner| unwrap!(spawner.spawn(core1_task(p.PIN_1))));
+ },
+ );
let executor0 = EXECUTOR0.init(Executor::new());
executor0.run(|spawner| unwrap!(spawner.spawn(core0_task(p.PIN_0))));
}
diff --git a/tests/rp/src/bin/i2c.rs b/tests/rp/src/bin/i2c.rs
index 153b37999..9615007bd 100644
--- a/tests/rp/src/bin/i2c.rs
+++ b/tests/rp/src/bin/i2c.rs
@@ -210,10 +210,14 @@ async fn controller_task(con: &mut i2c::I2c<'static, I2C0, i2c::Async>) {
config.addr = DEV_ADDR as u16;
let device = i2c_slave::I2cSlave::new(p.I2C1, d_sda, d_scl, Irqs, config);
- spawn_core1(p.CORE1, unsafe { &mut CORE1_STACK }, move || {
- let executor1 = EXECUTOR1.init(Executor::new());
- executor1.run(|spawner| unwrap!(spawner.spawn(device_task(device))));
- });
+ spawn_core1(
+ p.CORE1,
+ unsafe { &mut *core::ptr::addr_of_mut!(CORE1_STACK) },
+ move || {
+ let executor1 = EXECUTOR1.init(Executor::new());
+ executor1.run(|spawner| unwrap!(spawner.spawn(device_task(device))));
+ },
+ );
let c_sda = p.PIN_21;
let c_scl = p.PIN_20;
diff --git a/tests/rp/src/bin/multicore.rs b/tests/rp/src/bin/multicore.rs
index 60d9f85ec..783ea0f27 100644
--- a/tests/rp/src/bin/multicore.rs
+++ b/tests/rp/src/bin/multicore.rs
@@ -19,10 +19,14 @@ static CHANNEL1: Channel<CriticalSectionRawMutex, bool, 1> = Channel::new();
#[cortex_m_rt::entry]
fn main() -> ! {
let p = embassy_rp::init(Default::default());
- spawn_core1(p.CORE1, unsafe { &mut CORE1_STACK }, move || {
- let executor1 = EXECUTOR1.init(Executor::new());
- executor1.run(|spawner| unwrap!(spawner.spawn(core1_task())));
- });
+ spawn_core1(
+ p.CORE1,
+ unsafe { &mut *core::ptr::addr_of_mut!(CORE1_STACK) },
+ move || {
+ let executor1 = EXECUTOR1.init(Executor::new());
+ executor1.run(|spawner| unwrap!(spawner.spawn(core1_task())));
+ },
+ );
let executor0 = EXECUTOR0.init(Executor::new());
executor0.run(|spawner| unwrap!(spawner.spawn(core0_task())));
}
From e5b9b5b3e95a82dbbc15c0688781bfb6fee572ac Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 20 Mar 2024 16:37:42 +0100
Subject: [PATCH 3/3] Update Nightly in CI.
---
rust-toolchain-nightly.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rust-toolchain-nightly.toml b/rust-toolchain-nightly.toml
index b8a7db353..98696fd2b 100644
--- a/rust-toolchain-nightly.toml
+++ b/rust-toolchain-nightly.toml
@@ -1,5 +1,5 @@
[toolchain]
-channel = "nightly-2023-12-20"
+channel = "nightly-2024-03-20"
components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ]
targets = [
"thumbv7em-none-eabi",