Merge pull request #905 from sdroege/pixbuf-nullability

gdk-pixbuf: Trust return value nullability

Author: sdroege

gdk-pixbuf/Gir.toml

@@ -8,6 +8,7 @@ work_mode = "normal"
 use_gi_docgen = true
 single_version_file = true
 deprecate_by_min_version = true
+trust_return_value_nullability = true
 
 generate = [
     "GdkPixbuf.Colorspace",
@@ -148,6 +149,10 @@ manual_traits = ["PixbufAnimationExtManual"]
         [object.function.return]
         # see https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/105#note_1277108
         nullable = false
+    [[object.function]]
+    name = "get_static_image"
+        [object.function.return]
+        nullable = true
 
 [[object]]
 name = "GdkPixbuf.PixbufFormat"

gdk-pixbuf/src/auto/pixbuf.rs

@@ -222,7 +222,7 @@ impl Pixbuf {
 
     #[doc(alias = "gdk_pixbuf_add_alpha")]
     #[must_use]
-    pub fn add_alpha(&self, substitute_color: bool, r: u8, g: u8, b: u8) -> Option<Pixbuf> {
+    pub fn add_alpha(&self, substitute_color: bool, r: u8, g: u8, b: u8) -> Pixbuf {
         unsafe {
             from_glib_full(ffi::gdk_pixbuf_add_alpha(
                 self.to_glib_none().0,
@@ -472,7 +472,7 @@ impl Pixbuf {
 
     #[doc(alias = "gdk_pixbuf_new_subpixbuf")]
     #[must_use]
-    pub fn new_subpixbuf(&self, src_x: i32, src_y: i32, width: i32, height: i32) -> Option<Pixbuf> {
+    pub fn new_subpixbuf(&self, src_x: i32, src_y: i32, width: i32, height: i32) -> Pixbuf {
         unsafe {
             from_glib_full(ffi::gdk_pixbuf_new_subpixbuf(
                 self.to_glib_none().0,
@@ -485,7 +485,7 @@ impl Pixbuf {
     }
 
     #[doc(alias = "gdk_pixbuf_read_pixel_bytes")]
-    pub fn read_pixel_bytes(&self) -> Option<glib::Bytes> {
+    pub fn read_pixel_bytes(&self) -> glib::Bytes {
         unsafe { from_glib_full(ffi::gdk_pixbuf_read_pixel_bytes(self.to_glib_none().0)) }
     }
 

gdk-pixbuf/src/auto/pixbuf_format.rs

@@ -3,6 +3,7 @@
 // DO NOT EDIT
 
 use glib::translate::*;
+use std::fmt;
 
 glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -18,7 +19,7 @@ glib::wrapper! {
 impl PixbufFormat {
     #[doc(alias = "gdk_pixbuf_format_get_description")]
     #[doc(alias = "get_description")]
-    pub fn description(&self) -> Option<glib::GString> {
+    pub fn description(&self) -> glib::GString {
         unsafe {
             from_glib_full(ffi::gdk_pixbuf_format_get_description(mut_override(
                 self.to_glib_none().0,
@@ -38,7 +39,7 @@ impl PixbufFormat {
 
     #[doc(alias = "gdk_pixbuf_format_get_license")]
     #[doc(alias = "get_license")]
-    pub fn license(&self) -> Option<glib::GString> {
+    pub fn license(&self) -> glib::GString {
         unsafe {
             from_glib_full(ffi::gdk_pixbuf_format_get_license(mut_override(
                 self.to_glib_none().0,
@@ -58,7 +59,7 @@ impl PixbufFormat {
 
     #[doc(alias = "gdk_pixbuf_format_get_name")]
     #[doc(alias = "get_name")]
-    pub fn name(&self) -> Option<glib::GString> {
+    pub fn name(&self) -> glib::GString {
         unsafe {
             from_glib_full(ffi::gdk_pixbuf_format_get_name(mut_override(
                 self.to_glib_none().0,
@@ -111,5 +112,12 @@ impl PixbufFormat {
     }
 }
 
+impl fmt::Display for PixbufFormat {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(&self.name())
+    }
+}
+
 unsafe impl Send for PixbufFormat {}
 unsafe impl Sync for PixbufFormat {}