Merge #374

374: From instead of ToBits r=therealprof a=burrbull

r? @therealprof 

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

Author: bors[bot]

src/generate/generic.rs

@@ -21,12 +21,6 @@ pub trait ResetValue {
     fn reset_value() -> Self::Type;
 }
 
-///Converting enumerated values to bits
-pub trait ToBits<N> {
-    ///Conversion method
-    fn _bits(&self) -> N;
-}
-
 ///This structure provides volatile access to register
 pub struct Reg<U, REG> {
     register: vcell::VolatileCell<U>,
@@ -181,11 +175,11 @@ where
 impl<U, T, FI> PartialEq<FI> for R<U, T>
 where
     U: PartialEq,
-    FI: ToBits<U>
+    FI: Copy+Into<U>
 {
     #[inline(always)]
     fn eq(&self, other: &FI) -> bool {
-        self.bits.eq(&other._bits())
+        self.bits.eq(&(*other).into())
     }
 }
 

src/generate/register.rs

@@ -475,9 +475,8 @@ pub fn fields(
                     ///Writes `variant` to the field
                     #[inline(always)]
                     pub fn variant(self, variant: #pc_w) -> &'a mut W {
-                        use crate::ToBits;
                         #unsafety {
-                            self.#bits(variant._bits())
+                            self.#bits(variant.into())
                         }
                     }
                 });
@@ -657,10 +656,10 @@ fn add_from_variants(mod_items: &mut Vec<Tokens>, variants: &Vec<Variant>, pc: &
     });
 
     mod_items.push(quote! {
-        impl crate::ToBits<#fty> for #pc {
+        impl From<#pc> for #fty {
             #[inline(always)]
-            fn _bits(&self) -> #fty {
-                match *self {
+            fn from(variant: #pc) -> Self {
+                match variant {
                     #(#arms),*
                 }
             }