GNOME.org
 

[fractal] misc: Don't specify type if it's not needed

commit 7e46ea6a356984ac71a9b48ccf79749c568c777d
Author: Kévin Commaille <zecakeh tedomum fr>
Date:   Wed Sep 28 17:51:56 2022 +0200

    misc: Don't specify type if it's not needed

 src/components/action_button.rs                        |  4 +---
 src/components/auth_dialog.rs                          |  2 +-
 src/components/drag_overlay.rs                         |  2 +-
 src/session/account_settings/devices_page/mod.rs       | 18 +++++++-----------
 src/session/avatar.rs                                  |  4 ++--
 src/session/content/explore/public_room.rs             |  5 +----
 .../room_details/invite_subpage/invitee_list.rs        |  2 +-
 .../room_details/member_page/members_list_view/mod.rs  |  2 +-
 src/session/content/room_history/message_row/text.rs   | 14 +++++++-------
 src/session/room/member_list.rs                        |  2 +-
 src/session/room/reaction_group.rs                     |  2 +-
 src/session/room/reaction_list.rs                      |  2 +-
 src/session/room/timeline/mod.rs                       |  3 +--
 src/session/sidebar/selection.rs                       |  4 ++--
 src/session/user.rs                                    |  2 +-
 src/session/verification/verification_list.rs          |  2 +-
 src/utils.rs                                           |  3 +--
 17 files changed, 31 insertions(+), 42 deletions(-)
---
diff --git a/src/components/action_button.rs b/src/components/action_button.rs
index 7b01e949e..ddb0dd52d 100644
--- a/src/components/action_button.rs
+++ b/src/components/action_button.rs
@@ -124,9 +124,7 @@ mod imp {
                 "icon-name" => obj.set_icon_name(value.get().unwrap()),
                 "state" => obj.set_state(value.get().unwrap()),
                 "action-name" => obj.set_action_name(value.get().unwrap()),
-                "action-target" => obj.set_action_target_value(
-                    value.get::<Option<glib::Variant>>().unwrap().as_ref(),
-                ),
+                "action-target" => obj.set_action_target_value(value.get().ok().as_ref()),
                 _ => unimplemented!(),
             }
         }
diff --git a/src/components/auth_dialog.rs b/src/components/auth_dialog.rs
index e5f84f5fc..ffac38772 100644
--- a/src/components/auth_dialog.rs
+++ b/src/components/auth_dialog.rs
@@ -155,7 +155,7 @@ mod imp {
             pspec: &glib::ParamSpec,
         ) {
             match pspec.name() {
-                "session" => self.session.set(value.get::<Session>().ok().as_ref()),
+                "session" => self.session.set(value.get().ok().as_ref()),
                 _ => unimplemented!(),
             }
         }
diff --git a/src/components/drag_overlay.rs b/src/components/drag_overlay.rs
index 5eca45468..0357d8763 100644
--- a/src/components/drag_overlay.rs
+++ b/src/components/drag_overlay.rs
@@ -79,7 +79,7 @@ mod imp {
                 "child" => self
                     .overlay
                     .set_child(value.get::<gtk::Widget>().ok().as_ref()),
-                "drop-target" => obj.set_drop_target(&value.get::<gtk::DropTarget>().unwrap()),
+                "drop-target" => obj.set_drop_target(&value.get().unwrap()),
                 _ => unimplemented!(),
             };
         }
diff --git a/src/session/account_settings/devices_page/mod.rs 
b/src/session/account_settings/devices_page/mod.rs
index 0da361a43..dc9ab2644 100644
--- a/src/session/account_settings/devices_page/mod.rs
+++ b/src/session/account_settings/devices_page/mod.rs
@@ -118,17 +118,17 @@ impl DevicesPage {
                 Some(&device_list),
                 clone!(@weak device_list => @default-panic, move |item| {
                     match item.downcast_ref::<DeviceItem>().unwrap().type_() {
-                        device_item::ItemType::Device(device) => DeviceRow::new(device, 
false).upcast::<gtk::Widget>(),
+                        device_item::ItemType::Device(device) => DeviceRow::new(device, false).upcast(),
                         device_item::ItemType::Error(error) => {
                             let row = LoadingListBoxRow::new();
                             row.set_error(Some(error));
                             row.connect_retry(clone!(@weak device_list => move|_| {
                                 device_list.load_devices()
                             }));
-                            row.upcast::<gtk::Widget>()
+                            row.upcast()
                         }
                         device_item::ItemType::LoadingSpinner => {
-                            LoadingListBoxRow::new().upcast::<gtk::Widget>()
+                            LoadingListBoxRow::new().upcast()
                         }
                     }
                 }),
@@ -171,21 +171,17 @@ impl DevicesPage {
         if let Some(child) = priv_.current_session.first_child() {
             priv_.current_session.remove(&child);
         }
-        let row = match device_list.current_device().type_() {
-            device_item::ItemType::Device(device) => {
-                DeviceRow::new(device, true).upcast::<gtk::Widget>()
-            }
+        let row: gtk::Widget = match device_list.current_device().type_() {
+            device_item::ItemType::Device(device) => DeviceRow::new(device, true).upcast(),
             device_item::ItemType::Error(error) => {
                 let row = LoadingListBoxRow::new();
                 row.set_error(Some(error));
                 row.connect_retry(clone!(@weak device_list => move|_| {
                     device_list.load_devices()
                 }));
-                row.upcast::<gtk::Widget>()
-            }
-            device_item::ItemType::LoadingSpinner => {
-                LoadingListBoxRow::new().upcast::<gtk::Widget>()
+                row.upcast()
             }
+            device_item::ItemType::LoadingSpinner => LoadingListBoxRow::new().upcast(),
         };
         priv_.current_session.append(&row);
     }
diff --git a/src/session/avatar.rs b/src/session/avatar.rs
index 336231758..35db3377f 100644
--- a/src/session/avatar.rs
+++ b/src/session/avatar.rs
@@ -94,8 +94,8 @@ mod imp {
         ) {
             match pspec.name() {
                 "needed-size" => obj.set_needed_size(value.get().unwrap()),
-                "url" => obj.set_url(value.get::<Option<&str>>().unwrap().map(Into::into)),
-                "session" => self.session.set(value.get::<Session>().ok().as_ref()),
+                "url" => obj.set_url(value.get::<&str>().ok().map(Into::into)),
+                "session" => self.session.set(value.get().ok().as_ref()),
                 "display-name" => obj.set_display_name(value.get().unwrap()),
                 _ => unimplemented!(),
             }
diff --git a/src/session/content/explore/public_room.rs b/src/session/content/explore/public_room.rs
index 5eb3e9d33..9995251d3 100644
--- a/src/session/content/explore/public_room.rs
+++ b/src/session/content/explore/public_room.rs
@@ -73,10 +73,7 @@ mod imp {
             pspec: &glib::ParamSpec,
         ) {
             match pspec.name() {
-                "room-list" => self
-                    .room_list
-                    .set(value.get::<RoomList>().unwrap())
-                    .unwrap(),
+                "room-list" => self.room_list.set(value.get().unwrap()).unwrap(),
                 _ => unimplemented!(),
             }
         }
diff --git a/src/session/content/room_details/invite_subpage/invitee_list.rs 
b/src/session/content/room_details/invite_subpage/invitee_list.rs
index fc45b3fd5..6bef7643c 100644
--- a/src/session/content/room_details/invite_subpage/invitee_list.rs
+++ b/src/session/content/room_details/invite_subpage/invitee_list.rs
@@ -128,7 +128,7 @@ mod imp {
             pspec: &glib::ParamSpec,
         ) {
             match pspec.name() {
-                "room" => self.room.set(value.get::<Room>().unwrap()).unwrap(),
+                "room" => self.room.set(value.get().unwrap()).unwrap(),
                 "search-term" => obj.set_search_term(value.get().unwrap()),
                 _ => unimplemented!(),
             }
diff --git a/src/session/content/room_details/member_page/members_list_view/mod.rs 
b/src/session/content/room_details/member_page/members_list_view/mod.rs
index 286e0c70f..766288474 100644
--- a/src/session/content/room_details/member_page/members_list_view/mod.rs
+++ b/src/session/content/room_details/member_page/members_list_view/mod.rs
@@ -73,7 +73,7 @@ mod imp {
             pspec: &glib::ParamSpec,
         ) {
             match pspec.name() {
-                "model" => obj.set_model(value.get::<Option<&gio::ListModel>>().unwrap()),
+                "model" => obj.set_model(value.get::<&gio::ListModel>().ok()),
                 _ => unimplemented!(),
             }
         }
diff --git a/src/session/content/room_history/message_row/text.rs 
b/src/session/content/room_history/message_row/text.rs
index b12eb8beb..c94c8bb24 100644
--- a/src/session/content/room_history/message_row/text.rs
+++ b/src/session/content/room_history/message_row/text.rs
@@ -210,7 +210,7 @@ fn create_widget_for_html_block(
             w.set_use_markup(true);
             w.add_css_class(&format!("h{}", n));
             w.set_ellipsize(ellipsize);
-            w.upcast::<gtk::Widget>()
+            w.upcast()
         }
         HtmlBlock::UList(elements) => {
             let bx = gtk::Box::new(gtk::Orientation::Vertical, 6);
@@ -242,7 +242,7 @@ fn create_widget_for_html_block(
                 }
             }
 
-            bx.upcast::<gtk::Widget>()
+            bx.upcast()
         }
         HtmlBlock::OList(elements) => {
             let bx = gtk::Box::new(gtk::Orientation::Vertical, 6);
@@ -274,7 +274,7 @@ fn create_widget_for_html_block(
                 }
             }
 
-            bx.upcast::<gtk::Widget>()
+            bx.upcast()
         }
         HtmlBlock::Code(s) => {
             if ellipsize {
@@ -288,7 +288,7 @@ fn create_widget_for_html_block(
                 let w = LabelWithWidgets::with_label_and_widgets(&label, Vec::<gtk::Widget>::new());
                 w.set_use_markup(true);
                 w.set_ellipsize(ellipsize);
-                w.upcast::<gtk::Widget>()
+                w.upcast()
             } else {
                 let scrolled = gtk::ScrolledWindow::new();
                 scrolled.set_policy(gtk::PolicyType::Automatic, gtk::PolicyType::Never);
@@ -300,7 +300,7 @@ fn create_widget_for_html_block(
                 view.set_editable(false);
                 view.add_css_class("codeview");
                 scrolled.set_child(Some(&view));
-                scrolled.upcast::<gtk::Widget>()
+                scrolled.upcast()
             }
         }
         HtmlBlock::Quote(blocks) => {
@@ -319,7 +319,7 @@ fn create_widget_for_html_block(
                     break;
                 }
             }
-            bx.upcast::<gtk::Widget>()
+            bx.upcast()
         }
         HtmlBlock::Text(s) => {
             let (label, widgets) = extract_mentions(s, room);
@@ -330,7 +330,7 @@ fn create_widget_for_html_block(
             let w = LabelWithWidgets::with_label_and_widgets(&label, widgets);
             w.set_use_markup(true);
             w.set_ellipsize(ellipsize);
-            w.upcast::<gtk::Widget>()
+            w.upcast()
         }
         HtmlBlock::Separator => gtk::Separator::new(gtk::Orientation::Horizontal).upcast(),
     }
diff --git a/src/session/room/member_list.rs b/src/session/room/member_list.rs
index 7f03da70b..a7b19b09b 100644
--- a/src/session/room/member_list.rs
+++ b/src/session/room/member_list.rs
@@ -76,7 +76,7 @@ mod imp {
 
             members
                 .get_index(position as usize)
-                .map(|(_user_id, member)| member.clone().upcast::<glib::Object>())
+                .map(|(_user_id, member)| member.clone().upcast())
         }
     }
 }
diff --git a/src/session/room/reaction_group.rs b/src/session/room/reaction_group.rs
index 6df0dbd44..7f723b30d 100644
--- a/src/session/room/reaction_group.rs
+++ b/src/session/room/reaction_group.rs
@@ -67,7 +67,7 @@ mod imp {
         ) {
             match pspec.name() {
                 "key" => {
-                    self.key.set(value.get::<String>().unwrap()).unwrap();
+                    self.key.set(value.get().unwrap()).unwrap();
                 }
                 _ => unimplemented!(),
             }
diff --git a/src/session/room/reaction_list.rs b/src/session/room/reaction_list.rs
index a3d60072e..91fc3029c 100644
--- a/src/session/room/reaction_list.rs
+++ b/src/session/room/reaction_list.rs
@@ -39,7 +39,7 @@ mod imp {
 
             reactions
                 .get_index(position as usize)
-                .map(|(_key, reaction_group)| reaction_group.clone().upcast::<glib::Object>())
+                .map(|(_key, reaction_group)| reaction_group.clone().upcast())
         }
     }
 }
diff --git a/src/session/room/timeline/mod.rs b/src/session/room/timeline/mod.rs
index bde0ee7a0..1bdd5f79f 100644
--- a/src/session/room/timeline/mod.rs
+++ b/src/session/room/timeline/mod.rs
@@ -148,8 +148,7 @@ mod imp {
         fn item(&self, _list_model: &Self::Type, position: u32) -> Option<glib::Object> {
             let list = self.list.borrow();
 
-            list.get(position as usize)
-                .map(|o| o.clone().upcast::<glib::Object>())
+            list.get(position as usize).map(|o| o.clone().upcast())
         }
     }
 }
diff --git a/src/session/sidebar/selection.rs b/src/session/sidebar/selection.rs
index 52befadbe..97e0007b1 100644
--- a/src/session/sidebar/selection.rs
+++ b/src/session/sidebar/selection.rs
@@ -139,7 +139,7 @@ glib::wrapper! {
 
 impl Selection {
     pub fn new<P: IsA<gio::ListModel>>(model: Option<&P>) -> Selection {
-        let model = model.map(|m| m.clone().upcast::<gio::ListModel>());
+        let model = model.map(|m| m.clone().upcast());
         glib::Object::new(&[("model", &model)]).expect("Failed to create Selection")
     }
 
@@ -160,7 +160,7 @@ impl Selection {
 
         let _guard = self.freeze_notify();
 
-        let model = model.map(|m| m.clone().upcast::<gio::ListModel>());
+        let model = model.map(|m| m.clone().upcast());
 
         let old_model = self.model();
         if old_model == model {
diff --git a/src/session/user.rs b/src/session/user.rs
index 26a6c2918..31a942795 100644
--- a/src/session/user.rs
+++ b/src/session/user.rs
@@ -116,7 +116,7 @@ mod imp {
                         .unwrap();
                 }
                 "display-name" => {
-                    obj.set_display_name(value.get::<Option<String>>().unwrap());
+                    obj.set_display_name(value.get().unwrap());
                 }
                 "session" => self.session.set(value.get().ok().as_ref()),
                 _ => unimplemented!(),
diff --git a/src/session/verification/verification_list.rs b/src/session/verification/verification_list.rs
index f50b748c9..b0f31fa44 100644
--- a/src/session/verification/verification_list.rs
+++ b/src/session/verification/verification_list.rs
@@ -114,7 +114,7 @@ mod imp {
             self.list
                 .borrow()
                 .get_index(position as usize)
-                .map(|(_, item)| item.clone().upcast::<glib::Object>())
+                .map(|(_, item)| item.clone().upcast())
         }
     }
 }
diff --git a/src/utils.rs b/src/utils.rs
index 15263924e..942a9b566 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -113,8 +113,7 @@ macro_rules! toast {
                 let widget = $crate::components::LabelWithWidgets::with_label_and_widgets(
                     &swapped_label,
                     widgets,
-                )
-                .upcast::<gtk::Widget>();
+                );
 
                 adw::Toast::builder()
                     .custom_title(&widget)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]