From 916fa6f7607ef8f678b8b8fcf5ae5c7fdafc4917 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 5 Nov 2023 14:47:25 -0600 Subject: [PATCH] use new enum debug macro --- stm32-metapac-gen/src/data.rs | 5 +++-- stm32-metapac-gen/src/lib.rs | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/stm32-metapac-gen/src/data.rs b/stm32-metapac-gen/src/data.rs index 26d6983..c7363f1 100644 --- a/stm32-metapac-gen/src/data.rs +++ b/stm32-metapac-gen/src/data.rs @@ -1,4 +1,5 @@ use serde::Deserialize; +use stm32_data_macros::EnumDebug; pub mod ir { use super::*; @@ -176,7 +177,7 @@ pub mod ir { pub block: String, } - #[derive(Debug, Eq, PartialEq, Clone, Deserialize)] + #[derive(EnumDebug, Eq, PartialEq, Clone, Deserialize)] pub enum Access { ReadWrite, Read, @@ -263,7 +264,7 @@ pub struct FlashSettings { pub erase_value: u8, } -#[derive(Debug, Eq, PartialEq, Clone, Deserialize)] +#[derive(EnumDebug, Eq, PartialEq, Clone, Deserialize)] pub enum MemoryRegionKind { #[serde(rename = "flash")] Flash, diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs index 9fffb98..325993e 100644 --- a/stm32-metapac-gen/src/lib.rs +++ b/stm32-metapac-gen/src/lib.rs @@ -394,15 +394,10 @@ fn stringify(metadata: T) -> String { metadata .replace(": [", ": &[") - .replace("kind: Ram", "kind: MemoryRegionKind::Ram") - .replace("kind: Flash", "kind: MemoryRegionKind::Flash") .replace("Register(", "BlockItemInner::Register(") .replace("Block(", "BlockItemInner::Block(") .replace("Regular(", "Array::Regular(") .replace("Cursed(", "Array::Cursed(") - .replace("Read,", "Access::Read,") - .replace("Write,", "Access::Write,") - .replace("ReadAccess::Write,", "Access::ReadWrite,") } fn gen_opts() -> generate::Options {