Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerate gir for returned collections #1041

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gdk-pixbuf/src/auto/pixbuf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ impl Pixbuf {

#[doc(alias = "gdk_pixbuf_get_formats")]
#[doc(alias = "get_formats")]
pub fn formats() -> Vec<PixbufFormat> {
pub fn formats() -> glib::SList<PixbufFormat> {
unsafe { FromGlibPtrContainer::from_glib_container(ffi::gdk_pixbuf_get_formats()) }
}

Expand Down
4 changes: 2 additions & 2 deletions gdk-pixbuf/src/auto/pixbuf_format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ impl PixbufFormat {

#[doc(alias = "gdk_pixbuf_format_get_extensions")]
#[doc(alias = "get_extensions")]
pub fn extensions(&self) -> Vec<glib::GString> {
pub fn extensions(&self) -> glib::StrV {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::gdk_pixbuf_format_get_extensions(
mut_override(self.to_glib_none().0),
Expand All @@ -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<glib::GString> {
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),
Expand Down
4 changes: 2 additions & 2 deletions gdk-pixbuf/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions gdk-pixbuf/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions gio/src/auto/action_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<glib::GString>;
fn list_actions(&self) -> glib::StrV;

#[doc(alias = "action-added")]
fn connect_action_added<F: Fn(&Self, &str) + 'static>(
Expand Down Expand Up @@ -209,7 +209,7 @@ impl<O: IsA<ActionGroup>> ActionGroupExt for O {
}
}

fn list_actions(&self) -> Vec<glib::GString> {
fn list_actions(&self) -> glib::StrV {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_action_group_list_actions(
self.as_ref().to_glib_none().0,
Expand Down
8 changes: 4 additions & 4 deletions gio/src/auto/app_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ impl AppInfo {

#[doc(alias = "g_app_info_get_all")]
#[doc(alias = "get_all")]
pub fn all() -> Vec<AppInfo> {
pub fn all() -> glib::List<AppInfo> {
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<AppInfo> {
pub fn all_for_type(content_type: &str) -> glib::List<AppInfo> {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_app_info_get_all_for_type(
content_type.to_glib_none().0,
Expand Down Expand Up @@ -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<AppInfo> {
pub fn fallback_for_type(content_type: &str) -> glib::List<AppInfo> {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_app_info_get_fallback_for_type(
content_type.to_glib_none().0,
Expand All @@ -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<AppInfo> {
pub fn recommended_for_type(content_type: &str) -> glib::List<AppInfo> {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_app_info_get_recommended_for_type(
content_type.to_glib_none().0,
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/dbus_interface_skeleton.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub trait DBusInterfaceSkeletonExt: 'static {

#[doc(alias = "g_dbus_interface_skeleton_get_connections")]
#[doc(alias = "get_connections")]
fn connections(&self) -> Vec<DBusConnection>;
fn connections(&self) -> glib::List<DBusConnection>;

#[doc(alias = "g_dbus_interface_skeleton_get_flags")]
#[doc(alias = "get_flags")]
Expand Down Expand Up @@ -122,7 +122,7 @@ impl<O: IsA<DBusInterfaceSkeleton>> DBusInterfaceSkeletonExt for O {
}
}

fn connections(&self) -> Vec<DBusConnection> {
fn connections(&self) -> glib::List<DBusConnection> {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_dbus_interface_skeleton_get_connections(
self.as_ref().to_glib_none().0,
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/dbus_object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub trait DBusObjectExt: 'static {

#[doc(alias = "g_dbus_object_get_interfaces")]
#[doc(alias = "get_interfaces")]
fn interfaces(&self) -> Vec<DBusInterface>;
fn interfaces(&self) -> glib::List<DBusInterface>;

#[doc(alias = "g_dbus_object_get_object_path")]
#[doc(alias = "get_object_path")]
Expand Down Expand Up @@ -59,7 +59,7 @@ impl<O: IsA<DBusObject>> DBusObjectExt for O {
}
}

fn interfaces(&self) -> Vec<DBusInterface> {
fn interfaces(&self) -> glib::List<DBusInterface> {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_dbus_object_get_interfaces(
self.as_ref().to_glib_none().0,
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/dbus_proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<glib::GString>;
fn cached_property_names(&self) -> glib::StrV;

#[doc(alias = "g_dbus_proxy_get_connection")]
#[doc(alias = "get_connection")]
Expand Down Expand Up @@ -699,7 +699,7 @@ impl<O: IsA<DBusProxy>> DBusProxyExt for O {
}
}

fn cached_property_names(&self) -> Vec<glib::GString> {
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,
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/desktop_app_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<glib::GString> {
pub fn string_list(&self, key: &str) -> glib::StrV {
unsafe {
let mut length = mem::MaybeUninit::uninit();
let ret = FromGlibContainer::from_glib_full_num(
Expand Down Expand Up @@ -280,7 +280,7 @@ impl DesktopAppInfo {

#[doc(alias = "g_desktop_app_info_get_implementations")]
#[doc(alias = "get_implementations")]
pub fn implementations(interface: &str) -> Vec<DesktopAppInfo> {
pub fn implementations(interface: &str) -> glib::List<DesktopAppInfo> {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_desktop_app_info_get_implementations(
interface.to_glib_none().0,
Expand Down
8 changes: 4 additions & 4 deletions gio/src/auto/drive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub trait DriveExt: 'static {
) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>>;

#[doc(alias = "g_drive_enumerate_identifiers")]
fn enumerate_identifiers(&self) -> Vec<glib::GString>;
fn enumerate_identifiers(&self) -> glib::StrV;

#[doc(alias = "g_drive_get_icon")]
#[doc(alias = "get_icon")]
Expand Down Expand Up @@ -86,7 +86,7 @@ pub trait DriveExt: 'static {

#[doc(alias = "g_drive_get_volumes")]
#[doc(alias = "get_volumes")]
fn volumes(&self) -> Vec<Volume>;
fn volumes(&self) -> glib::List<Volume>;

#[doc(alias = "g_drive_has_media")]
fn has_media(&self) -> bool;
Expand Down Expand Up @@ -259,7 +259,7 @@ impl<O: IsA<Drive>> DriveExt for O {
))
}

fn enumerate_identifiers(&self) -> Vec<glib::GString> {
fn enumerate_identifiers(&self) -> glib::StrV {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_drive_enumerate_identifiers(
self.as_ref().to_glib_none().0,
Expand Down Expand Up @@ -304,7 +304,7 @@ impl<O: IsA<Drive>> DriveExt for O {
}
}

fn volumes(&self) -> Vec<Volume> {
fn volumes(&self) -> glib::List<Volume> {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_drive_get_volumes(
self.as_ref().to_glib_none().0,
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/emblemed_icon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub trait EmblemedIconExt: 'static {

#[doc(alias = "g_emblemed_icon_get_emblems")]
#[doc(alias = "get_emblems")]
fn emblems(&self) -> Vec<Emblem>;
fn emblems(&self) -> glib::List<Emblem>;

#[doc(alias = "g_emblemed_icon_get_icon")]
#[doc(alias = "get_icon")]
Expand All @@ -63,7 +63,7 @@ impl<O: IsA<EmblemedIcon>> EmblemedIconExt for O {
}
}

fn emblems(&self) -> Vec<Emblem> {
fn emblems(&self) -> glib::List<Emblem> {
unsafe {
FromGlibPtrContainer::from_glib_none(ffi::g_emblemed_icon_get_emblems(
self.as_ref().to_glib_none().0,
Expand Down
15 changes: 9 additions & 6 deletions gio/src/auto/file_enumerator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pub trait FileEnumeratorExt: 'static {
) -> Result<Option<FileInfo>, glib::Error>;

#[doc(alias = "g_file_enumerator_next_files_async")]
fn next_files_async<P: FnOnce(Result<Vec<FileInfo>, glib::Error>) + 'static>(
fn next_files_async<P: FnOnce(Result<glib::List<FileInfo>, glib::Error>) + 'static>(
&self,
num_files: i32,
io_priority: glib::Priority,
Expand All @@ -69,7 +69,9 @@ pub trait FileEnumeratorExt: 'static {
&self,
num_files: i32,
io_priority: glib::Priority,
) -> Pin<Box_<dyn std::future::Future<Output = Result<Vec<FileInfo>, glib::Error>> + 'static>>;
) -> Pin<
Box_<dyn std::future::Future<Output = Result<glib::List<FileInfo>, glib::Error>> + 'static>,
>;

#[doc(alias = "g_file_enumerator_set_pending")]
fn set_pending(&self, pending: bool);
Expand Down Expand Up @@ -208,7 +210,7 @@ impl<O: IsA<FileEnumerator>> FileEnumeratorExt for O {
}
}

fn next_files_async<P: FnOnce(Result<Vec<FileInfo>, glib::Error>) + 'static>(
fn next_files_async<P: FnOnce(Result<glib::List<FileInfo>, glib::Error>) + 'static>(
&self,
num_files: i32,
io_priority: glib::Priority,
Expand All @@ -228,7 +230,7 @@ impl<O: IsA<FileEnumerator>> FileEnumeratorExt for O {
let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
Box_::new(glib::thread_guard::ThreadGuard::new(callback));
unsafe extern "C" fn next_files_async_trampoline<
P: FnOnce(Result<Vec<FileInfo>, glib::Error>) + 'static,
P: FnOnce(Result<glib::List<FileInfo>, glib::Error>) + 'static,
>(
_source_object: *mut glib::gobject_ffi::GObject,
res: *mut crate::ffi::GAsyncResult,
Expand Down Expand Up @@ -264,8 +266,9 @@ impl<O: IsA<FileEnumerator>> FileEnumeratorExt for O {
&self,
num_files: i32,
io_priority: glib::Priority,
) -> Pin<Box_<dyn std::future::Future<Output = Result<Vec<FileInfo>, glib::Error>> + 'static>>
{
) -> Pin<
Box_<dyn std::future::Future<Output = Result<glib::List<FileInfo>, glib::Error>> + 'static>,
> {
Box_::pin(crate::GioFuture::new(
self,
move |obj, cancellable, send| {
Expand Down
2 changes: 1 addition & 1 deletion gio/src/auto/file_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ impl FileInfo {
}

#[doc(alias = "g_file_info_list_attributes")]
pub fn list_attributes(&self, name_space: Option<&str>) -> Vec<glib::GString> {
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,
Expand Down
2 changes: 1 addition & 1 deletion gio/src/auto/filename_completer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<glib::GString> {
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,
Expand Down
10 changes: 5 additions & 5 deletions gio/src/auto/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<File>) -> Vec<glib::GString> {
pub fn content_type_guess_for_tree(root: &impl IsA<File>) -> glib::StrV {
unsafe {
FromGlibPtrContainer::from_glib_full(ffi::g_content_type_guess_for_tree(
root.as_ref().to_glib_none().0,
Expand Down Expand Up @@ -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<glib::GString> {
pub fn content_types_get_registered() -> glib::List<glib::GStringPtr> {
unsafe { FromGlibPtrContainer::from_glib_full(ffi::g_content_types_get_registered()) }
}

Expand Down Expand Up @@ -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<std::path::Path>) -> /*Ignored*/Vec<IOModule> {
//pub fn io_modules_load_all_in_directory(dirname: impl AsRef<std::path::Path>) -> /*Ignored*/glib::List<IOModule> {
// 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<std::path::Path>, scope: /*Ignored*/&mut IOModuleScope) -> /*Ignored*/Vec<IOModule> {
//pub fn io_modules_load_all_in_directory_with_scope(dirname: impl AsRef<std::path::Path>, scope: /*Ignored*/&mut IOModuleScope) -> /*Ignored*/glib::List<IOModule> {
// unsafe { TODO: call ffi:g_io_modules_load_all_in_directory_with_scope() }
//}

Expand Down Expand Up @@ -506,7 +506,7 @@ pub fn null_settings_backend_new() -> SettingsBackend {
pub fn resources_enumerate_children(
path: &str,
lookup_flags: ResourceLookupFlags,
) -> Result<Vec<glib::GString>, glib::Error> {
) -> Result<glib::StrV, glib::Error> {
unsafe {
let mut error = ptr::null_mut();
let ret = ffi::g_resources_enumerate_children(
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/mount.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pub trait MountExt: 'static {
&self,
force_rescan: bool,
cancellable: Option<&impl IsA<Cancellable>>,
) -> Result<Vec<glib::GString>, glib::Error>;
) -> Result<glib::StrV, glib::Error>;

#[doc(alias = "g_mount_is_shadowed")]
fn is_shadowed(&self) -> bool;
Expand Down Expand Up @@ -351,7 +351,7 @@ impl<O: IsA<Mount>> MountExt for O {
&self,
force_rescan: bool,
cancellable: Option<&impl IsA<Cancellable>>,
) -> Result<Vec<glib::GString>, glib::Error> {
) -> Result<glib::StrV, glib::Error> {
unsafe {
let mut error = ptr::null_mut();
let ret = ffi::g_mount_guess_content_type_sync(
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/proxy_resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub trait ProxyResolverExt: 'static {
&self,
uri: &str,
cancellable: Option<&impl IsA<Cancellable>>,
) -> Result<Vec<glib::GString>, glib::Error>;
) -> Result<glib::StrV, glib::Error>;

#[doc(alias = "g_proxy_resolver_lookup_async")]
fn lookup_async<P: FnOnce(Result<Vec<glib::GString>, glib::Error>) + 'static>(
Expand Down Expand Up @@ -66,7 +66,7 @@ impl<O: IsA<ProxyResolver>> ProxyResolverExt for O {
&self,
uri: &str,
cancellable: Option<&impl IsA<Cancellable>>,
) -> Result<Vec<glib::GString>, glib::Error> {
) -> Result<glib::StrV, glib::Error> {
unsafe {
let mut error = ptr::null_mut();
let ret = ffi::g_proxy_resolver_lookup(
Expand Down
Loading