Merge #594

594: clean FieldReader r=Emilgardis a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Clean `FieldReader`
 - Optional PascalCase for Enum values instead of UPPER_CASE
 
 ## [v0.22.2] - 2022-04-13

src/generate/generic.rs

@@ -226,12 +226,11 @@ impl<REG: RegisterSpec> W<REG> {
 /// Field reader.
 ///
 /// Result of the `read` methods of fields.
-pub struct FieldReader<U, T> {
+pub struct FieldReader<U> {
     pub(crate) bits: U,
-    _reg: marker::PhantomData<T>,
 }
 
-impl<U, T> FieldReader<U, T>
+impl<U> FieldReader<U>
 where
     U: Copy,
 {
@@ -241,7 +240,6 @@ where
     pub(crate) fn new(bits: U) -> Self {
         Self {
             bits,
-            _reg: marker::PhantomData,
         }
     }
 
@@ -252,18 +250,18 @@ where
     }
 }
 
-impl<U, T, FI> PartialEq<FI> for FieldReader<U, T>
+impl<U, T> PartialEq<T> for FieldReader<U>
 where
     U: PartialEq,
-    FI: Copy + Into<U>,
+    T: Copy + Into<U>,
 {
     #[inline(always)]
-    fn eq(&self, other: &FI) -> bool {
+    fn eq(&self, other: &T) -> bool {
         self.bits.eq(&(*other).into())
     }
 }
 
-impl<FI> FieldReader<bool, FI> {
+impl FieldReader<bool> {
     /// Value of the field as raw bits.
     #[inline(always)]
     pub fn bit(&self) -> bool {

src/generate/register.rs

@@ -559,7 +559,7 @@ pub fn fields(
 
                     mod_items.extend(quote! {
                         #[doc = #readerdoc]
-                        pub struct #name_pc_r(crate::FieldReader<#fty, #name_pc_a>);
+                        pub struct #name_pc_r(crate::FieldReader<#fty>);
 
                         impl #name_pc_r {
                             #[inline(always)]
@@ -570,7 +570,7 @@ pub fn fields(
                         }
 
                         impl core::ops::Deref for #name_pc_r {
-                            type Target = crate::FieldReader<#fty, #name_pc_a>;
+                            type Target = crate::FieldReader<#fty>;
 
                             #[inline(always)]
                             fn deref(&self) -> &Self::Target {
@@ -582,7 +582,7 @@ pub fn fields(
             } else {
                 mod_items.extend(quote! {
                     #[doc = #readerdoc]
-                    pub struct #name_pc_r(crate::FieldReader<#fty, #fty>);
+                    pub struct #name_pc_r(crate::FieldReader<#fty>);
 
                     impl #name_pc_r {
                         #[inline(always)]
@@ -592,7 +592,7 @@ pub fn fields(
                     }
 
                     impl core::ops::Deref for #name_pc_r {
-                        type Target = crate::FieldReader<#fty, #fty>;
+                        type Target = crate::FieldReader<#fty>;
 
                         #[inline(always)]
                         fn deref(&self) -> &Self::Target {