Don't skip Option for nullable collections#1728
Conversation
| pub fn content_type_guess( | ||
| filename: Option<impl AsRef<std::path::Path>>, | ||
| data: &[u8], | ||
| data: Option<&[u8]>, |
There was a problem hiding this comment.
Needs rebasing as this is now manually implemented. Can be autogenerated again :)
There was a problem hiding this comment.
it was reverted because it is an api break
There was a problem hiding this comment.
It was only reverted in the 0.20 branch. main still has it and should have it with the Option.
fengalin
force-pushed
the
nullable-arrays
branch
2 times, most recently
from
5e597f9 to
66a0c62
Compare
fengalin
force-pushed
the
nullable-arrays
branch
2 times, most recently
from
fe27928 to
147e779
Compare
|
Resumed this. Had to implement new traits for the containers. Will perform a sanity check later as this was tedious and error prone. |
fengalin
force-pushed
the
nullable-arrays
branch
from
147e779 to
f520f35
Compare
| pub fn extensions(&self) -> Option<Vec<glib::GString>> { | ||
| unsafe { | ||
| FromGlibPtrContainer::from_glib_full(ffi::gdk_pixbuf_format_get_extensions( | ||
| TryFromGlibPtrContainer::try_from_glib_full(ffi::gdk_pixbuf_format_get_extensions( |
There was a problem hiding this comment.
I would instead name it, MaybeFromGlibPtrContainer or so. Try as a prefix assumes we would get a Result back instead of an Option
There was a problem hiding this comment.
I am also not sure if all those returned Option<Vec<T>> make sense or some of them needs annotations fixes to return just Vec<T> that would be empty if there are no items.
There was a problem hiding this comment.
I would instead name it, MaybeFromGlibPtrContainer or so. Try as a prefix assumes we would get a Result back instead of an Option
Indeed. done.
I am also not sure if all those returned Option<Vec> make sense or some of them needs annotations fixes to return just Vec that would be empty if there are no items.
Yes, I went looking at the documentation for these functions and spotted some discrepancies last time I tackled this. I'll force annotations with my conclusions in a bit. I just wanted to rebase & push now that I have something usable as a whole (last time I paused, I had just figured out I had to implement all those Maybe traits).
fengalin
force-pushed
the
nullable-arrays
branch
3 times, most recently
from
cce0fa9 to
2c9291c
Compare
C containers can be NULL, which is represented by None in Rust. This commit: * adds container specific `MaybeFromGlib` traits which return an Option, * implements them for the existing containers, * base the container specific `FromGlib` implementations off the `MaybeFromGlib` implementations.
fengalin
force-pushed
the
nullable-arrays
branch
2 times, most recently
from
e4dad15 to
038bccc
Compare
* [`gdk_pixbuf_format_get_extensions`] > The array is `NULL`-terminated. * [`gdk_pixbuf_format_get_mime_types`] > The array is `NULL`-terminated. * [`g_dbus_proxy_get_cached_property_names`] > [...] `NULL` if the value is not in the cache. * [`g_file_info_list_attributes`] > [...] `NULL` on error. ==> but NULL as an error is only used for the case where `FileInfo` is NULL, which is not possible in Rust. * [`g_tls_certificate_get_dns_names`] > [...] `NULL` if it’s not available. * [`g_tls_certificate_get_ip_addresses`] > [...] `NULL` if it’s not available. * [`pango_font_get_languages`] > The array is `NULL`-terminated. * [`pango_font_face_list_sizes`] > This is only applicable to bitmap fonts. For scalable fonts, stores `NULL` at the location pointed to by sizes and `0` at the location pointed to by `n_sizes`. * [`pango_language_get_preferred`](https://docs.gtk.org/Pango/type_func.Language.get_preferred.html) > The array is `NULL`-terminated. [`gdk_pixbuf_format_get_extensions`]: https://docs.gtk.org/gdk-pixbuf/method.PixbufFormat.get_extensions.html [`gdk_pixbuf_format_get_mime_types`]: https://docs.gtk.org/gdk-pixbuf/method.PixbufFormat.get_mime_types.html [`g_dbus_proxy_get_cached_property_names`]: https://docs.gtk.org/gio/method.DBusProxy.get_cached_property.html [`g_file_info_list_attributes`]: https://docs.gtk.org/gio/method.FileInfo.list_attributes.html [`g_tls_certificate_get_dns_names`]: https://docs.gtk.org/gio/method.TlsCertificate.get_dns_names.html [`g_tls_certificate_get_ip_addresses`]: https://docs.gtk.org/gio/method.TlsCertificate.get_ip_addresses.html [`pango_font_get_languages`]: https://docs.gtk.org/Pango/method.Font.get_languages.html [`pango_font_face_list_sizes`]: https://docs.gtk.org/Pango/method.FontFace.list_sizes.html [`pango_language_get_preferred`]: https://docs.gtk.org/Pango/type_func.Language.get_preferred.html
fengalin
force-pushed
the
nullable-arrays
branch
from
038bccc to
bd41cc9
Compare
|
Postponing these changes to a future Rust bindings generator rewrite |
3 participants
Consequence of gtk-rs/gir#1622