glib: Assert immediately after type registration that the returned type is valid

This avoids checking for that in every caller.

Author: sdroege

glib/src/subclass/boxed.rs

@@ -53,11 +53,14 @@ pub fn register_boxed_type<T: BoxedType>() -> crate::Type {
             type_name.to_str().unwrap()
         );
 
-        from_glib(gobject_ffi::g_boxed_type_register_static(
+        let type_ = crate::Type::from_glib(gobject_ffi::g_boxed_type_register_static(
             type_name.as_ptr(),
             Some(boxed_copy::<T>),
             Some(boxed_free::<T>),
-        ))
+        ));
+        assert!(type_.is_valid());
+
+        type_
     }
 }
 

glib/src/subclass/interface.rs

@@ -197,7 +197,8 @@ pub fn register_interface<T: ObjectInterface>() -> Type {
             gobject_ffi::g_type_interface_add_prerequisite(type_, prerequisite);
         }
 
-        let type_ = from_glib(type_);
+        let type_ = Type::from_glib(type_);
+        assert!(type_.is_valid());
 
         T::type_init(&mut InitializingType::<T>(type_, marker::PhantomData));
 

glib/src/subclass/shared.rs

@@ -135,11 +135,14 @@ pub fn register_shared_type<T: SharedType>() -> crate::Type {
             type_name.to_str().unwrap()
         );
 
-        from_glib(gobject_ffi::g_boxed_type_register_static(
+        let type_ = crate::Type::from_glib(gobject_ffi::g_boxed_type_register_static(
             type_name.as_ptr(),
             Some(shared_ref::<T>),
             Some(shared_unref::<T>),
-        ))
+        ));
+        assert!(type_.is_valid());
+
+        type_
     }
 }
 

glib/src/subclass/types.rs

@@ -936,7 +936,7 @@ pub fn register_type<T: ObjectSubclass>() -> Type {
             type_name.to_str().unwrap()
         );
 
-        let type_ = from_glib(gobject_ffi::g_type_register_static_simple(
+        let type_ = Type::from_glib(gobject_ffi::g_type_register_static_simple(
             <T::ParentType as StaticType>::static_type().into_glib(),
             type_name.as_ptr(),
             mem::size_of::<T::Class>() as u32,
@@ -949,6 +949,7 @@ pub fn register_type<T: ObjectSubclass>() -> Type {
                 0
             },
         ));
+        assert!(type_.is_valid());
 
         let mut data = T::type_data();
         data.as_mut().type_ = type_;