gir: Update and regenerate with impl Trait instead of named types

gtk-rs/gir#1153

Author: MarijnS95

gdk4-x11/src/auto/x11_device_manager_xi2.rs

@@ -120,7 +120,7 @@ impl X11DeviceManagerXI2Builder {
             .expect("Failed to create an instance of X11DeviceManagerXI2")
     }
 
-    pub fn display<P: IsA<gdk::Display>>(mut self, display: &P) -> Self {
+    pub fn display(mut self, display: &impl IsA<gdk::Display>) -> Self {
         self.display = Some(display.clone().upcast());
         self
     }

gdk4-x11/src/auto/x11_device_xi2.rs

@@ -98,7 +98,7 @@ impl X11DeviceXI2Builder {
         self
     }
 
-    pub fn display<P: IsA<gdk::Display>>(mut self, display: &P) -> Self {
+    pub fn display(mut self, display: &impl IsA<gdk::Display>) -> Self {
         self.display = Some(display.clone().upcast());
         self
     }

gdk4-x11/src/auto/x11_display.rs

@@ -220,7 +220,7 @@ impl X11Display {
     }
 
     #[doc(alias = "gdk_x11_display_set_program_class")]
-    pub fn set_program_class<P: IsA<gdk::Display>>(display: &P, program_class: &str) {
+    pub fn set_program_class(display: &impl IsA<gdk::Display>, program_class: &str) {
         assert_initialized_main_thread!();
         unsafe {
             ffi::gdk_x11_display_set_program_class(

gdk4-x11/src/auto/x11_screen.rs

@@ -65,10 +65,7 @@ impl X11Screen {
     }
 
     #[doc(alias = "window-manager-changed")]
-    pub fn connect_window_manager_changed<F: Fn(&X11Screen) + 'static>(
-        &self,
-        f: F,
-    ) -> SignalHandlerId {
+    pub fn connect_window_manager_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn window_manager_changed_trampoline<F: Fn(&X11Screen) + 'static>(
             this: *mut ffi::GdkX11Screen,
             f: glib::ffi::gpointer,

gdk4-x11/src/auto/x11_surface.rs

@@ -60,7 +60,7 @@ impl X11Surface {
     }
 
     #[doc(alias = "gdk_x11_surface_set_group")]
-    pub fn set_group<P: IsA<gdk::Surface>>(&self, leader: &P) {
+    pub fn set_group(&self, leader: &impl IsA<gdk::Surface>) {
         unsafe {
             ffi::gdk_x11_surface_set_group(self.to_glib_none().0, leader.as_ref().to_glib_none().0);
         }

gdk4/src/auto/app_launch_context.rs

@@ -44,7 +44,7 @@ impl AppLaunchContext {
     }
 
     #[doc(alias = "gdk_app_launch_context_set_icon")]
-    pub fn set_icon<P: IsA<gio::Icon>>(&self, icon: Option<&P>) {
+    pub fn set_icon(&self, icon: Option<&impl IsA<gio::Icon>>) {
         unsafe {
             ffi::gdk_app_launch_context_set_icon(
                 self.to_glib_none().0,

gdk4/src/auto/clipboard.rs

@@ -58,9 +58,9 @@ impl Clipboard {
     }
 
     #[doc(alias = "gdk_clipboard_set_content")]
-    pub fn set_content<P: IsA<ContentProvider>>(
+    pub fn set_content(
         &self,
-        provider: Option<&P>,
+        provider: Option<&impl IsA<ContentProvider>>,
     ) -> Result<(), glib::error::BoolError> {
         unsafe {
             glib::result_from_gboolean!(
@@ -81,7 +81,7 @@ impl Clipboard {
     }
 
     #[doc(alias = "gdk_clipboard_set_texture")]
-    pub fn set_texture<P: IsA<Texture>>(&self, texture: &P) {
+    pub fn set_texture(&self, texture: &impl IsA<Texture>) {
         unsafe {
             ffi::gdk_clipboard_set_texture(
                 self.to_glib_none().0,
@@ -91,7 +91,7 @@ impl Clipboard {
     }
 
     #[doc(alias = "changed")]
-    pub fn connect_changed<F: Fn(&Clipboard) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn changed_trampoline<F: Fn(&Clipboard) + 'static>(
             this: *mut ffi::GdkClipboard,
             f: glib::ffi::gpointer,
@@ -113,7 +113,7 @@ impl Clipboard {
     }
 
     #[doc(alias = "content")]
-    pub fn connect_content_notify<F: Fn(&Clipboard) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_content_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_content_trampoline<F: Fn(&Clipboard) + 'static>(
             this: *mut ffi::GdkClipboard,
             _param_spec: glib::ffi::gpointer,
@@ -136,7 +136,7 @@ impl Clipboard {
     }
 
     #[doc(alias = "formats")]
-    pub fn connect_formats_notify<F: Fn(&Clipboard) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_formats_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_formats_trampoline<F: Fn(&Clipboard) + 'static>(
             this: *mut ffi::GdkClipboard,
             _param_spec: glib::ffi::gpointer,
@@ -159,7 +159,7 @@ impl Clipboard {
     }
 
     #[doc(alias = "local")]
-    pub fn connect_local_notify<F: Fn(&Clipboard) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_local_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_local_trampoline<F: Fn(&Clipboard) + 'static>(
             this: *mut ffi::GdkClipboard,
             _param_spec: glib::ffi::gpointer,

gdk4/src/auto/content_provider.rs

@@ -74,23 +74,19 @@ pub trait ContentProviderExt: 'static {
     fn storable_formats(&self) -> ContentFormats;
 
     #[doc(alias = "gdk_content_provider_write_mime_type_async")]
-    fn write_mime_type_async<
-        P: IsA<gio::OutputStream>,
-        Q: IsA<gio::Cancellable>,
-        R: FnOnce(Result<(), glib::Error>) + Send + 'static,
-    >(
+    fn write_mime_type_async<P: FnOnce(Result<(), glib::Error>) + Send + 'static>(
         &self,
         mime_type: &str,
-        stream: &P,
+        stream: &impl IsA<gio::OutputStream>,
         io_priority: glib::Priority,
-        cancellable: Option<&Q>,
-        callback: R,
+        cancellable: Option<&impl IsA<gio::Cancellable>>,
+        callback: P,
     );
 
-    fn write_mime_type_async_future<P: IsA<gio::OutputStream> + Clone + 'static>(
+    fn write_mime_type_async_future(
         &self,
         mime_type: &str,
-        stream: &P,
+        stream: &(impl IsA<gio::OutputStream> + Clone + 'static),
         io_priority: glib::Priority,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>>;
 
@@ -127,21 +123,17 @@ impl<O: IsA<ContentProvider>> ContentProviderExt for O {
         }
     }
 
-    fn write_mime_type_async<
-        P: IsA<gio::OutputStream>,
-        Q: IsA<gio::Cancellable>,
-        R: FnOnce(Result<(), glib::Error>) + Send + 'static,
-    >(
+    fn write_mime_type_async<P: FnOnce(Result<(), glib::Error>) + Send + 'static>(
         &self,
         mime_type: &str,
-        stream: &P,
+        stream: &impl IsA<gio::OutputStream>,
         io_priority: glib::Priority,
-        cancellable: Option<&Q>,
-        callback: R,
+        cancellable: Option<&impl IsA<gio::Cancellable>>,
+        callback: P,
     ) {
-        let user_data: Box_<R> = Box_::new(callback);
+        let user_data: Box_<P> = Box_::new(callback);
         unsafe extern "C" fn write_mime_type_async_trampoline<
-            R: FnOnce(Result<(), glib::Error>) + Send + 'static,
+            P: FnOnce(Result<(), glib::Error>) + Send + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -158,10 +150,10 @@ impl<O: IsA<ContentProvider>> ContentProviderExt for O {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<R> = Box_::from_raw(user_data as *mut _);
+            let callback: Box_<P> = Box_::from_raw(user_data as *mut _);
             callback(result);
         }
-        let callback = write_mime_type_async_trampoline::<R>;
+        let callback = write_mime_type_async_trampoline::<P>;
         unsafe {
             ffi::gdk_content_provider_write_mime_type_async(
                 self.as_ref().to_glib_none().0,
@@ -175,10 +167,10 @@ impl<O: IsA<ContentProvider>> ContentProviderExt for O {
         }
     }
 
-    fn write_mime_type_async_future<P: IsA<gio::OutputStream> + Clone + 'static>(
+    fn write_mime_type_async_future(
         &self,
         mime_type: &str,
-        stream: &P,
+        stream: &(impl IsA<gio::OutputStream> + Clone + 'static),
         io_priority: glib::Priority,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
         let mime_type = String::from(mime_type);
@@ -201,12 +193,13 @@ impl<O: IsA<ContentProvider>> ContentProviderExt for O {
 
     #[doc(alias = "content-changed")]
     fn connect_content_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn content_changed_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn content_changed_trampoline<
+            P: IsA<ContentProvider>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GdkContentProvider,
             f: glib::ffi::gpointer,
-        ) where
-            P: IsA<ContentProvider>,
-        {
+        ) {
             let f: &F = &*(f as *const F);
             f(&ContentProvider::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -225,13 +218,14 @@ impl<O: IsA<ContentProvider>> ContentProviderExt for O {
 
     #[doc(alias = "formats")]
     fn connect_formats_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_formats_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_formats_trampoline<
+            P: IsA<ContentProvider>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GdkContentProvider,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
-            P: IsA<ContentProvider>,
-        {
+        ) {
             let f: &F = &*(f as *const F);
             f(&ContentProvider::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -250,13 +244,14 @@ impl<O: IsA<ContentProvider>> ContentProviderExt for O {
 
     #[doc(alias = "storable-formats")]
     fn connect_storable_formats_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_storable_formats_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_storable_formats_trampoline<
+            P: IsA<ContentProvider>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GdkContentProvider,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
-            P: IsA<ContentProvider>,
-        {
+        ) {
             let f: &F = &*(f as *const F);
             f(&ContentProvider::from_glib_borrow(this).unsafe_cast_ref())
         }

gdk4/src/auto/cursor.rs

@@ -33,8 +33,8 @@ impl Cursor {
 
     #[doc(alias = "gdk_cursor_new_from_texture")]
     #[doc(alias = "new_from_texture")]
-    pub fn from_texture<P: IsA<Texture>>(
-        texture: &P,
+    pub fn from_texture(
+        texture: &impl IsA<Texture>,
         hotspot_x: i32,
         hotspot_y: i32,
         fallback: Option<&Cursor>,
@@ -148,7 +148,7 @@ impl CursorBuilder {
         self
     }
 
-    pub fn texture<P: IsA<Texture>>(mut self, texture: &P) -> Self {
+    pub fn texture(mut self, texture: &impl IsA<Texture>) -> Self {
         self.texture = Some(texture.clone().upcast());
         self
     }

gdk4/src/auto/device.rs

@@ -174,7 +174,7 @@ impl Device {
     }
 
     #[doc(alias = "changed")]
-    pub fn connect_changed<F: Fn(&Device) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn changed_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             f: glib::ffi::gpointer,
@@ -196,7 +196,7 @@ impl Device {
     }
 
     #[doc(alias = "tool-changed")]
-    pub fn connect_tool_changed<F: Fn(&Device, &DeviceTool) + 'static>(
+    pub fn connect_tool_changed<F: Fn(&Self, &DeviceTool) + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -222,10 +222,7 @@ impl Device {
     }
 
     #[doc(alias = "caps-lock-state")]
-    pub fn connect_caps_lock_state_notify<F: Fn(&Device) + 'static>(
-        &self,
-        f: F,
-    ) -> SignalHandlerId {
+    pub fn connect_caps_lock_state_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_caps_lock_state_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             _param_spec: glib::ffi::gpointer,
@@ -248,7 +245,7 @@ impl Device {
     }
 
     #[doc(alias = "direction")]
-    pub fn connect_direction_notify<F: Fn(&Device) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_direction_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_direction_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             _param_spec: glib::ffi::gpointer,
@@ -271,10 +268,7 @@ impl Device {
     }
 
     #[doc(alias = "has-bidi-layouts")]
-    pub fn connect_has_bidi_layouts_notify<F: Fn(&Device) + 'static>(
-        &self,
-        f: F,
-    ) -> SignalHandlerId {
+    pub fn connect_has_bidi_layouts_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_has_bidi_layouts_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             _param_spec: glib::ffi::gpointer,
@@ -297,7 +291,7 @@ impl Device {
     }
 
     #[doc(alias = "modifier-state")]
-    pub fn connect_modifier_state_notify<F: Fn(&Device) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_modifier_state_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_modifier_state_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             _param_spec: glib::ffi::gpointer,
@@ -320,7 +314,7 @@ impl Device {
     }
 
     #[doc(alias = "n-axes")]
-    pub fn connect_n_axes_notify<F: Fn(&Device) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_n_axes_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_n_axes_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             _param_spec: glib::ffi::gpointer,
@@ -343,7 +337,7 @@ impl Device {
     }
 
     #[doc(alias = "num-lock-state")]
-    pub fn connect_num_lock_state_notify<F: Fn(&Device) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_num_lock_state_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_num_lock_state_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             _param_spec: glib::ffi::gpointer,
@@ -366,7 +360,7 @@ impl Device {
     }
 
     #[doc(alias = "scroll-lock-state")]
-    pub fn connect_scroll_lock_state_notify<F: Fn(&Device) + 'static>(
+    pub fn connect_scroll_lock_state_notify<F: Fn(&Self) + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -392,7 +386,7 @@ impl Device {
     }
 
     #[doc(alias = "seat")]
-    pub fn connect_seat_notify<F: Fn(&Device) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_seat_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_seat_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             _param_spec: glib::ffi::gpointer,
@@ -415,7 +409,7 @@ impl Device {
     }
 
     #[doc(alias = "tool")]
-    pub fn connect_tool_notify<F: Fn(&Device) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_tool_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_tool_trampoline<F: Fn(&Device) + 'static>(
             this: *mut ffi::GdkDevice,
             _param_spec: glib::ffi::gpointer,