make it work after rebase

Author: ranfdev

glib-macros/src/properties.rs

@@ -388,7 +388,6 @@ fn expand_property_fn(props: &[PropDesc]) -> TokenStream2 {
     quote!(
         fn derived_property<'a>(
             &self,
-            _obj: &Self::Type,
             id: usize,
             pspec: &'a #crate_ident::ParamSpec
         ) -> Result<#crate_ident::Value, #crate_ident::subclass::object::MissingPropertyHandler<'a>> {
@@ -448,7 +447,6 @@ fn expand_set_property_fn(props: &[PropDesc]) -> TokenStream2 {
     });
     quote!(
         fn derived_set_property<'a>(&self,
-            _obj: &Self::Type,
             id: usize,
             value: &#crate_ident::Value,
             pspec: &'a #crate_ident::ParamSpec

glib-macros/tests/properties.rs

@@ -103,17 +103,16 @@ fn props() {
                 }
                 fn set_property(
                     &self,
-                    _obj: &Self::Type,
                     _id: usize,
                     _value: &Value,
                     _pspec: &ParamSpec,
                 ) {
-                    Self::derived_set_property(self, _obj, _id, _value, _pspec).unwrap()
+                    Self::derived_set_property(self, _id, _value, _pspec).unwrap()
                 }
-                fn property(&self, _obj: &Self::Type, _id: usize, _pspec: &ParamSpec) -> Value {
-                    Self::derived_property(self, _obj, _id, _pspec).unwrap()
+                fn property(&self, id: usize, _pspec: &ParamSpec) -> Value {
+                    Self::derived_property(self, id, _pspec).unwrap()
                 }
-                fn constructed(&self, _obj: &Self::Type) {
+                fn constructed(&self) {
                     self.construct_cell.replace(Some(1));
                     self.construct_ref_cell.replace(Some(2));
                 }
@@ -143,7 +142,7 @@ fn props() {
         }
     }
 
-    let myfoo: foo::Foo = glib::object::Object::new(&[]).unwrap();
+    let myfoo: foo::Foo = glib::object::Object::new(&[]);
 
     // Read bar
     let bar: String = myfoo.property("bar");

glib/src/subclass/object.rs

@@ -165,7 +165,6 @@ pub trait DerivedObjectProperties: ObjectSubclass {
     /// Similar to [`ObjectImpl`](trait.ObjectImpl.html) but returns a `Result`.
     fn derived_set_property<'a>(
         &self,
-        _obj: &Self::Type,
         _id: usize,
         _value: &Value,
         _pspec: &'a ParamSpec,
@@ -177,7 +176,6 @@ pub trait DerivedObjectProperties: ObjectSubclass {
     /// Similar to [`ObjectImpl`](trait.ObjectImpl.html) but returns a `Result`.
     fn derived_property<'a>(
         &self,
-        _obj: &Self::Type,
         _id: usize,
         _pspec: &'a ParamSpec,
     ) -> Result<Value, MissingPropertyHandler<'a>> {