simplify enum derive

Author: burrbull

src/generate/register.rs

@@ -299,7 +299,6 @@ pub fn fields(
         let pc_r = &f.pc_r;
         let mut pc_w = &f.pc_r;
 
-        let mut base_pc_w = None;
         let mut evs_r = None;
 
         let _pc_r = &f._pc_r;
@@ -336,21 +335,17 @@ pub fn fields(
                     }
                 });
 
-                base_pc_w = base.as_ref().map(|base| {
+                if let Some(base) = base {
                     let pc = base.field.to_sanitized_upper_case();
                     let base_pc_r = Ident::from(&*format!("{}_A", pc));
-                    let base_pc_r = derive_from_base(mod_items, &base, &pc_r, &base_pc_r, description);
+                    derive_from_base(mod_items, &base, &pc_r, &base_pc_r, description);
 
                     let doc = format!("Reader of field `{}`", f.name);
                     mod_items.push(quote! {
                         #[doc = #doc]
-                        pub type #_pc_r = crate::R<#fty, #base_pc_r>;
+                        pub type #_pc_r = crate::R<#fty, #pc_r>;
                     });
-
-                    base_pc_r
-                });
-
-                if base.is_none() {
+                } else {
                     let has_reserved_variant = evs.values.len() != (1 << f.width);
                     let variants = Variant::from_enumerated_values(evs)?;
 
@@ -470,13 +465,11 @@ pub fn fields(
                 if Some(evs) != evs_r.as_ref() {
                     pc_w = &f.pc_w;
 
-                    base_pc_w = base.as_ref().map(|base| {
+                    if let Some(base) = base {
                         let pc = base.field.to_sanitized_upper_case();
                         let base_pc_w = Ident::from(&*format!("{}_AW", pc));
-                        derive_from_base(mod_items, &base, &pc_w, &base_pc_w, description)
-                    });
-
-                    if base.is_none() {
+                        derive_from_base(mod_items, &base, &pc_w, &base_pc_w, description);
+                    } else {
                         add_from_variants(mod_items, &variants, pc_w, &f, description, rv);
                     }
                 }
@@ -496,23 +489,13 @@ pub fn fields(
                     let sc = &v.sc;
 
                     let doc = util::escape_brackets(util::respace(&v.doc).as_ref());
-                    if let Some(enum_) = base_pc_w.as_ref() {
-                        proxy_items.push(quote! {
-                            #[doc = #doc]
-                            #[inline(always)]
-                            pub fn #sc(self) -> &'a mut W {
-                                self.variant(#enum_::#pc)
-                            }
-                        });
-                    } else {
-                        proxy_items.push(quote! {
-                            #[doc = #doc]
-                            #[inline(always)]
-                            pub fn #sc(self) -> &'a mut W {
-                                self.variant(#pc_w::#pc)
-                            }
-                        });
-                    }
+                    proxy_items.push(quote! {
+                        #[doc = #doc]
+                        #[inline(always)]
+                        pub fn #sc(self) -> &'a mut W {
+                            self.variant(#pc_w::#pc)
+                        }
+                    });
                 }
             }
 
@@ -681,7 +664,7 @@ fn add_from_variants(mod_items: &mut Vec<Tokens>, variants: &Vec<Variant>, pc: &
     });
 }
 
-fn derive_from_base(mod_items: &mut Vec<Tokens>, base: &Base, pc: &Ident, base_pc: &Ident, desc: &str) -> quote::Tokens {
+fn derive_from_base(mod_items: &mut Vec<Tokens>, base: &Base, pc: &Ident, base_pc: &Ident, desc: &str) {
     if let (Some(peripheral), Some(register)) = (&base.peripheral, &base.register) {
         let pmod_ = peripheral.to_sanitized_snake_case();
         let rmod_ = register.to_sanitized_snake_case();
@@ -693,10 +676,6 @@ fn derive_from_base(mod_items: &mut Vec<Tokens>, base: &Base, pc: &Ident, base_p
             pub type #pc =
                 crate::#pmod_::#rmod_::#base_pc;
         });
-
-        quote! {
-            crate::#pmod_::#rmod_::#base_pc
-        }
     } else if let Some(register) = &base.register {
         let mod_ = register.to_sanitized_snake_case();
         let mod_ = Ident::from(&*mod_);
@@ -706,19 +685,11 @@ fn derive_from_base(mod_items: &mut Vec<Tokens>, base: &Base, pc: &Ident, base_p
             pub type #pc =
                 super::#mod_::#base_pc;
         });
-
-        quote! {
-            super::#mod_::#base_pc
-        }
     } else {
         mod_items.push(quote! {
             #[doc = #desc]
             pub type #pc = #base_pc;
         });
-
-        quote! {
-            #base_pc
-        }
     }
 }