Merge pull request #426 from sdroege/deref-class-struct

Implement DerefMut for class structs too

Author: GuillaumeGomez

src/object.rs

@@ -679,10 +679,7 @@ macro_rules! glib_object_wrapper {
         #[doc(hidden)]
         impl AsRef<$super_name> for $name {
             fn as_ref(&self) -> &$super_name {
-                debug_assert!($crate::object::ObjectExt::is::<$super_name>(self));
-                unsafe {
-                    ::std::mem::transmute(self)
-                }
+                $crate::object::Cast::upcast_ref(self)
             }
         }
     };
@@ -700,9 +697,13 @@ macro_rules! glib_object_wrapper {
             type Target = <$crate::object::Object as $crate::object::ObjectType>::RustClassType;
 
             fn deref(&self) -> &Self::Target {
-                unsafe {
-                    ::std::mem::transmute(self)
-                }
+                $crate::object::IsClassFor::upcast_ref(self)
+            }
+        }
+
+        impl ::std::ops::DerefMut for $rust_class_name {
+            fn deref_mut(&mut self) -> &mut Self::Target {
+                $crate::object::IsClassFor::upcast_ref_mut(self)
             }
         }
     };
@@ -715,9 +716,13 @@ macro_rules! glib_object_wrapper {
             type Target = <$super_name as $crate::object::ObjectType>::RustClassType;
 
             fn deref(&self) -> &Self::Target {
-                unsafe {
-                    ::std::mem::transmute(self)
-                }
+                $crate::object::IsClassFor::upcast_ref(self)
+            }
+        }
+
+        impl ::std::ops::DerefMut for $rust_class_name {
+            fn deref_mut(&mut self) -> &mut Self::Target {
+                $crate::object::IsClassFor::upcast_ref_mut(self)
             }
         }
     };
@@ -730,9 +735,13 @@ macro_rules! glib_object_wrapper {
             type Target = <$super_name as $crate::object::ObjectType>::RustClassType;
 
             fn deref(&self) -> &Self::Target {
-                unsafe {
-                    ::std::mem::transmute(self)
-                }
+                $crate::object::IsClassFor::upcast_ref(self)
+            }
+        }
+
+        impl ::std::ops::DerefMut for $rust_class_name {
+            fn deref_mut(&mut self) -> &mut Self::Target {
+                $crate::object::IsClassFor::upcast_ref_mut(self)
             }
         }
 
@@ -770,10 +779,7 @@ macro_rules! glib_object_wrapper {
         #[doc(hidden)]
         impl AsRef<$crate::object::Object> for $name {
             fn as_ref(&self) -> &$crate::object::Object {
-                debug_assert!($crate::object::ObjectExt::is::<$crate::object::Object>(self));
-                unsafe {
-                    ::std::mem::transmute(self)
-                }
+                $crate::object::Cast::upcast_ref(self)
             }
         }
 
@@ -789,10 +795,7 @@ macro_rules! glib_object_wrapper {
         #[doc(hidden)]
         impl AsRef<$crate::object::Object> for $name {
             fn as_ref(&self) -> &$crate::object::Object {
-                debug_assert!($crate::object::ObjectExt::is::<$crate::object::Object>(self));
-                unsafe {
-                    ::std::mem::transmute(self)
-                }
+                $crate::object::Cast::upcast_ref(self)
             }
         }