Replace Foo::from_instance(foo) with foo.imp()

Author: sdroege

examples/virtual_methods/base_button/imp.rs

@@ -29,11 +29,11 @@ pub struct BaseButton;
 
 // Virtual method default implementation trampolines
 fn sync_method_default_trampoline(this: &BaseButtonInstance, extra_text: Option<String>) {
-    BaseButton::from_instance(this).sync_method(this, extra_text)
+    this.imp().sync_method(this, extra_text)
 }
 
 fn async_method_default_trampoline(this: &BaseButtonInstance) -> PinnedFuture {
-    BaseButton::from_instance(this).async_method(this)
+    this.imp().async_method(this)
 }
 
 pub(super) fn base_button_sync_method(this: &BaseButtonInstance, extra_text: Option<String>) {

examples/virtual_methods/base_button/mod.rs

@@ -95,14 +95,14 @@ fn sync_method_trampoline<T>(this: &BaseButton, extra_text: Option<String>)
 where
     T: ObjectSubclass + BaseButtonImpl,
 {
-    let imp = T::from_instance(this.dynamic_cast_ref::<T::Type>().unwrap());
+    let imp = this.dynamic_cast_ref::<T::Type>().unwrap().imp();
     imp.sync_method(this, extra_text)
 }
 
 fn async_method_trampoline<T>(this: &BaseButton) -> PinnedFuture
 where
     T: ObjectSubclass + BaseButtonImpl,
 {
-    let imp = T::from_instance(this.dynamic_cast_ref::<T::Type>().unwrap());
+    let imp = this.dynamic_cast_ref::<T::Type>().unwrap().imp();
     imp.async_method(this)
 }

gdk4/src/subclass/content_provider.rs

@@ -239,7 +239,7 @@ impl<T: ContentProviderImpl> ContentProviderImplExt for T {
         Box::pin(gio::GioFuture::new(
             provider,
             move |obj, cancellable, send| {
-                let imp = Self::from_instance(obj);
+                let imp = obj.imp();
 
                 imp.parent_write_mime_type_async(
                     &imp.instance(),

gtk4-macros/src/lib.rs

@@ -221,7 +221,7 @@ pub fn composite_template_derive(input: TokenStream) -> TokenStream {
 ///     }
 ///     #[template_callback]
 ///     pub fn print_both_labels(&self) {
-///         let self_ = imp::MyWidget::from_instance(self);
+///         let self_ = self.imp();
 ///         println!("{} {}", self_.label.label(), self_.button.label().unwrap().as_str());
 ///     }
 /// }

gtk4/src/builder_rust_scope.rs

@@ -58,7 +58,7 @@ impl BuilderRustScope {
         name: N,
         callback: F,
     ) {
-        imp::BuilderRustScope::from_instance(self)
+        self.imp()
             .callbacks
             .borrow_mut()
             .insert(name.into(), Rc::new(callback));