fix nullability of return types

Author: davidmhewitt

examples/src/date_time_picker_view.rs

@@ -71,8 +71,7 @@ mod imp {
             let time_format = granite::date_time_get_default_time_format(
                 settings.enum_("clock-format") == 1,
                 false,
-            )
-            .expect("Unable to get default time format");
+            );
 
             let current_time = gtk::Label::builder()
                 .label(
@@ -88,9 +87,7 @@ mod imp {
                 .halign(gtk::Align::End)
                 .build();
 
-            let date_format = granite::date_time_get_default_date_format(true, true, true)
-                .expect("Unable to get default date format");
-
+            let date_format = granite::date_time_get_default_date_format(true, true, true);
             let current_date = gtk::Label::builder()
                 .label(
                     now.format(date_format.as_str())
@@ -164,8 +161,7 @@ impl DateTimePickerView {
             .date_picker
             .upgrade()
             .expect("Unable to get date picker")
-            .date()
-            .expect("Unable to get date from date picker");
+            .date();
 
         selected_datetime = selected_datetime
             .add_hours(
@@ -174,7 +170,6 @@ impl DateTimePickerView {
                     .upgrade()
                     .expect("Unable to get time picker")
                     .time()
-                    .expect("Unable to get time from time picker")
                     .hour(),
             )
             .expect("Unable to add hours to time");
@@ -186,7 +181,6 @@ impl DateTimePickerView {
                     .upgrade()
                     .expect("Unable to get time picker")
                     .time()
-                    .expect("Unable to get time from time picker")
                     .minute(),
             )
             .expect("Unable to add minutes to time");
@@ -195,11 +189,7 @@ impl DateTimePickerView {
             .relative_datetime
             .upgrade()
             .expect("Unable to get relative datetime label")
-            .set_label(
-                granite::date_time_get_relative_datetime(&selected_datetime)
-                    .expect("Unable to format relative datetime")
-                    .as_str(),
-            );
+            .set_label(granite::date_time_get_relative_datetime(&selected_datetime).as_str());
     }
 }
 

examples/src/main.rs

@@ -69,7 +69,7 @@ fn build_ui(app: &Application) {
         .bidirectional()
         .build();
 
-    let granite_settings = granite::Settings::default().unwrap();
+    let granite_settings = granite::Settings::default();
     gtk_settings.set_gtk_application_prefer_dark_theme(
         granite_settings.prefers_color_scheme() == granite::SettingsColorScheme::Dark,
     );

examples/src/settings_view/simple_settings_page.rs

@@ -50,7 +50,7 @@ mod imp {
                 .placeholder_text("This page's description")
                 .build();
 
-            let content_area = obj.content_area().expect("Couldn't get content area");
+            let content_area = obj.content_area();
             content_area.attach(&icon_label, 0, 0, 1, 1);
             content_area.attach(&icon_entry, 1, 0, 1, 1);
             content_area.attach(&title_label, 0, 1, 1, 1);
@@ -59,7 +59,7 @@ mod imp {
             content_area.attach(&description_entry, 1, 2, 1, 1);
 
             let button = gtk::Button::with_label("Test Button");
-            let action_area = obj.action_area().expect("Couldn't get action area");
+            let action_area = obj.action_area();
             action_area.append(&button);
 
             obj.update_status();

examples/src/welcome_view.rs

@@ -26,21 +26,17 @@ mod imp {
                 .description("This is a demo of the Granite library")
                 .build();
 
-            let vala_button = welcome
-                .append_button(
-                    &gio::ThemedIcon::new("text-x-vala"),
-                    "Visit Valadoc",
-                    "The canonical source for Vala API references",
-                )
-                .unwrap();
-
-            let source_button = welcome
-                .append_button(
-                    &gio::ThemedIcon::new("text-x-source"),
-                    "Get Granite Source",
-                    "Granite's source code is hosted on GitHub",
-                )
-                .unwrap();
+            let vala_button = welcome.append_button(
+                &gio::ThemedIcon::new("text-x-vala"),
+                "Visit Valadoc",
+                "The canonical source for Vala API references",
+            );
+
+            let source_button = welcome.append_button(
+                &gio::ThemedIcon::new("text-x-source"),
+                "Get Granite Source",
+                "Granite's source code is hosted on GitHub",
+            );
 
             let alert = granite::Placeholder::builder()
                 .title("Panic! At the button")
@@ -49,13 +45,11 @@ mod imp {
                 .build();
             alert.add_css_class(granite::STYLE_CLASS_WARNING);
 
-            let alert_action = alert
-                .append_button(
-                    &gio::ThemedIcon::new("edit-delete"),
-                    "Hide This Button",
-                    "Click here to hide this",
-                )
-                .unwrap();
+            let alert_action = alert.append_button(
+                &gio::ThemedIcon::new("edit-delete"),
+                "Hide This Button",
+                "Click here to hide this",
+            );
             alert_action.set_widget_name("alert_button");
 
             let search_placeholder = granite::Placeholder::builder()

granite/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "granite-rs"
-version = "1.4.0"
+version = "2.0.0"
 edition = "2021"
 authors = ["David Hewitt <davidmhewitt@gmail.com>"]
 readme = "../README.md"

granite/Gir.toml

@@ -9,6 +9,7 @@ single_version_file = true
 generate_safety_asserts = true
 deprecate_by_min_version = true
 generate_builder = true
+trust_return_value_nullability = true
 
 generate = [
     "Granite.*",

granite/src/auto/accel_label.rs

@@ -312,7 +312,7 @@ impl AccelLabelBuilder {
 pub trait AccelLabelExt: IsA<AccelLabel> + 'static {
     #[doc(alias = "granite_accel_label_get_action_name")]
     #[doc(alias = "get_action_name")]
-    fn action_name(&self) -> Option<glib::GString> {
+    fn action_name(&self) -> glib::GString {
         unsafe {
             from_glib_none(ffi::granite_accel_label_get_action_name(
                 self.as_ref().to_glib_none().0,
@@ -352,7 +352,7 @@ pub trait AccelLabelExt: IsA<AccelLabel> + 'static {
 
     #[doc(alias = "granite_accel_label_get_label")]
     #[doc(alias = "get_label")]
-    fn label(&self) -> Option<glib::GString> {
+    fn label(&self) -> glib::GString {
         unsafe {
             from_glib_none(ffi::granite_accel_label_get_label(
                 self.as_ref().to_glib_none().0,

granite/src/auto/date_picker.rs

@@ -557,7 +557,7 @@ impl DatePickerBuilder {
 pub trait DatePickerExt: IsA<DatePicker> + 'static {
     #[doc(alias = "granite_date_picker_get_format")]
     #[doc(alias = "get_format")]
-    fn format(&self) -> Option<glib::GString> {
+    fn format(&self) -> glib::GString {
         unsafe {
             from_glib_none(ffi::granite_date_picker_get_format(
                 self.as_ref().to_glib_none().0,
@@ -567,7 +567,7 @@ pub trait DatePickerExt: IsA<DatePicker> + 'static {
 
     #[doc(alias = "granite_date_picker_get_date")]
     #[doc(alias = "get_date")]
-    fn date(&self) -> Option<glib::DateTime> {
+    fn date(&self) -> glib::DateTime {
         unsafe {
             from_glib_none(ffi::granite_date_picker_get_date(
                 self.as_ref().to_glib_none().0,

granite/src/auto/dialog.rs

@@ -396,7 +396,7 @@ pub trait DialogExt: IsA<Dialog> + 'static {
     #[cfg(feature = "v7_5")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v7_5")))]
     #[doc(alias = "granite_dialog_add_button")]
-    fn add_button(&self, button_text: &str, response_id: i32) -> Option<gtk::Widget> {
+    fn add_button(&self, button_text: &str, response_id: i32) -> gtk::Widget {
         unsafe {
             from_glib_none(ffi::granite_dialog_add_button(
                 self.as_ref().to_glib_none().0,

granite/src/auto/functions.rs

@@ -7,7 +7,7 @@ use crate::ffi;
 use glib::{prelude::*, translate::*};
 
 #[doc(alias = "granite_date_time_get_default_time_format")]
-pub fn date_time_get_default_time_format(is_12h: bool, with_second: bool) -> Option<glib::GString> {
+pub fn date_time_get_default_time_format(is_12h: bool, with_second: bool) -> glib::GString {
     assert_initialized_main_thread!();
     unsafe {
         from_glib_full(ffi::granite_date_time_get_default_time_format(
@@ -18,7 +18,7 @@ pub fn date_time_get_default_time_format(is_12h: bool, with_second: bool) -> Opt
 }
 
 #[doc(alias = "granite_date_time_get_relative_datetime")]
-pub fn date_time_get_relative_datetime(date_time: &glib::DateTime) -> Option<glib::GString> {
+pub fn date_time_get_relative_datetime(date_time: &glib::DateTime) -> glib::GString {
     assert_initialized_main_thread!();
     unsafe {
         from_glib_full(ffi::granite_date_time_get_relative_datetime(
@@ -43,7 +43,7 @@ pub fn date_time_get_default_date_format(
     with_weekday: bool,
     with_day: bool,
     with_year: bool,
-) -> Option<glib::GString> {
+) -> glib::GString {
     assert_initialized_main_thread!();
     unsafe {
         from_glib_full(ffi::granite_date_time_get_default_date_format(
@@ -55,7 +55,7 @@ pub fn date_time_get_default_date_format(
 }
 
 #[doc(alias = "granite_date_time_seconds_to_time")]
-pub fn date_time_seconds_to_time(seconds: i32) -> Option<glib::GString> {
+pub fn date_time_seconds_to_time(seconds: i32) -> glib::GString {
     assert_initialized_main_thread!();
     unsafe { from_glib_full(ffi::granite_date_time_seconds_to_time(seconds)) }
 }
@@ -107,13 +107,13 @@ pub fn init() {
 }
 
 #[doc(alias = "granite_accel_to_string")]
-pub fn accel_to_string(accel: Option<&str>) -> Option<glib::GString> {
+pub fn accel_to_string(accel: Option<&str>) -> glib::GString {
     assert_initialized_main_thread!();
     unsafe { from_glib_full(ffi::granite_accel_to_string(accel.to_glib_none().0)) }
 }
 
 #[doc(alias = "granite_markup_accel_tooltip")]
-pub fn markup_accel_tooltip(accels: &[&str], description: Option<&str>) -> Option<glib::GString> {
+pub fn markup_accel_tooltip(accels: &[&str], description: Option<&str>) -> glib::GString {
     assert_initialized_main_thread!();
     let accels_length1 = accels.len() as _;
     unsafe {