From 8efebb9f022c421142237f2cdca65b8764aa49b8 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Fri, 10 May 2024 12:50:33 +0300 Subject: [PATCH] generic register Debug --- CHANGELOG.md | 2 +- src/generate/generic.rs | 9 +++++++++ src/generate/register.rs | 14 -------------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca83e615..abf6b827 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/). ## [Unreleased] -- Yet more clean field `Debug` +- Yet more clean field & register `Debug` ## [v0.33.2] - 2024-05-07 diff --git a/src/generate/generic.rs b/src/generate/generic.rs index df2913a4..a34557e0 100644 --- a/src/generate/generic.rs +++ b/src/generate/generic.rs @@ -258,6 +258,15 @@ impl Reg { } } +impl core::fmt::Debug for crate::generic::Reg +where + R: core::fmt::Debug +{ + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + core::fmt::Debug::fmt(&self.read(), f) + } +} + #[doc(hidden)] pub mod raw { use super::{marker, BitM, FieldSpec, RegisterSpec, Unsafe, Writable}; diff --git a/src/generate/register.rs b/src/generate/register.rs index 9ff29340..20f749a3 100644 --- a/src/generate/register.rs +++ b/src/generate/register.rs @@ -331,12 +331,6 @@ pub fn render_register_mod( write!(f, "{}", self.bits()) } } - #debug_feature - impl core::fmt::Debug for crate::generic::Reg<#regspec_ty> { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - core::fmt::Debug::fmt(&self.read(), f) - } - } }); } @@ -492,14 +486,6 @@ fn render_register_mod_debug( #close #close }); - r_debug_impl.extend(quote! { - #debug_feature - impl core::fmt::Debug for crate::generic::Reg<#regspec_ty> { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - core::fmt::Debug::fmt(&self.read(), f) - } - } - }); } else if !access.can_read() || register.read_action.is_some() { r_debug_impl.extend(quote! { #debug_feature