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

gtk-rs/gir#1153

Author: MarijnS95

gdk-pixbuf/src/auto/pixbuf.rs

@@ -113,9 +113,9 @@ impl Pixbuf {
 
     #[doc(alias = "gdk_pixbuf_new_from_stream")]
     #[doc(alias = "new_from_stream")]
-    pub fn from_stream<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(
-        stream: &P,
-        cancellable: Option<&Q>,
+    pub fn from_stream(
+        stream: &impl IsA<gio::InputStream>,
+        cancellable: Option<&impl IsA<gio::Cancellable>>,
     ) -> Result<Pixbuf, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
@@ -134,12 +134,12 @@ impl Pixbuf {
 
     #[doc(alias = "gdk_pixbuf_new_from_stream_at_scale")]
     #[doc(alias = "new_from_stream_at_scale")]
-    pub fn from_stream_at_scale<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(
-        stream: &P,
+    pub fn from_stream_at_scale(
+        stream: &impl IsA<gio::InputStream>,
         width: i32,
         height: i32,
         preserve_aspect_ratio: bool,
-        cancellable: Option<&Q>,
+        cancellable: Option<&impl IsA<gio::Cancellable>>,
     ) -> Result<Pixbuf, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
@@ -465,7 +465,7 @@ impl Pixbuf {
     }
 
     //#[doc(alias = "gdk_pixbuf_save")]
-    //pub fn save<P: AsRef<std::path::Path>>(&self, filename: P, type_: &str, error: Option<&mut glib::Error>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> bool {
+    //pub fn save(&self, filename: impl AsRef<std::path::Path>, type_: &str, error: Option<&mut glib::Error>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> bool {
     //    unsafe { TODO: call ffi:gdk_pixbuf_save() }
     //}
 
@@ -485,17 +485,17 @@ impl Pixbuf {
     //}
 
     //#[doc(alias = "gdk_pixbuf_save_to_stream")]
-    //pub fn save_to_stream<P: IsA<gio::OutputStream>, Q: IsA<gio::Cancellable>>(&self, stream: &P, type_: &str, cancellable: Option<&Q>, error: Option<&mut glib::Error>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> bool {
+    //pub fn save_to_stream(&self, stream: &impl IsA<gio::OutputStream>, type_: &str, cancellable: Option<&impl IsA<gio::Cancellable>>, error: Option<&mut glib::Error>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> bool {
     //    unsafe { TODO: call ffi:gdk_pixbuf_save_to_stream() }
     //}
 
     //#[doc(alias = "gdk_pixbuf_save_to_stream_async")]
-    //pub fn save_to_stream_async<P: IsA<gio::OutputStream>, Q: IsA<gio::Cancellable>, R: FnOnce(Result<(), glib::Error>) + Send + 'static>(&self, stream: &P, type_: &str, cancellable: Option<&Q>, callback: R, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) {
+    //pub fn save_to_stream_async<P: FnOnce(Result<(), glib::Error>) + Send + 'static>(&self, stream: &impl IsA<gio::OutputStream>, type_: &str, cancellable: Option<&impl IsA<gio::Cancellable>>, callback: P, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) {
     //    unsafe { TODO: call ffi:gdk_pixbuf_save_to_stream_async() }
     //}
 
     //
-    //pub fn save_to_stream_async_future<P: IsA<gio::OutputStream> + Clone + 'static>(&self, stream: &P, type_: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
+    //pub fn save_to_stream_async_future(&self, stream: &(impl IsA<gio::OutputStream> + Clone + 'static), type_: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
 
     //let stream = stream.clone();
     //let type_ = String::from(type_);

gdk-pixbuf/src/auto/pixbuf_animation.rs

@@ -22,8 +22,8 @@ glib::wrapper! {
 impl PixbufAnimation {
     #[doc(alias = "gdk_pixbuf_animation_new_from_file")]
     #[doc(alias = "new_from_file")]
-    pub fn from_file<P: AsRef<std::path::Path>>(
-        filename: P,
+    pub fn from_file(
+        filename: impl AsRef<std::path::Path>,
     ) -> Result<PixbufAnimation, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
@@ -58,9 +58,9 @@ impl PixbufAnimation {
 
     #[doc(alias = "gdk_pixbuf_animation_new_from_stream")]
     #[doc(alias = "new_from_stream")]
-    pub fn from_stream<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(
-        stream: &P,
-        cancellable: Option<&Q>,
+    pub fn from_stream(
+        stream: &impl IsA<gio::InputStream>,
+        cancellable: Option<&impl IsA<gio::Cancellable>>,
     ) -> Result<PixbufAnimation, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
@@ -79,18 +79,14 @@ impl PixbufAnimation {
 
     #[doc(alias = "gdk_pixbuf_animation_new_from_stream_async")]
     #[doc(alias = "new_from_stream_async")]
-    pub fn from_stream_async<
-        P: IsA<gio::InputStream>,
-        Q: IsA<gio::Cancellable>,
-        R: FnOnce(Result<PixbufAnimation, glib::Error>) + Send + 'static,
-    >(
-        stream: &P,
-        cancellable: Option<&Q>,
-        callback: R,
+    pub fn from_stream_async<P: FnOnce(Result<PixbufAnimation, glib::Error>) + Send + 'static>(
+        stream: &impl IsA<gio::InputStream>,
+        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 from_stream_async_trampoline<
-            R: FnOnce(Result<PixbufAnimation, glib::Error>) + Send + 'static,
+            P: FnOnce(Result<PixbufAnimation, glib::Error>) + Send + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -103,10 +99,10 @@ impl PixbufAnimation {
             } 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 = from_stream_async_trampoline::<R>;
+        let callback = from_stream_async_trampoline::<P>;
         unsafe {
             ffi::gdk_pixbuf_animation_new_from_stream_async(
                 stream.as_ref().to_glib_none().0,
@@ -117,8 +113,8 @@ impl PixbufAnimation {
         }
     }
 
-    pub fn from_stream_async_future<P: IsA<gio::InputStream> + Clone + 'static>(
-        stream: &P,
+    pub fn from_stream_async_future(
+        stream: &(impl IsA<gio::InputStream> + Clone + 'static),
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<PixbufAnimation, glib::Error>> + 'static>>
     {
         let stream = stream.clone();

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 3158f69)
+Generated by gir (https://github.com/gtk-rs/gir @ ee35a13)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7d95377)

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 3158f69)
+Generated by gir (https://github.com/gtk-rs/gir @ ee35a13)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7d95377)

gio/src/auto/action_map.rs

@@ -20,7 +20,7 @@ pub const NONE_ACTION_MAP: Option<&ActionMap> = None;
 
 pub trait ActionMapExt: 'static {
     #[doc(alias = "g_action_map_add_action")]
-    fn add_action<P: IsA<Action>>(&self, action: &P);
+    fn add_action(&self, action: &impl IsA<Action>);
 
     //#[doc(alias = "g_action_map_add_action_entries")]
     //fn add_action_entries(&self, entries: /*Ignored*/&[&ActionEntry], user_data: /*Unimplemented*/Option<Fundamental: Pointer>);
@@ -33,7 +33,7 @@ pub trait ActionMapExt: 'static {
 }
 
 impl<O: IsA<ActionMap>> ActionMapExt for O {
-    fn add_action<P: IsA<Action>>(&self, action: &P) {
+    fn add_action(&self, action: &impl IsA<Action>) {
         unsafe {
             ffi::g_action_map_add_action(
                 self.as_ref().to_glib_none().0,

gio/src/auto/app_info.rs

@@ -34,8 +34,8 @@ glib::wrapper! {
 
 impl AppInfo {
     #[doc(alias = "g_app_info_create_from_commandline")]
-    pub fn create_from_commandline<P: AsRef<std::ffi::OsStr>>(
-        commandline: P,
+    pub fn create_from_commandline(
+        commandline: impl AsRef<std::ffi::OsStr>,
         application_name: Option<&str>,
         flags: AppInfoCreateFlags,
     ) -> Result<AppInfo, glib::Error> {
@@ -113,9 +113,9 @@ impl AppInfo {
     }
 
     #[doc(alias = "g_app_info_launch_default_for_uri")]
-    pub fn launch_default_for_uri<P: IsA<AppLaunchContext>>(
+    pub fn launch_default_for_uri(
         uri: &str,
-        context: Option<&P>,
+        context: Option<&impl IsA<AppLaunchContext>>,
     ) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
@@ -135,19 +135,15 @@ impl AppInfo {
     #[cfg(any(feature = "v2_50", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
     #[doc(alias = "g_app_info_launch_default_for_uri_async")]
-    pub fn launch_default_for_uri_async<
-        P: IsA<AppLaunchContext>,
-        Q: IsA<Cancellable>,
-        R: FnOnce(Result<(), glib::Error>) + Send + 'static,
-    >(
+    pub fn launch_default_for_uri_async<P: FnOnce(Result<(), glib::Error>) + Send + 'static>(
         uri: &str,
-        context: Option<&P>,
-        cancellable: Option<&Q>,
-        callback: R,
+        context: Option<&impl IsA<AppLaunchContext>>,
+        cancellable: Option<&impl IsA<Cancellable>>,
+        callback: P,
     ) {
-        let user_data: Box_<R> = Box_::new(callback);
+        let user_data: Box_<P> = Box_::new(callback);
         unsafe extern "C" fn launch_default_for_uri_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 crate::ffi::GAsyncResult,
@@ -160,10 +156,10 @@ impl AppInfo {
             } 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 = launch_default_for_uri_async_trampoline::<R>;
+        let callback = launch_default_for_uri_async_trampoline::<P>;
         unsafe {
             ffi::g_app_info_launch_default_for_uri_async(
                 uri.to_glib_none().0,
@@ -177,9 +173,9 @@ impl AppInfo {
 
     #[cfg(any(feature = "v2_50", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
-    pub fn launch_default_for_uri_async_future<P: IsA<AppLaunchContext> + Clone + 'static>(
+    pub fn launch_default_for_uri_async_future(
         uri: &str,
-        context: Option<&P>,
+        context: Option<&(impl IsA<AppLaunchContext> + Clone + 'static)>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
         let uri = String::from(uri);
         let context = context.map(ToOwned::to_owned);
@@ -225,7 +221,7 @@ pub trait AppInfoExt: 'static {
     fn dup(&self) -> AppInfo;
 
     #[doc(alias = "g_app_info_equal")]
-    fn equal<P: IsA<AppInfo>>(&self, appinfo2: &P) -> bool;
+    fn equal(&self, appinfo2: &impl IsA<AppInfo>) -> bool;
 
     #[doc(alias = "g_app_info_get_commandline")]
     #[doc(alias = "get_commandline")]
@@ -260,26 +256,26 @@ pub trait AppInfoExt: 'static {
     fn supported_types(&self) -> Vec<glib::GString>;
 
     #[doc(alias = "g_app_info_launch")]
-    fn launch<P: IsA<AppLaunchContext>>(
+    fn launch(
         &self,
         files: &[File],
-        context: Option<&P>,
+        context: Option<&impl IsA<AppLaunchContext>>,
     ) -> Result<(), glib::Error>;
 
     #[doc(alias = "g_app_info_launch_uris")]
-    fn launch_uris<P: IsA<AppLaunchContext>>(
+    fn launch_uris(
         &self,
         uris: &[&str],
-        context: Option<&P>,
+        context: Option<&impl IsA<AppLaunchContext>>,
     ) -> Result<(), glib::Error>;
 
     #[doc(alias = "g_app_info_remove_supports_type")]
     fn remove_supports_type(&self, content_type: &str) -> Result<(), glib::Error>;
 
     #[doc(alias = "g_app_info_set_as_default_for_extension")]
-    fn set_as_default_for_extension<P: AsRef<std::path::Path>>(
+    fn set_as_default_for_extension(
         &self,
-        extension: P,
+        extension: impl AsRef<std::path::Path>,
     ) -> Result<(), glib::Error>;
 
     #[doc(alias = "g_app_info_set_as_default_for_type")]
@@ -335,7 +331,7 @@ impl<O: IsA<AppInfo>> AppInfoExt for O {
         unsafe { from_glib_full(ffi::g_app_info_dup(self.as_ref().to_glib_none().0)) }
     }
 
-    fn equal<P: IsA<AppInfo>>(&self, appinfo2: &P) -> bool {
+    fn equal(&self, appinfo2: &impl IsA<AppInfo>) -> bool {
         unsafe {
             from_glib(ffi::g_app_info_equal(
                 self.as_ref().to_glib_none().0,
@@ -396,10 +392,10 @@ impl<O: IsA<AppInfo>> AppInfoExt for O {
         }
     }
 
-    fn launch<P: IsA<AppLaunchContext>>(
+    fn launch(
         &self,
         files: &[File],
-        context: Option<&P>,
+        context: Option<&impl IsA<AppLaunchContext>>,
     ) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
@@ -417,10 +413,10 @@ impl<O: IsA<AppInfo>> AppInfoExt for O {
         }
     }
 
-    fn launch_uris<P: IsA<AppLaunchContext>>(
+    fn launch_uris(
         &self,
         uris: &[&str],
-        context: Option<&P>,
+        context: Option<&impl IsA<AppLaunchContext>>,
     ) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
@@ -454,9 +450,9 @@ impl<O: IsA<AppInfo>> AppInfoExt for O {
         }
     }
 
-    fn set_as_default_for_extension<P: AsRef<std::path::Path>>(
+    fn set_as_default_for_extension(
         &self,
-        extension: P,
+        extension: impl AsRef<std::path::Path>,
     ) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();

gio/src/auto/app_launch_context.rs

@@ -40,25 +40,24 @@ pub const NONE_APP_LAUNCH_CONTEXT: Option<&AppLaunchContext> = None;
 pub trait AppLaunchContextExt: 'static {
     #[doc(alias = "g_app_launch_context_get_display")]
     #[doc(alias = "get_display")]
-    fn display<P: IsA<AppInfo>>(&self, info: &P, files: &[File]) -> Option<glib::GString>;
+    fn display(&self, info: &impl IsA<AppInfo>, files: &[File]) -> Option<glib::GString>;
 
     #[doc(alias = "g_app_launch_context_get_environment")]
     #[doc(alias = "get_environment")]
     fn environment(&self) -> Vec<std::ffi::OsString>;
 
     #[doc(alias = "g_app_launch_context_get_startup_notify_id")]
     #[doc(alias = "get_startup_notify_id")]
-    fn startup_notify_id<P: IsA<AppInfo>>(&self, info: &P, files: &[File])
-        -> Option<glib::GString>;
+    fn startup_notify_id(&self, info: &impl IsA<AppInfo>, files: &[File]) -> Option<glib::GString>;
 
     #[doc(alias = "g_app_launch_context_launch_failed")]
     fn launch_failed(&self, startup_notify_id: &str);
 
     #[doc(alias = "g_app_launch_context_setenv")]
-    fn setenv<P: AsRef<std::ffi::OsStr>, Q: AsRef<std::ffi::OsStr>>(&self, variable: P, value: Q);
+    fn setenv(&self, variable: impl AsRef<std::ffi::OsStr>, value: impl AsRef<std::ffi::OsStr>);
 
     #[doc(alias = "g_app_launch_context_unsetenv")]
-    fn unsetenv<P: AsRef<std::ffi::OsStr>>(&self, variable: P);
+    fn unsetenv(&self, variable: impl AsRef<std::ffi::OsStr>);
 
     #[doc(alias = "launch-failed")]
     fn connect_launch_failed<F: Fn(&Self, &str) + 'static>(&self, f: F) -> SignalHandlerId;
@@ -71,7 +70,7 @@ pub trait AppLaunchContextExt: 'static {
 }
 
 impl<O: IsA<AppLaunchContext>> AppLaunchContextExt for O {
-    fn display<P: IsA<AppInfo>>(&self, info: &P, files: &[File]) -> Option<glib::GString> {
+    fn display(&self, info: &impl IsA<AppInfo>, files: &[File]) -> Option<glib::GString> {
         unsafe {
             from_glib_full(ffi::g_app_launch_context_get_display(
                 self.as_ref().to_glib_none().0,
@@ -89,11 +88,7 @@ impl<O: IsA<AppLaunchContext>> AppLaunchContextExt for O {
         }
     }
 
-    fn startup_notify_id<P: IsA<AppInfo>>(
-        &self,
-        info: &P,
-        files: &[File],
-    ) -> Option<glib::GString> {
+    fn startup_notify_id(&self, info: &impl IsA<AppInfo>, files: &[File]) -> Option<glib::GString> {
         unsafe {
             from_glib_full(ffi::g_app_launch_context_get_startup_notify_id(
                 self.as_ref().to_glib_none().0,
@@ -112,7 +107,7 @@ impl<O: IsA<AppLaunchContext>> AppLaunchContextExt for O {
         }
     }
 
-    fn setenv<P: AsRef<std::ffi::OsStr>, Q: AsRef<std::ffi::OsStr>>(&self, variable: P, value: Q) {
+    fn setenv(&self, variable: impl AsRef<std::ffi::OsStr>, value: impl AsRef<std::ffi::OsStr>) {
         unsafe {
             ffi::g_app_launch_context_setenv(
                 self.as_ref().to_glib_none().0,
@@ -122,7 +117,7 @@ impl<O: IsA<AppLaunchContext>> AppLaunchContextExt for O {
         }
     }
 
-    fn unsetenv<P: AsRef<std::ffi::OsStr>>(&self, variable: P) {
+    fn unsetenv(&self, variable: impl AsRef<std::ffi::OsStr>) {
         unsafe {
             ffi::g_app_launch_context_unsetenv(
                 self.as_ref().to_glib_none().0,