Merge pull request #445 from sdroege/properties-borrow

Minor subclass API usability improvements

Author: sdroege

src/subclass/interface.rs

@@ -5,6 +5,7 @@
 use ffi;
 use gobject_ffi;
 
+use std::borrow::Borrow;
 use std::marker;
 use std::mem;
 use std::ptr;
@@ -119,12 +120,13 @@ pub trait ObjectInterfaceExt: ObjectInterface {
     /// Install properties on the interface.
     ///
     /// All implementors of the interface must provide these properties.
-    fn install_properties(&mut self, properties: &[Property]) {
+    fn install_properties<'a, T: Borrow<Property<'a>>>(&mut self, properties: &[T]) {
         if properties.is_empty() {
             return;
         }
 
         for property in properties {
+            let property = property.borrow();
             let pspec = (property.1)(property.0);
             unsafe {
                 gobject_ffi::g_object_interface_install_property(

src/subclass/object.rs

@@ -8,6 +8,8 @@
 use ffi;
 use gobject_ffi;
 
+use std::borrow::Borrow;
+use std::fmt;
 use std::mem;
 use std::ptr;
 
@@ -133,8 +135,15 @@ unsafe extern "C" fn constructed<T: ObjectSubclass>(obj: *mut gobject_ffi::GObje
 }
 
 /// Definition of a property.
+#[derive(Clone)]
 pub struct Property<'a>(pub &'a str, pub fn(&str) -> ::ParamSpec);
 
+impl<'a> fmt::Debug for Property<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        f.debug_tuple("Property").field(&self.0).finish()
+    }
+}
+
 /// Extension trait for `glib::Object`'s class struct.
 ///
 /// This contains various class methods and allows subclasses to override the virtual methods.
@@ -143,14 +152,15 @@ pub unsafe trait ObjectClassSubclassExt: Sized + 'static {
     ///
     /// The index in the properties array is going to be the index passed to the
     /// property setters and getters.
-    fn install_properties(&mut self, properties: &[Property]) {
+    fn install_properties<'a, T: Borrow<Property<'a>>>(&mut self, properties: &[T]) {
         if properties.is_empty() {
             return;
         }
 
         let mut pspecs = Vec::with_capacity(properties.len());
 
         for property in properties {
+            let property = property.borrow();
             let pspec = (property.1)(property.0);
             pspecs.push(pspec);
         }

src/subclass/types.rs

@@ -7,6 +7,7 @@
 use ffi;
 use gobject_ffi;
 
+use std::fmt;
 use std::marker;
 use std::mem;
 use std::ptr;
@@ -535,6 +536,15 @@ impl SignalInvocationHint {
     }
 }
 
+impl fmt::Debug for SignalInvocationHint {
+    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        f.debug_struct("SignalInvocationHint")
+            .field("detail", &self.detail())
+            .field("run_type", &self.run_type())
+            .finish()
+    }
+}
+
 pub(crate) unsafe fn add_signal_with_accumulator<F>(
     type_: ffi::GType,
     name: &str,
@@ -582,6 +592,14 @@ pub(crate) unsafe fn add_signal_with_accumulator<F>(
 
 pub struct SignalClassHandlerToken(*mut gobject_ffi::GTypeInstance);
 
+impl fmt::Debug for SignalClassHandlerToken {
+    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        f.debug_tuple("SignalClassHandlerToken")
+            .field(&unsafe { ::Object::from_glib_borrow(self.0 as *mut gobject_ffi::GObject) })
+            .finish()
+    }
+}
+
 pub(crate) unsafe fn add_signal_with_class_handler<F>(
     type_: ffi::GType,
     name: &str,