From 0ebcb8cbebef316ad0266711d195d8eb9adf0ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Wed, 20 Dec 2023 16:30:30 +0100
Subject: [PATCH] misc: Use more compact typed None format

---
 src/session/view/account_settings/notifications_page.rs         | 2 +-
 src/session/view/content/invite.rs                              | 2 +-
 .../view/content/room_details/history_viewer/audio_row.rs       | 2 +-
 src/session/view/content/room_history/message_row/audio.rs      | 2 +-
 src/session/view/content/room_history/message_row/media.rs      | 2 +-
 src/session/view/media_viewer.rs                                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/session/view/account_settings/notifications_page.rs b/src/session/view/account_settings/notifications_page.rs
index 9ea235cd..b5e13ec4 100644
--- a/src/session/view/account_settings/notifications_page.rs
+++ b/src/session/view/account_settings/notifications_page.rs
@@ -153,7 +153,7 @@ mod imp {
                 );
             } else {
                 self.keywords.bind_model(
-                    Option::<&gio::ListModel>::None,
+                    None::<&gio::ListModel>,
                     clone!(@weak obj => @default-return { adw::ActionRow::new().upcast() }, move |item| obj.create_keyword_row(item)),
                 );
             }
diff --git a/src/session/view/content/invite.rs b/src/session/view/content/invite.rs
index 4f76e4bb..1c53744e 100644
--- a/src/session/view/content/invite.rs
+++ b/src/session/view/content/invite.rs
@@ -138,7 +138,7 @@ mod imp {
                             let selection = session.sidebar_list_model().selection_model();
                             if let Some(selected_room) = selection.selected_item().and_downcast::<Room>() {
                                 if selected_room == *room {
-                                    selection.set_selected_item(Option::<glib::Object>::None);
+                                    selection.set_selected_item(None::<glib::Object>);
                                 }
                             }
                         }
diff --git a/src/session/view/content/room_details/history_viewer/audio_row.rs b/src/session/view/content/room_details/history_viewer/audio_row.rs
index 6cb905ce..03e72442 100644
--- a/src/session/view/content/room_details/history_viewer/audio_row.rs
+++ b/src/session/view/content/room_details/history_viewer/audio_row.rs
@@ -124,7 +124,7 @@ impl AudioRow {
                 // The GStreamer backend doesn't work with input streams so
                 // we need to store the file.
                 // See: https://gitlab.gnome.org/GNOME/gtk/-/issues/4062
-                let (file, _) = gio::File::new_tmp(Option::<String>::None).unwrap();
+                let (file, _) = gio::File::new_tmp(None::<String>).unwrap();
                 file.replace_contents(
                     &data,
                     None,
diff --git a/src/session/view/content/room_history/message_row/audio.rs b/src/session/view/content/room_history/message_row/audio.rs
index 9d2dca91..a2ad3184 100644
--- a/src/session/view/content/room_history/message_row/audio.rs
+++ b/src/session/view/content/room_history/message_row/audio.rs
@@ -162,7 +162,7 @@ impl MessageAudio {
                         // The GStreamer backend doesn't work with input streams so
                         // we need to store the file.
                         // See: https://gitlab.gnome.org/GNOME/gtk/-/issues/4062
-                        let (file, _) = gio::File::new_tmp(Option::<String>::None).unwrap();
+                        let (file, _) = gio::File::new_tmp(None::<String>).unwrap();
                         file.replace_contents(
                             &data,
                             None,
diff --git a/src/session/view/content/room_history/message_row/media.rs b/src/session/view/content/room_history/message_row/media.rs
index 254e211a..3ffc3816 100644
--- a/src/session/view/content/room_history/message_row/media.rs
+++ b/src/session/view/content/room_history/message_row/media.rs
@@ -375,7 +375,7 @@ impl MessageMedia {
                                 // The GStreamer backend of GtkVideo doesn't work with input streams so
                                 // we need to store the file.
                                 // See: https://gitlab.gnome.org/GNOME/gtk/-/issues/4062
-                                let (file, _) = gio::File::new_tmp(Option::<String>::None).unwrap();
+                                let (file, _) = gio::File::new_tmp(None::<String>).unwrap();
                                 file.replace_contents(
                                     &data,
                                     None,
diff --git a/src/session/view/media_viewer.rs b/src/session/view/media_viewer.rs
index fe86fca9..6b9911f9 100644
--- a/src/session/view/media_viewer.rs
+++ b/src/session/view/media_viewer.rs
@@ -413,7 +413,7 @@ impl MediaViewer {
                                 // The GStreamer backend of GtkVideo doesn't work with input streams so
                                 // we need to store the file.
                                 // See: https://gitlab.gnome.org/GNOME/gtk/-/issues/4062
-                                let (file, _) = gio::File::new_tmp(Option::<String>::None).unwrap();
+                                let (file, _) = gio::File::new_tmp(None::<String>).unwrap();
                                 file.replace_contents(
                                     &data,
                                     None,