From a3a2066458a36ad5a3e17e49f4d824581352d600 Mon Sep 17 00:00:00 2001 From: Jason Francis Date: Sun, 5 Mar 2023 13:20:53 -0500 Subject: [PATCH] Regenerate gir for returned collections --- gdk-pixbuf/src/auto/pixbuf.rs | 2 +- gdk-pixbuf/src/auto/pixbuf_format.rs | 4 +- gdk-pixbuf/src/auto/versions.txt | 4 +- gdk-pixbuf/sys/versions.txt | 4 +- gio/src/auto/action_group.rs | 4 +- gio/src/auto/app_info.rs | 8 +-- gio/src/auto/dbus_interface_skeleton.rs | 4 +- gio/src/auto/dbus_object.rs | 4 +- gio/src/auto/dbus_proxy.rs | 4 +- gio/src/auto/desktop_app_info.rs | 4 +- gio/src/auto/drive.rs | 8 +-- gio/src/auto/emblemed_icon.rs | 4 +- gio/src/auto/file_enumerator.rs | 15 ++-- gio/src/auto/file_info.rs | 2 +- gio/src/auto/filename_completer.rs | 2 +- gio/src/auto/functions.rs | 10 +-- gio/src/auto/mount.rs | 4 +- gio/src/auto/proxy_resolver.rs | 4 +- gio/src/auto/resolver.rs | 95 +++++++++++++++++-------- gio/src/auto/resource.rs | 2 +- gio/src/auto/settings.rs | 4 +- gio/src/auto/settings_backend.rs | 2 +- gio/src/auto/settings_schema.rs | 4 +- gio/src/auto/srv_target.rs | 2 +- gio/src/auto/tls_certificate.rs | 2 +- gio/src/auto/tls_client_connection.rs | 4 +- gio/src/auto/tls_database.rs | 20 ++++-- gio/src/auto/versions.txt | 4 +- gio/src/auto/volume.rs | 4 +- gio/src/auto/volume_monitor.rs | 12 ++-- gio/src/file_enumerator.rs | 4 +- gio/sys/versions.txt | 4 +- gir | 2 +- gir-files | 2 +- glib/gobject-sys/versions.txt | 4 +- glib/src/auto/functions.rs | 2 +- glib/src/auto/main_context.rs | 2 +- glib/src/auto/markup_parse_context.rs | 2 +- glib/src/auto/uri.rs | 2 +- glib/src/auto/versions.txt | 4 +- glib/sys/versions.txt | 4 +- graphene/src/auto/versions.txt | 4 +- graphene/sys/versions.txt | 4 +- pango/src/auto/attr_list.rs | 2 +- pango/src/auto/context.rs | 2 +- pango/src/auto/font_family.rs | 4 +- pango/src/auto/font_map.rs | 4 +- pango/src/auto/functions.rs | 4 +- pango/src/auto/glyph_item.rs | 2 +- pango/src/auto/language.rs | 2 +- pango/src/auto/layout.rs | 8 +-- pango/src/auto/versions.txt | 4 +- pango/sys/versions.txt | 4 +- pangocairo/src/auto/versions.txt | 4 +- pangocairo/sys/versions.txt | 4 +- 55 files changed, 186 insertions(+), 144 deletions(-) diff --git a/gdk-pixbuf/src/auto/pixbuf.rs b/gdk-pixbuf/src/auto/pixbuf.rs index fb7f9f28db8d..c1af026d0a1f 100644 --- a/gdk-pixbuf/src/auto/pixbuf.rs +++ b/gdk-pixbuf/src/auto/pixbuf.rs @@ -656,7 +656,7 @@ impl Pixbuf { #[doc(alias = "gdk_pixbuf_get_formats")] #[doc(alias = "get_formats")] - pub fn formats() -> Vec { + pub fn formats() -> glib::SList { unsafe { FromGlibPtrContainer::from_glib_container(ffi::gdk_pixbuf_get_formats()) } } diff --git a/gdk-pixbuf/src/auto/pixbuf_format.rs b/gdk-pixbuf/src/auto/pixbuf_format.rs index ae07ac5daa77..95e58e0922a9 100644 --- a/gdk-pixbuf/src/auto/pixbuf_format.rs +++ b/gdk-pixbuf/src/auto/pixbuf_format.rs @@ -29,7 +29,7 @@ impl PixbufFormat { #[doc(alias = "gdk_pixbuf_format_get_extensions")] #[doc(alias = "get_extensions")] - pub fn extensions(&self) -> Vec { + pub fn extensions(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::gdk_pixbuf_format_get_extensions( mut_override(self.to_glib_none().0), @@ -49,7 +49,7 @@ impl PixbufFormat { #[doc(alias = "gdk_pixbuf_format_get_mime_types")] #[doc(alias = "get_mime_types")] - pub fn mime_types(&self) -> Vec { + pub fn mime_types(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::gdk_pixbuf_format_get_mime_types( mut_override(self.to_glib_none().0), diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/gdk-pixbuf/src/auto/versions.txt +++ b/gdk-pixbuf/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/gdk-pixbuf/sys/versions.txt +++ b/gdk-pixbuf/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/gio/src/auto/action_group.rs b/gio/src/auto/action_group.rs index d23d6e697d2d..4d8bc22076ec 100644 --- a/gio/src/auto/action_group.rs +++ b/gio/src/auto/action_group.rs @@ -65,7 +65,7 @@ pub trait ActionGroupExt: 'static { fn has_action(&self, action_name: &str) -> bool; #[doc(alias = "g_action_group_list_actions")] - fn list_actions(&self) -> Vec; + fn list_actions(&self) -> glib::StrV; #[doc(alias = "action-added")] fn connect_action_added( @@ -209,7 +209,7 @@ impl> ActionGroupExt for O { } } - fn list_actions(&self) -> Vec { + fn list_actions(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_action_group_list_actions( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/app_info.rs b/gio/src/auto/app_info.rs index 7e0c03c23087..b8b845819ff0 100644 --- a/gio/src/auto/app_info.rs +++ b/gio/src/auto/app_info.rs @@ -42,13 +42,13 @@ impl AppInfo { #[doc(alias = "g_app_info_get_all")] #[doc(alias = "get_all")] - pub fn all() -> Vec { + pub fn all() -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_app_info_get_all()) } } #[doc(alias = "g_app_info_get_all_for_type")] #[doc(alias = "get_all_for_type")] - pub fn all_for_type(content_type: &str) -> Vec { + pub fn all_for_type(content_type: &str) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_app_info_get_all_for_type( content_type.to_glib_none().0, @@ -221,7 +221,7 @@ impl AppInfo { #[doc(alias = "g_app_info_get_fallback_for_type")] #[doc(alias = "get_fallback_for_type")] - pub fn fallback_for_type(content_type: &str) -> Vec { + pub fn fallback_for_type(content_type: &str) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_app_info_get_fallback_for_type( content_type.to_glib_none().0, @@ -231,7 +231,7 @@ impl AppInfo { #[doc(alias = "g_app_info_get_recommended_for_type")] #[doc(alias = "get_recommended_for_type")] - pub fn recommended_for_type(content_type: &str) -> Vec { + pub fn recommended_for_type(content_type: &str) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_app_info_get_recommended_for_type( content_type.to_glib_none().0, diff --git a/gio/src/auto/dbus_interface_skeleton.rs b/gio/src/auto/dbus_interface_skeleton.rs index 3ee27ece91b5..81de323025c7 100644 --- a/gio/src/auto/dbus_interface_skeleton.rs +++ b/gio/src/auto/dbus_interface_skeleton.rs @@ -39,7 +39,7 @@ pub trait DBusInterfaceSkeletonExt: 'static { #[doc(alias = "g_dbus_interface_skeleton_get_connections")] #[doc(alias = "get_connections")] - fn connections(&self) -> Vec; + fn connections(&self) -> glib::List; #[doc(alias = "g_dbus_interface_skeleton_get_flags")] #[doc(alias = "get_flags")] @@ -122,7 +122,7 @@ impl> DBusInterfaceSkeletonExt for O { } } - fn connections(&self) -> Vec { + fn connections(&self) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_dbus_interface_skeleton_get_connections( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/dbus_object.rs b/gio/src/auto/dbus_object.rs index a5e2bdd44329..a1e02204450f 100644 --- a/gio/src/auto/dbus_object.rs +++ b/gio/src/auto/dbus_object.rs @@ -30,7 +30,7 @@ pub trait DBusObjectExt: 'static { #[doc(alias = "g_dbus_object_get_interfaces")] #[doc(alias = "get_interfaces")] - fn interfaces(&self) -> Vec; + fn interfaces(&self) -> glib::List; #[doc(alias = "g_dbus_object_get_object_path")] #[doc(alias = "get_object_path")] @@ -59,7 +59,7 @@ impl> DBusObjectExt for O { } } - fn interfaces(&self) -> Vec { + fn interfaces(&self) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_dbus_object_get_interfaces( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/dbus_proxy.rs b/gio/src/auto/dbus_proxy.rs index a641596679fd..08afa542ab88 100644 --- a/gio/src/auto/dbus_proxy.rs +++ b/gio/src/auto/dbus_proxy.rs @@ -352,7 +352,7 @@ pub trait DBusProxyExt: 'static { #[doc(alias = "g_dbus_proxy_get_cached_property_names")] #[doc(alias = "get_cached_property_names")] - fn cached_property_names(&self) -> Vec; + fn cached_property_names(&self) -> glib::StrV; #[doc(alias = "g_dbus_proxy_get_connection")] #[doc(alias = "get_connection")] @@ -699,7 +699,7 @@ impl> DBusProxyExt for O { } } - fn cached_property_names(&self) -> Vec { + fn cached_property_names(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_dbus_proxy_get_cached_property_names( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/desktop_app_info.rs b/gio/src/auto/desktop_app_info.rs index 4daaeade91f7..932c519956b4 100644 --- a/gio/src/auto/desktop_app_info.rs +++ b/gio/src/auto/desktop_app_info.rs @@ -161,7 +161,7 @@ impl DesktopAppInfo { #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_60")))] #[doc(alias = "g_desktop_app_info_get_string_list")] #[doc(alias = "get_string_list")] - pub fn string_list(&self, key: &str) -> Vec { + pub fn string_list(&self, key: &str) -> glib::StrV { unsafe { let mut length = mem::MaybeUninit::uninit(); let ret = FromGlibContainer::from_glib_full_num( @@ -280,7 +280,7 @@ impl DesktopAppInfo { #[doc(alias = "g_desktop_app_info_get_implementations")] #[doc(alias = "get_implementations")] - pub fn implementations(interface: &str) -> Vec { + pub fn implementations(interface: &str) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_desktop_app_info_get_implementations( interface.to_glib_none().0, diff --git a/gio/src/auto/drive.rs b/gio/src/auto/drive.rs index fbe3e7e61914..1dccea5a7c62 100644 --- a/gio/src/auto/drive.rs +++ b/gio/src/auto/drive.rs @@ -58,7 +58,7 @@ pub trait DriveExt: 'static { ) -> Pin> + 'static>>; #[doc(alias = "g_drive_enumerate_identifiers")] - fn enumerate_identifiers(&self) -> Vec; + fn enumerate_identifiers(&self) -> glib::StrV; #[doc(alias = "g_drive_get_icon")] #[doc(alias = "get_icon")] @@ -86,7 +86,7 @@ pub trait DriveExt: 'static { #[doc(alias = "g_drive_get_volumes")] #[doc(alias = "get_volumes")] - fn volumes(&self) -> Vec; + fn volumes(&self) -> glib::List; #[doc(alias = "g_drive_has_media")] fn has_media(&self) -> bool; @@ -259,7 +259,7 @@ impl> DriveExt for O { )) } - fn enumerate_identifiers(&self) -> Vec { + fn enumerate_identifiers(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_drive_enumerate_identifiers( self.as_ref().to_glib_none().0, @@ -304,7 +304,7 @@ impl> DriveExt for O { } } - fn volumes(&self) -> Vec { + fn volumes(&self) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_drive_get_volumes( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/emblemed_icon.rs b/gio/src/auto/emblemed_icon.rs index afc8fea7821d..6a51f0369f85 100644 --- a/gio/src/auto/emblemed_icon.rs +++ b/gio/src/auto/emblemed_icon.rs @@ -38,7 +38,7 @@ pub trait EmblemedIconExt: 'static { #[doc(alias = "g_emblemed_icon_get_emblems")] #[doc(alias = "get_emblems")] - fn emblems(&self) -> Vec; + fn emblems(&self) -> glib::List; #[doc(alias = "g_emblemed_icon_get_icon")] #[doc(alias = "get_icon")] @@ -63,7 +63,7 @@ impl> EmblemedIconExt for O { } } - fn emblems(&self) -> Vec { + fn emblems(&self) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_none(ffi::g_emblemed_icon_get_emblems( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/file_enumerator.rs b/gio/src/auto/file_enumerator.rs index 8b1a6f4c54e5..495d8bd1b15b 100644 --- a/gio/src/auto/file_enumerator.rs +++ b/gio/src/auto/file_enumerator.rs @@ -57,7 +57,7 @@ pub trait FileEnumeratorExt: 'static { ) -> Result, glib::Error>; #[doc(alias = "g_file_enumerator_next_files_async")] - fn next_files_async, glib::Error>) + 'static>( + fn next_files_async, glib::Error>) + 'static>( &self, num_files: i32, io_priority: glib::Priority, @@ -69,7 +69,9 @@ pub trait FileEnumeratorExt: 'static { &self, num_files: i32, io_priority: glib::Priority, - ) -> Pin, glib::Error>> + 'static>>; + ) -> Pin< + Box_, glib::Error>> + 'static>, + >; #[doc(alias = "g_file_enumerator_set_pending")] fn set_pending(&self, pending: bool); @@ -208,7 +210,7 @@ impl> FileEnumeratorExt for O { } } - fn next_files_async, glib::Error>) + 'static>( + fn next_files_async, glib::Error>) + 'static>( &self, num_files: i32, io_priority: glib::Priority, @@ -228,7 +230,7 @@ impl> FileEnumeratorExt for O { let user_data: Box_> = Box_::new(glib::thread_guard::ThreadGuard::new(callback)); unsafe extern "C" fn next_files_async_trampoline< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( _source_object: *mut glib::gobject_ffi::GObject, res: *mut crate::ffi::GAsyncResult, @@ -264,8 +266,9 @@ impl> FileEnumeratorExt for O { &self, num_files: i32, io_priority: glib::Priority, - ) -> Pin, glib::Error>> + 'static>> - { + ) -> Pin< + Box_, glib::Error>> + 'static>, + > { Box_::pin(crate::GioFuture::new( self, move |obj, cancellable, send| { diff --git a/gio/src/auto/file_info.rs b/gio/src/auto/file_info.rs index 5a61b2c27801..30c36cab550c 100644 --- a/gio/src/auto/file_info.rs +++ b/gio/src/auto/file_info.rs @@ -300,7 +300,7 @@ impl FileInfo { } #[doc(alias = "g_file_info_list_attributes")] - pub fn list_attributes(&self, name_space: Option<&str>) -> Vec { + pub fn list_attributes(&self, name_space: Option<&str>) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_file_info_list_attributes( self.to_glib_none().0, diff --git a/gio/src/auto/filename_completer.rs b/gio/src/auto/filename_completer.rs index e1ef4e1de37e..30c740c7afa4 100644 --- a/gio/src/auto/filename_completer.rs +++ b/gio/src/auto/filename_completer.rs @@ -37,7 +37,7 @@ impl FilenameCompleter { #[doc(alias = "g_filename_completer_get_completions")] #[doc(alias = "get_completions")] - pub fn completions(&self, initial_text: &str) -> Vec { + pub fn completions(&self, initial_text: &str) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_filename_completer_get_completions( self.to_glib_none().0, diff --git a/gio/src/auto/functions.rs b/gio/src/auto/functions.rs index 91699d11eed2..487a2f4bf844 100644 --- a/gio/src/auto/functions.rs +++ b/gio/src/auto/functions.rs @@ -197,7 +197,7 @@ pub fn content_type_guess( } #[doc(alias = "g_content_type_guess_for_tree")] -pub fn content_type_guess_for_tree(root: &impl IsA) -> Vec { +pub fn content_type_guess_for_tree(root: &impl IsA) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_content_type_guess_for_tree( root.as_ref().to_glib_none().0, @@ -240,7 +240,7 @@ pub fn content_type_set_mime_dirs(dirs: &[&str]) { } #[doc(alias = "g_content_types_get_registered")] -pub fn content_types_get_registered() -> Vec { +pub fn content_types_get_registered() -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_content_types_get_registered()) } } @@ -456,12 +456,12 @@ pub fn io_error_from_errno(err_no: i32) -> IOErrorEnum { } //#[doc(alias = "g_io_modules_load_all_in_directory")] -//pub fn io_modules_load_all_in_directory(dirname: impl AsRef) -> /*Ignored*/Vec { +//pub fn io_modules_load_all_in_directory(dirname: impl AsRef) -> /*Ignored*/glib::List { // unsafe { TODO: call ffi:g_io_modules_load_all_in_directory() } //} //#[doc(alias = "g_io_modules_load_all_in_directory_with_scope")] -//pub fn io_modules_load_all_in_directory_with_scope(dirname: impl AsRef, scope: /*Ignored*/&mut IOModuleScope) -> /*Ignored*/Vec { +//pub fn io_modules_load_all_in_directory_with_scope(dirname: impl AsRef, scope: /*Ignored*/&mut IOModuleScope) -> /*Ignored*/glib::List { // unsafe { TODO: call ffi:g_io_modules_load_all_in_directory_with_scope() } //} @@ -506,7 +506,7 @@ pub fn null_settings_backend_new() -> SettingsBackend { pub fn resources_enumerate_children( path: &str, lookup_flags: ResourceLookupFlags, -) -> Result, glib::Error> { +) -> Result { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_resources_enumerate_children( diff --git a/gio/src/auto/mount.rs b/gio/src/auto/mount.rs index e2e367aba8c9..f9ba253d77fe 100644 --- a/gio/src/auto/mount.rs +++ b/gio/src/auto/mount.rs @@ -104,7 +104,7 @@ pub trait MountExt: 'static { &self, force_rescan: bool, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error>; + ) -> Result; #[doc(alias = "g_mount_is_shadowed")] fn is_shadowed(&self) -> bool; @@ -351,7 +351,7 @@ impl> MountExt for O { &self, force_rescan: bool, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error> { + ) -> Result { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_mount_guess_content_type_sync( diff --git a/gio/src/auto/proxy_resolver.rs b/gio/src/auto/proxy_resolver.rs index 6dedbc5e7ff5..304f06605646 100644 --- a/gio/src/auto/proxy_resolver.rs +++ b/gio/src/auto/proxy_resolver.rs @@ -35,7 +35,7 @@ pub trait ProxyResolverExt: 'static { &self, uri: &str, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error>; + ) -> Result; #[doc(alias = "g_proxy_resolver_lookup_async")] fn lookup_async, glib::Error>) + 'static>( @@ -66,7 +66,7 @@ impl> ProxyResolverExt for O { &self, uri: &str, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error> { + ) -> Result { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_proxy_resolver_lookup( diff --git a/gio/src/auto/resolver.rs b/gio/src/auto/resolver.rs index 67ff1881383f..00a59ca2da5a 100644 --- a/gio/src/auto/resolver.rs +++ b/gio/src/auto/resolver.rs @@ -69,10 +69,10 @@ pub trait ResolverExt: 'static { &self, hostname: &str, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error>; + ) -> Result, glib::Error>; #[doc(alias = "g_resolver_lookup_by_name_async")] - fn lookup_by_name_async, glib::Error>) + 'static>( + fn lookup_by_name_async, glib::Error>) + 'static>( &self, hostname: &str, cancellable: Option<&impl IsA>, @@ -82,7 +82,12 @@ pub trait ResolverExt: 'static { fn lookup_by_name_future( &self, hostname: &str, - ) -> Pin, glib::Error>> + 'static>>; + ) -> Pin< + Box_< + dyn std::future::Future, glib::Error>> + + 'static, + >, + >; #[cfg(any(feature = "v2_60", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_60")))] @@ -92,12 +97,14 @@ pub trait ResolverExt: 'static { hostname: &str, flags: ResolverNameLookupFlags, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error>; + ) -> Result, glib::Error>; #[cfg(any(feature = "v2_60", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_60")))] #[doc(alias = "g_resolver_lookup_by_name_with_flags_async")] - fn lookup_by_name_with_flags_async, glib::Error>) + 'static>( + fn lookup_by_name_with_flags_async< + P: FnOnce(Result, glib::Error>) + 'static, + >( &self, hostname: &str, flags: ResolverNameLookupFlags, @@ -111,7 +118,12 @@ pub trait ResolverExt: 'static { &self, hostname: &str, flags: ResolverNameLookupFlags, - ) -> Pin, glib::Error>> + 'static>>; + ) -> Pin< + Box_< + dyn std::future::Future, glib::Error>> + + 'static, + >, + >; #[doc(alias = "g_resolver_lookup_records")] fn lookup_records( @@ -119,10 +131,10 @@ pub trait ResolverExt: 'static { rrname: &str, record_type: ResolverRecordType, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error>; + ) -> Result, glib::Error>; #[doc(alias = "g_resolver_lookup_records_async")] - fn lookup_records_async, glib::Error>) + 'static>( + fn lookup_records_async, glib::Error>) + 'static>( &self, rrname: &str, record_type: ResolverRecordType, @@ -135,7 +147,10 @@ pub trait ResolverExt: 'static { rrname: &str, record_type: ResolverRecordType, ) -> Pin< - Box_, glib::Error>> + 'static>, + Box_< + dyn std::future::Future, glib::Error>> + + 'static, + >, >; #[doc(alias = "g_resolver_lookup_service")] @@ -145,10 +160,10 @@ pub trait ResolverExt: 'static { protocol: &str, domain: &str, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error>; + ) -> Result, glib::Error>; #[doc(alias = "g_resolver_lookup_service_async")] - fn lookup_service_async, glib::Error>) + 'static>( + fn lookup_service_async, glib::Error>) + 'static>( &self, service: &str, protocol: &str, @@ -162,7 +177,11 @@ pub trait ResolverExt: 'static { service: &str, protocol: &str, domain: &str, - ) -> Pin, glib::Error>> + 'static>>; + ) -> Pin< + Box_< + dyn std::future::Future, glib::Error>> + 'static, + >, + >; #[doc(alias = "g_resolver_set_default")] fn set_default(&self); @@ -263,7 +282,7 @@ impl> ResolverExt for O { &self, hostname: &str, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error> { + ) -> Result, glib::Error> { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_resolver_lookup_by_name( @@ -280,7 +299,7 @@ impl> ResolverExt for O { } } - fn lookup_by_name_async, glib::Error>) + 'static>( + fn lookup_by_name_async, glib::Error>) + 'static>( &self, hostname: &str, cancellable: Option<&impl IsA>, @@ -299,7 +318,7 @@ impl> ResolverExt for O { let user_data: Box_> = Box_::new(glib::thread_guard::ThreadGuard::new(callback)); unsafe extern "C" fn lookup_by_name_async_trampoline< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( _source_object: *mut glib::gobject_ffi::GObject, res: *mut crate::ffi::GAsyncResult, @@ -333,8 +352,12 @@ impl> ResolverExt for O { fn lookup_by_name_future( &self, hostname: &str, - ) -> Pin, glib::Error>> + 'static>> - { + ) -> Pin< + Box_< + dyn std::future::Future, glib::Error>> + + 'static, + >, + > { let hostname = String::from(hostname); Box_::pin(crate::GioFuture::new( self, @@ -353,7 +376,7 @@ impl> ResolverExt for O { hostname: &str, flags: ResolverNameLookupFlags, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error> { + ) -> Result, glib::Error> { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_resolver_lookup_by_name_with_flags( @@ -374,7 +397,7 @@ impl> ResolverExt for O { #[cfg(any(feature = "v2_60", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_60")))] fn lookup_by_name_with_flags_async< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( &self, hostname: &str, @@ -395,7 +418,7 @@ impl> ResolverExt for O { let user_data: Box_> = Box_::new(glib::thread_guard::ThreadGuard::new(callback)); unsafe extern "C" fn lookup_by_name_with_flags_async_trampoline< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( _source_object: *mut glib::gobject_ffi::GObject, res: *mut crate::ffi::GAsyncResult, @@ -436,8 +459,12 @@ impl> ResolverExt for O { &self, hostname: &str, flags: ResolverNameLookupFlags, - ) -> Pin, glib::Error>> + 'static>> - { + ) -> Pin< + Box_< + dyn std::future::Future, glib::Error>> + + 'static, + >, + > { let hostname = String::from(hostname); Box_::pin(crate::GioFuture::new( self, @@ -459,7 +486,7 @@ impl> ResolverExt for O { rrname: &str, record_type: ResolverRecordType, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error> { + ) -> Result, glib::Error> { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_resolver_lookup_records( @@ -477,7 +504,7 @@ impl> ResolverExt for O { } } - fn lookup_records_async, glib::Error>) + 'static>( + fn lookup_records_async, glib::Error>) + 'static>( &self, rrname: &str, record_type: ResolverRecordType, @@ -497,7 +524,7 @@ impl> ResolverExt for O { let user_data: Box_> = Box_::new(glib::thread_guard::ThreadGuard::new(callback)); unsafe extern "C" fn lookup_records_async_trampoline< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( _source_object: *mut glib::gobject_ffi::GObject, res: *mut crate::ffi::GAsyncResult, @@ -534,7 +561,10 @@ impl> ResolverExt for O { rrname: &str, record_type: ResolverRecordType, ) -> Pin< - Box_, glib::Error>> + 'static>, + Box_< + dyn std::future::Future, glib::Error>> + + 'static, + >, > { let rrname = String::from(rrname); Box_::pin(crate::GioFuture::new( @@ -553,7 +583,7 @@ impl> ResolverExt for O { protocol: &str, domain: &str, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error> { + ) -> Result, glib::Error> { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_resolver_lookup_service( @@ -572,7 +602,7 @@ impl> ResolverExt for O { } } - fn lookup_service_async, glib::Error>) + 'static>( + fn lookup_service_async, glib::Error>) + 'static>( &self, service: &str, protocol: &str, @@ -593,7 +623,7 @@ impl> ResolverExt for O { let user_data: Box_> = Box_::new(glib::thread_guard::ThreadGuard::new(callback)); unsafe extern "C" fn lookup_service_async_trampoline< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( _source_object: *mut glib::gobject_ffi::GObject, res: *mut crate::ffi::GAsyncResult, @@ -631,8 +661,11 @@ impl> ResolverExt for O { service: &str, protocol: &str, domain: &str, - ) -> Pin, glib::Error>> + 'static>> - { + ) -> Pin< + Box_< + dyn std::future::Future, glib::Error>> + 'static, + >, + > { let service = String::from(service); let protocol = String::from(protocol); let domain = String::from(domain); diff --git a/gio/src/auto/resource.rs b/gio/src/auto/resource.rs index 8b7db0d23adc..92f4859531f5 100644 --- a/gio/src/auto/resource.rs +++ b/gio/src/auto/resource.rs @@ -23,7 +23,7 @@ impl Resource { &self, path: &str, lookup_flags: ResourceLookupFlags, - ) -> Result, glib::Error> { + ) -> Result { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_resource_enumerate_children( diff --git a/gio/src/auto/settings.rs b/gio/src/auto/settings.rs index c93916736d08..4739d669f44d 100644 --- a/gio/src/auto/settings.rs +++ b/gio/src/auto/settings.rs @@ -182,7 +182,7 @@ pub trait SettingsExt: 'static { fn is_writable(&self, name: &str) -> bool; #[doc(alias = "g_settings_list_children")] - fn list_children(&self) -> Vec; + fn list_children(&self) -> glib::StrV; #[doc(alias = "g_settings_reset")] fn reset(&self, key: &str); @@ -413,7 +413,7 @@ impl> SettingsExt for O { } } - fn list_children(&self) -> Vec { + fn list_children(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_settings_list_children( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/settings_backend.rs b/gio/src/auto/settings_backend.rs index 21b5a27ce69e..4912e4511f87 100644 --- a/gio/src/auto/settings_backend.rs +++ b/gio/src/auto/settings_backend.rs @@ -18,7 +18,7 @@ impl SettingsBackend { pub const NONE: Option<&'static SettingsBackend> = None; //#[doc(alias = "g_settings_backend_flatten_tree")] - //pub fn flatten_tree(tree: /*Ignored*/&glib::Tree) -> (glib::GString, Vec, Vec) { + //pub fn flatten_tree(tree: /*Ignored*/&glib::Tree) -> (glib::GString, Vec, glib::PtrSlice) { // unsafe { TODO: call ffi:g_settings_backend_flatten_tree() } //} diff --git a/gio/src/auto/settings_schema.rs b/gio/src/auto/settings_schema.rs index 36feb724fdb1..f88ab5db1c02 100644 --- a/gio/src/auto/settings_schema.rs +++ b/gio/src/auto/settings_schema.rs @@ -51,7 +51,7 @@ impl SettingsSchema { } #[doc(alias = "g_settings_schema_list_children")] - pub fn list_children(&self) -> Vec { + pub fn list_children(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_settings_schema_list_children( self.to_glib_none().0, @@ -60,7 +60,7 @@ impl SettingsSchema { } #[doc(alias = "g_settings_schema_list_keys")] - pub fn list_keys(&self) -> Vec { + pub fn list_keys(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_settings_schema_list_keys( self.to_glib_none().0, diff --git a/gio/src/auto/srv_target.rs b/gio/src/auto/srv_target.rs index 11f617745171..a7bad490bea4 100644 --- a/gio/src/auto/srv_target.rs +++ b/gio/src/auto/srv_target.rs @@ -53,7 +53,7 @@ impl SrvTarget { } //#[doc(alias = "g_srv_target_list_sort")] - //pub fn list_sort(targets: /*Unimplemented*/&[&Basic: Pointer]) -> /*Unimplemented*/Vec { + //pub fn list_sort(targets: /*Unimplemented*/&[&Basic: Pointer]) -> /*Unimplemented*/glib::List { // unsafe { TODO: call ffi:g_srv_target_list_sort() } //} } diff --git a/gio/src/auto/tls_certificate.rs b/gio/src/auto/tls_certificate.rs index a1c514ad5593..480a124f5f21 100644 --- a/gio/src/auto/tls_certificate.rs +++ b/gio/src/auto/tls_certificate.rs @@ -150,7 +150,7 @@ impl TlsCertificate { #[doc(alias = "g_tls_certificate_list_new_from_file")] pub fn list_new_from_file( file: impl AsRef, - ) -> Result, glib::Error> { + ) -> Result, glib::Error> { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_tls_certificate_list_new_from_file( diff --git a/gio/src/auto/tls_client_connection.rs b/gio/src/auto/tls_client_connection.rs index 431e1d3b161d..34dcd881f5a0 100644 --- a/gio/src/auto/tls_client_connection.rs +++ b/gio/src/auto/tls_client_connection.rs @@ -50,7 +50,7 @@ pub trait TlsClientConnectionExt: 'static { #[doc(alias = "g_tls_client_connection_get_accepted_cas")] #[doc(alias = "get_accepted_cas")] - fn accepted_cas(&self) -> Vec; + fn accepted_cas(&self) -> glib::List; #[doc(alias = "g_tls_client_connection_get_server_identity")] #[doc(alias = "get_server_identity")] @@ -91,7 +91,7 @@ impl> TlsClientConnectionExt for O { } } - fn accepted_cas(&self) -> Vec { + fn accepted_cas(&self) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_tls_client_connection_get_accepted_cas( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/tls_database.rs b/gio/src/auto/tls_database.rs index ee31b4b25da7..29c3a9d84095 100644 --- a/gio/src/auto/tls_database.rs +++ b/gio/src/auto/tls_database.rs @@ -90,11 +90,11 @@ pub trait TlsDatabaseExt: 'static { interaction: Option<&impl IsA>, flags: TlsDatabaseLookupFlags, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error>; + ) -> Result, glib::Error>; #[doc(alias = "g_tls_database_lookup_certificates_issued_by_async")] fn lookup_certificates_issued_by_async< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( &self, issuer_raw_dn: &glib::ByteArray, @@ -110,7 +110,10 @@ pub trait TlsDatabaseExt: 'static { interaction: Option<&(impl IsA + Clone + 'static)>, flags: TlsDatabaseLookupFlags, ) -> Pin< - Box_, glib::Error>> + 'static>, + Box_< + dyn std::future::Future, glib::Error>> + + 'static, + >, >; #[doc(alias = "g_tls_database_verify_chain")] @@ -383,7 +386,7 @@ impl> TlsDatabaseExt for O { interaction: Option<&impl IsA>, flags: TlsDatabaseLookupFlags, cancellable: Option<&impl IsA>, - ) -> Result, glib::Error> { + ) -> Result, glib::Error> { unsafe { let mut error = ptr::null_mut(); let ret = ffi::g_tls_database_lookup_certificates_issued_by( @@ -403,7 +406,7 @@ impl> TlsDatabaseExt for O { } fn lookup_certificates_issued_by_async< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( &self, issuer_raw_dn: &glib::ByteArray, @@ -425,7 +428,7 @@ impl> TlsDatabaseExt for O { let user_data: Box_> = Box_::new(glib::thread_guard::ThreadGuard::new(callback)); unsafe extern "C" fn lookup_certificates_issued_by_async_trampoline< - P: FnOnce(Result, glib::Error>) + 'static, + P: FnOnce(Result, glib::Error>) + 'static, >( _source_object: *mut glib::gobject_ffi::GObject, res: *mut crate::ffi::GAsyncResult, @@ -467,7 +470,10 @@ impl> TlsDatabaseExt for O { interaction: Option<&(impl IsA + Clone + 'static)>, flags: TlsDatabaseLookupFlags, ) -> Pin< - Box_, glib::Error>> + 'static>, + Box_< + dyn std::future::Future, glib::Error>> + + 'static, + >, > { let issuer_raw_dn = issuer_raw_dn.clone(); let interaction = interaction.map(ToOwned::to_owned); diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/gio/src/auto/versions.txt +++ b/gio/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/gio/src/auto/volume.rs b/gio/src/auto/volume.rs index bca23bf3b3e5..c4e4f220c310 100644 --- a/gio/src/auto/volume.rs +++ b/gio/src/auto/volume.rs @@ -49,7 +49,7 @@ pub trait VolumeExt: 'static { ) -> Pin> + 'static>>; #[doc(alias = "g_volume_enumerate_identifiers")] - fn enumerate_identifiers(&self) -> Vec; + fn enumerate_identifiers(&self) -> glib::StrV; #[doc(alias = "g_volume_get_activation_root")] #[doc(alias = "get_activation_root")] @@ -196,7 +196,7 @@ impl> VolumeExt for O { )) } - fn enumerate_identifiers(&self) -> Vec { + fn enumerate_identifiers(&self) -> glib::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_volume_enumerate_identifiers( self.as_ref().to_glib_none().0, diff --git a/gio/src/auto/volume_monitor.rs b/gio/src/auto/volume_monitor.rs index 9121d5ebbf92..430d9a40d878 100644 --- a/gio/src/auto/volume_monitor.rs +++ b/gio/src/auto/volume_monitor.rs @@ -31,7 +31,7 @@ impl VolumeMonitor { pub trait VolumeMonitorExt: 'static { #[doc(alias = "g_volume_monitor_get_connected_drives")] #[doc(alias = "get_connected_drives")] - fn connected_drives(&self) -> Vec; + fn connected_drives(&self) -> glib::List; #[doc(alias = "g_volume_monitor_get_mount_for_uuid")] #[doc(alias = "get_mount_for_uuid")] @@ -39,7 +39,7 @@ pub trait VolumeMonitorExt: 'static { #[doc(alias = "g_volume_monitor_get_mounts")] #[doc(alias = "get_mounts")] - fn mounts(&self) -> Vec; + fn mounts(&self) -> glib::List; #[doc(alias = "g_volume_monitor_get_volume_for_uuid")] #[doc(alias = "get_volume_for_uuid")] @@ -47,7 +47,7 @@ pub trait VolumeMonitorExt: 'static { #[doc(alias = "g_volume_monitor_get_volumes")] #[doc(alias = "get_volumes")] - fn volumes(&self) -> Vec; + fn volumes(&self) -> glib::List; #[doc(alias = "drive-changed")] fn connect_drive_changed(&self, f: F) -> SignalHandlerId; @@ -87,7 +87,7 @@ pub trait VolumeMonitorExt: 'static { } impl> VolumeMonitorExt for O { - fn connected_drives(&self) -> Vec { + fn connected_drives(&self) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_volume_monitor_get_connected_drives( self.as_ref().to_glib_none().0, @@ -104,7 +104,7 @@ impl> VolumeMonitorExt for O { } } - fn mounts(&self) -> Vec { + fn mounts(&self) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_volume_monitor_get_mounts( self.as_ref().to_glib_none().0, @@ -121,7 +121,7 @@ impl> VolumeMonitorExt for O { } } - fn volumes(&self) -> Vec { + fn volumes(&self) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_volume_monitor_get_volumes( self.as_ref().to_glib_none().0, diff --git a/gio/src/file_enumerator.rs b/gio/src/file_enumerator.rs index dc9f3f595d71..5b3fd097fe7f 100644 --- a/gio/src/file_enumerator.rs +++ b/gio/src/file_enumerator.rs @@ -40,7 +40,7 @@ impl> FileEnumeratorExtManual for O { /// A [`Stream`](futures_core::Stream) used to enumerate files in directories. pub struct FileEnumeratorStream { enumerator: FileEnumerator, - future: Option, glib::Error>>>, + future: Option, glib::Error>>>, num_files: i32, priority: glib::Priority, } @@ -57,7 +57,7 @@ impl std::fmt::Debug for FileEnumeratorStream { } impl futures_core::Stream for FileEnumeratorStream { - type Item = Result, glib::Error>; + type Item = Result, glib::Error>; #[inline] fn poll_next( diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/gio/sys/versions.txt +++ b/gio/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/gir b/gir index 425f84d5af7f..95ecf2cb6f7a 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 425f84d5af7ff4e599b2528bb0e2f53657feb5cf +Subproject commit 95ecf2cb6f7aed0adb567e6b5c4eec1a9fe8af1a diff --git a/gir-files b/gir-files index 318e14efee40..b985117c8977 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 318e14efee40a863b13e4dda983a41f179d9daf3 +Subproject commit b985117c897783161d0237ea2fd1c881c555a393 diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/glib/gobject-sys/versions.txt +++ b/glib/gobject-sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/glib/src/auto/functions.rs b/glib/src/auto/functions.rs index 9aa4d4ecab67..3d17f520b0bd 100644 --- a/glib/src/auto/functions.rs +++ b/glib/src/auto/functions.rs @@ -395,7 +395,7 @@ pub fn language_names_with_category(category_name: &str) -> Vec #[doc(alias = "g_get_locale_variants")] #[doc(alias = "get_locale_variants")] -pub fn locale_variants(locale: &str) -> Vec { +pub fn locale_variants(locale: &str) -> crate::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_get_locale_variants(locale.to_glib_none().0)) } diff --git a/glib/src/auto/main_context.rs b/glib/src/auto/main_context.rs index 03515f6a26ed..3771bbc240a0 100644 --- a/glib/src/auto/main_context.rs +++ b/glib/src/auto/main_context.rs @@ -86,7 +86,7 @@ impl MainContext { } //#[doc(alias = "g_main_context_query")] - //pub fn query(&self, max_priority: i32, fds: /*Ignored*/Vec) -> (i32, i32) { + //pub fn query(&self, max_priority: i32, fds: /*Ignored*/crate::Slice) -> (i32, i32) { // unsafe { TODO: call ffi:g_main_context_query() } //} diff --git a/glib/src/auto/markup_parse_context.rs b/glib/src/auto/markup_parse_context.rs index f071797ff5f6..4dfd8c6065dc 100644 --- a/glib/src/auto/markup_parse_context.rs +++ b/glib/src/auto/markup_parse_context.rs @@ -48,7 +48,7 @@ impl MarkupParseContext { //#[doc(alias = "g_markup_parse_context_get_element_stack")] //#[doc(alias = "get_element_stack")] - //pub fn element_stack(&self) -> /*Unimplemented*/Vec { + //pub fn element_stack(&self) -> /*Unimplemented*/crate::SList { // unsafe { TODO: call ffi:g_markup_parse_context_get_element_stack() } //} diff --git a/glib/src/auto/uri.rs b/glib/src/auto/uri.rs index d1e2c37967d1..24c3c5d1fabd 100644 --- a/glib/src/auto/uri.rs +++ b/glib/src/auto/uri.rs @@ -268,7 +268,7 @@ impl Uri { } #[doc(alias = "g_uri_list_extract_uris")] - pub fn list_extract_uris(uri_list: &str) -> Vec { + pub fn list_extract_uris(uri_list: &str) -> crate::StrV { unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_uri_list_extract_uris( uri_list.to_glib_none().0, diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/glib/src/auto/versions.txt +++ b/glib/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/glib/sys/versions.txt +++ b/glib/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/graphene/src/auto/versions.txt +++ b/graphene/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/graphene/sys/versions.txt +++ b/graphene/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/pango/src/auto/attr_list.rs b/pango/src/auto/attr_list.rs index e7ac82d5de91..04d75f16e1ac 100644 --- a/pango/src/auto/attr_list.rs +++ b/pango/src/auto/attr_list.rs @@ -58,7 +58,7 @@ impl AttrList { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_44")))] #[doc(alias = "pango_attr_list_get_attributes")] #[doc(alias = "get_attributes")] - pub fn attributes(&self) -> Vec { + pub fn attributes(&self) -> glib::SList { unsafe { FromGlibPtrContainer::from_glib_full(ffi::pango_attr_list_get_attributes( self.to_glib_none().0, diff --git a/pango/src/auto/context.rs b/pango/src/auto/context.rs index 6065f2e0d4fe..6ac6fb3f0ba6 100644 --- a/pango/src/auto/context.rs +++ b/pango/src/auto/context.rs @@ -118,7 +118,7 @@ impl Context { } #[doc(alias = "pango_context_list_families")] - pub fn list_families(&self) -> Vec { + pub fn list_families(&self) -> glib::PtrSlice { unsafe { let mut families = ptr::null_mut(); let mut n_families = mem::MaybeUninit::uninit(); diff --git a/pango/src/auto/font_family.rs b/pango/src/auto/font_family.rs index c958400d4cdb..23cf1b53448c 100644 --- a/pango/src/auto/font_family.rs +++ b/pango/src/auto/font_family.rs @@ -46,7 +46,7 @@ pub trait FontFamilyExt: 'static { fn is_variable(&self) -> bool; #[doc(alias = "pango_font_family_list_faces")] - fn list_faces(&self) -> Vec; + fn list_faces(&self) -> glib::PtrSlice; } impl> FontFamilyExt for O { @@ -87,7 +87,7 @@ impl> FontFamilyExt for O { } } - fn list_faces(&self) -> Vec { + fn list_faces(&self) -> glib::PtrSlice { unsafe { let mut faces = ptr::null_mut(); let mut n_faces = mem::MaybeUninit::uninit(); diff --git a/pango/src/auto/font_map.rs b/pango/src/auto/font_map.rs index 5ccc4707b5fb..5088314dc6aa 100644 --- a/pango/src/auto/font_map.rs +++ b/pango/src/auto/font_map.rs @@ -37,7 +37,7 @@ pub trait FontMapExt: 'static { fn serial(&self) -> u32; #[doc(alias = "pango_font_map_list_families")] - fn list_families(&self) -> Vec; + fn list_families(&self) -> glib::PtrSlice; #[doc(alias = "pango_font_map_load_font")] fn load_font(&self, context: &Context, desc: &FontDescription) -> Option; @@ -81,7 +81,7 @@ impl> FontMapExt for O { unsafe { ffi::pango_font_map_get_serial(self.as_ref().to_glib_none().0) } } - fn list_families(&self) -> Vec { + fn list_families(&self) -> glib::PtrSlice { unsafe { let mut families = ptr::null_mut(); let mut n_families = mem::MaybeUninit::uninit(); diff --git a/pango/src/auto/functions.rs b/pango/src/auto/functions.rs index f704e9f7a46a..af1891a5da93 100644 --- a/pango/src/auto/functions.rs +++ b/pango/src/auto/functions.rs @@ -66,7 +66,7 @@ pub fn itemize( length: i32, attrs: &AttrList, cached_iter: Option<&AttrIterator>, -) -> Vec { +) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::pango_itemize( context.to_glib_none().0, @@ -88,7 +88,7 @@ pub fn itemize_with_base_dir( length: i32, attrs: &AttrList, cached_iter: Option<&AttrIterator>, -) -> Vec { +) -> glib::List { unsafe { FromGlibPtrContainer::from_glib_full(ffi::pango_itemize_with_base_dir( context.to_glib_none().0, diff --git a/pango/src/auto/glyph_item.rs b/pango/src/auto/glyph_item.rs index 4bff74a1caf6..533a1d498a14 100644 --- a/pango/src/auto/glyph_item.rs +++ b/pango/src/auto/glyph_item.rs @@ -18,7 +18,7 @@ glib::wrapper! { impl GlyphItem { #[doc(alias = "pango_glyph_item_apply_attrs")] - pub fn apply_attrs(&mut self, text: &str, list: &AttrList) -> Vec { + pub fn apply_attrs(&mut self, text: &str, list: &AttrList) -> glib::SList { unsafe { FromGlibPtrContainer::from_glib_full(ffi::pango_glyph_item_apply_attrs( self.to_glib_none_mut().0, diff --git a/pango/src/auto/language.rs b/pango/src/auto/language.rs index d001a2c13c89..92d92a4e2a0b 100644 --- a/pango/src/auto/language.rs +++ b/pango/src/auto/language.rs @@ -74,7 +74,7 @@ impl Language { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_48")))] #[doc(alias = "pango_language_get_preferred")] #[doc(alias = "get_preferred")] - pub fn preferred() -> Vec { + pub fn preferred() -> glib::PtrSlice { unsafe { FromGlibPtrContainer::from_glib_none(ffi::pango_language_get_preferred()) } } } diff --git a/pango/src/auto/layout.rs b/pango/src/auto/layout.rs index 487f6dad18cb..b8844818cf32 100644 --- a/pango/src/auto/layout.rs +++ b/pango/src/auto/layout.rs @@ -229,7 +229,7 @@ impl Layout { #[doc(alias = "pango_layout_get_lines")] #[doc(alias = "get_lines")] - pub fn lines(&self) -> Vec { + pub fn lines(&self) -> glib::SList { unsafe { FromGlibPtrContainer::from_glib_none(ffi::pango_layout_get_lines(self.to_glib_none().0)) } @@ -237,7 +237,7 @@ impl Layout { #[doc(alias = "pango_layout_get_lines_readonly")] #[doc(alias = "get_lines_readonly")] - pub fn lines_readonly(&self) -> Vec { + pub fn lines_readonly(&self) -> glib::SList { unsafe { FromGlibPtrContainer::from_glib_none(ffi::pango_layout_get_lines_readonly( self.to_glib_none().0, @@ -247,13 +247,13 @@ impl Layout { //#[doc(alias = "pango_layout_get_log_attrs")] //#[doc(alias = "get_log_attrs")] - //pub fn log_attrs(&self, attrs: /*Ignored*/Vec) -> i32 { + //pub fn log_attrs(&self, attrs: /*Ignored*/glib::Slice) -> i32 { // unsafe { TODO: call ffi:pango_layout_get_log_attrs() } //} //#[doc(alias = "pango_layout_get_log_attrs_readonly")] //#[doc(alias = "get_log_attrs_readonly")] - //pub fn log_attrs_readonly(&self) -> /*Ignored*/Vec { + //pub fn log_attrs_readonly(&self) -> /*Ignored*/glib::Slice { // unsafe { TODO: call ffi:pango_layout_get_log_attrs_readonly() } //} diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/pango/src/auto/versions.txt +++ b/pango/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/pango/sys/versions.txt +++ b/pango/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/pangocairo/src/auto/versions.txt +++ b/pangocairo/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977) diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt index bd79b2e80f89..9b2d3e2c28a1 100644 --- a/pangocairo/sys/versions.txt +++ b/pangocairo/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f) -from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40) +Generated by gir (https://github.com/gtk-rs/gir @ 95ecf2cb6f7a) +from gir-files (https://github.com/gtk-rs/gir-files @ b985117c8977)