From 9cdec1ffbad2338cdf325733239f96e61b1b5220 Mon Sep 17 00:00:00 2001 From: Paul Nehlich Date: Mon, 23 Mar 2026 14:57:25 +0100 Subject: [PATCH 1/2] firmware/zynq7000-hal/Cargo.toml aktualisiert https://rustsec.org/advisories/RUSTSEC-2024-0436 --- firmware/zynq7000-hal/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/zynq7000-hal/Cargo.toml b/firmware/zynq7000-hal/Cargo.toml index 584e61a..527a614 100644 --- a/firmware/zynq7000-hal/Cargo.toml +++ b/firmware/zynq7000-hal/Cargo.toml @@ -28,7 +28,7 @@ embedded-hal-async = "1" heapless = "0.9" static_cell = "2" delegate = "0.13" -paste = "1" +pastey = "0.2.1" nb = "1" fugit = "0.3" critical-section = "1" -- 2.43.0 From d2372ad41cd0bbadb7708ed6482e53e200b3edfe Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Mar 2026 10:24:19 +0100 Subject: [PATCH 2/2] actually use pastey as well --- firmware/zynq7000-hal/src/gpio/mio.rs | 2 +- firmware/zynq7000-hal/src/uart/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/zynq7000-hal/src/gpio/mio.rs b/firmware/zynq7000-hal/src/gpio/mio.rs index c072f5d..c766470 100644 --- a/firmware/zynq7000-hal/src/gpio/mio.rs +++ b/firmware/zynq7000-hal/src/gpio/mio.rs @@ -84,7 +84,7 @@ pub trait PinId { macro_rules! pin_id { ($Id:ident, $num:literal) => { // Need paste macro to use ident in doc attribute - paste::paste! { + pastey::paste! { #[doc = "Pin ID representing pin " $Id] #[derive(Debug)] pub enum $Id {} diff --git a/firmware/zynq7000-hal/src/uart/mod.rs b/firmware/zynq7000-hal/src/uart/mod.rs index 38e143a..d986696 100644 --- a/firmware/zynq7000-hal/src/uart/mod.rs +++ b/firmware/zynq7000-hal/src/uart/mod.rs @@ -141,7 +141,7 @@ pub struct DivisorZero; macro_rules! pin_pairs { ($index:literal, $UartPeriph:path, ($( [$(#[$meta:meta], )? $TxMio:ident, $RxMio:ident] ),+ $(,)? )) => { $( - paste::paste! { + pastey::paste! { $( #[$meta] )? impl [] for Pin<$TxMio> {} -- 2.43.0