rm deref

Author: burrbull

src/generate/generic.rs

@@ -9,7 +9,6 @@ pub fn render() -> Result<Vec<Tokens>> {
 
     generic_items.push(quote! {
         use core::marker;
-        use core::ops::Deref;
         use vcell::VolatileCell;
 
         ///Marker trait for readable register/field
@@ -38,43 +37,35 @@ pub fn render() -> Result<Vec<Tokens>> {
             _marker: marker::PhantomData<REG>,
         }
 
-        impl<U, REG> core::ops::Deref for Reg<U, REG> {
-            type Target = vcell::VolatileCell<U>;
-            #[inline(always)]
-            fn deref(&self) -> &Self::Target {
-                &self.register
-            }
-        }
-
         impl<U, REG> Reg<U, REG>
         where
-            Self: Readable + Deref<Target=VolatileCell<U>>,
+            Self: Readable,
             U: Copy
         {
             ///Reads the contents of the register
             #[inline(always)]
             pub fn read(&self) -> R<U, Self> {
-                R {bits: (*self).get(), _reg: marker::PhantomData}
+                R {bits: self.register.get(), _reg: marker::PhantomData}
             }
         }
 
         impl<U, REG> Reg<U, REG>
         where
-            Self: ResetValue<U> + Writable + Deref<Target=VolatileCell<U>>,
+            Self: ResetValue<U> + Writable,
             U: Copy,
         {
             ///Writes the reset value to the register
             #[inline(always)]
             pub fn reset(&self) {
-                (*self).set(Self::reset_value())
+                self.register.set(Self::reset_value())
             }
         }
     });
 
     generic_items.push(quote! {
         impl<U, REG> Reg<U, REG>
         where
-            Self: ResetValue<U> + Writable + Deref<Target=VolatileCell<U>>,
+            Self: ResetValue<U> + Writable,
             U: Copy
         {
             ///Writes to the register
@@ -83,15 +74,15 @@ pub fn render() -> Result<Vec<Tokens>> {
             where
                 F: FnOnce(&mut W<U, Self>) -> &mut W<U, Self>
             {
-                (*self).set(f(&mut W {bits: Self::reset_value(), _reg: marker::PhantomData}).bits);
+                self.register.set(f(&mut W {bits: Self::reset_value(), _reg: marker::PhantomData}).bits);
             }
         }
     });
 
     generic_items.push(quote! {
         impl<U, REG> Reg<U, REG>
         where
-            Self: Writable + Deref<Target=VolatileCell<U>>,
+            Self: Writable,
             U: Copy + Default
         {
             ///Writes Zero to the register
@@ -100,15 +91,15 @@ pub fn render() -> Result<Vec<Tokens>> {
             where
                 F: FnOnce(&mut W<U, Self>) -> &mut W<U, Self>
             {
-                (*self).set(f(&mut W {bits: U::default(), _reg: marker::PhantomData }).bits);
+                self.register.set(f(&mut W {bits: U::default(), _reg: marker::PhantomData }).bits);
             }
         }
     });
 
     generic_items.push(quote! {
         impl<U, REG> Reg<U, REG>
         where
-            Self: Readable + Writable + Deref<Target = VolatileCell<U>>,
+            Self: Readable + Writable,
             U: Copy,
         {
             ///Modifies the contents of the register
@@ -117,8 +108,8 @@ pub fn render() -> Result<Vec<Tokens>> {
             where
                 for<'w> F: FnOnce(&R<U, Self>, &'w mut W<U, Self>) -> &'w mut W<U, Self>
             {
-                let bits = (*self).get();
-                (*self).set(f(&R {bits, _reg: marker::PhantomData}, &mut W {bits, _reg: marker::PhantomData}).bits);
+                let bits = self.register.get();
+                self.register.set(f(&R {bits, _reg: marker::PhantomData}, &mut W {bits, _reg: marker::PhantomData}).bits);
             }
         }
     });