From 3f7f0cfdb2f43fd5b683e35f7bc8d20fc9c1efbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 23 Mar 2024 18:29:00 +0100 Subject: [PATCH] chore: Remove unnecessary move with install_action --- .../account_switcher_popover.rs | 4 +-- src/components/context_menu_bin.rs | 8 ++--- src/components/pill/mod.rs | 4 +-- src/session/view/account_settings/mod.rs | 4 +-- .../view/content/explore/servers_popover.rs | 12 +++---- .../room_details/history_viewer/audio_row.rs | 4 +-- .../room_details/history_viewer/file_row.rs | 14 +++----- .../room_details/history_viewer/media_item.rs | 4 +-- .../content/room_details/members_page/mod.rs | 16 +++++----- src/session/view/content/room_details/mod.rs | 4 +-- .../content/room_history/message_row/mod.rs | 2 +- src/session/view/content/room_history/mod.rs | 32 +++++++++---------- .../room_history/read_receipts_list/mod.rs | 4 +-- src/session/view/event_details_dialog.rs | 18 ++++------- src/session/view/media_viewer.rs | 4 +-- src/session/view/session_view.rs | 12 +++---- src/window.rs | 4 +-- 17 files changed, 69 insertions(+), 81 deletions(-) diff --git a/src/account_switcher/account_switcher_popover.rs b/src/account_switcher/account_switcher_popover.rs index 55cb8ab5..cf7ec787 100644 --- a/src/account_switcher/account_switcher_popover.rs +++ b/src/account_switcher/account_switcher_popover.rs @@ -36,8 +36,8 @@ mod imp { Self::bind_template(klass); Self::Type::bind_template_callbacks(klass); - klass.install_action("account-switcher.close", None, move |item, _, _| { - item.popdown(); + klass.install_action("account-switcher.close", None, |obj, _, _| { + obj.popdown(); }); } diff --git a/src/components/context_menu_bin.rs b/src/components/context_menu_bin.rs index b3ca1570..d064bba8 100644 --- a/src/components/context_menu_bin.rs +++ b/src/components/context_menu_bin.rs @@ -54,8 +54,8 @@ mod imp { fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); - klass.install_action("context-menu.activate", None, move |widget, _, _| { - widget.open_menu_at(0, 0) + klass.install_action("context-menu.activate", None, |obj, _, _| { + obj.open_menu_at(0, 0) }); klass.add_binding_action( gdk::Key::F10, @@ -68,8 +68,8 @@ mod imp { "context-menu.activate", ); - klass.install_action("context-menu.close", None, move |widget, _, _| { - if let Some(popover) = widget.popover() { + klass.install_action("context-menu.close", None, |obj, _, _| { + if let Some(popover) = obj.popover() { popover.popdown(); } }); diff --git a/src/components/pill/mod.rs b/src/components/pill/mod.rs index cf23d60f..b9d67bbd 100644 --- a/src/components/pill/mod.rs +++ b/src/components/pill/mod.rs @@ -52,8 +52,8 @@ mod imp { fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); - klass.install_action("pill.activate", None, move |widget, _, _| { - widget.activate(); + klass.install_action("pill.activate", None, |obj, _, _| { + obj.activate(); }); add_activate_binding_action(klass, "pill.activate"); diff --git a/src/session/view/account_settings/mod.rs b/src/session/view/account_settings/mod.rs index f8f2a845..42ccea32 100644 --- a/src/session/view/account_settings/mod.rs +++ b/src/session/view/account_settings/mod.rs @@ -71,12 +71,12 @@ mod imp { klass.install_action( "account-settings.show-subpage", Some(&AccountSettingsSubpage::static_variant_type()), - move |widget, _, param| { + |obj, _, param| { let subpage = param .and_then(|variant| variant.get::()) .expect("The parameter should be a valid subpage name"); - widget.show_subpage(subpage); + obj.show_subpage(subpage); }, ); diff --git a/src/session/view/content/explore/servers_popover.rs b/src/session/view/content/explore/servers_popover.rs index 8b48ba32..a48e7d0b 100644 --- a/src/session/view/content/explore/servers_popover.rs +++ b/src/session/view/content/explore/servers_popover.rs @@ -37,17 +37,13 @@ mod imp { fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); - klass.install_action( - "explore-servers-popover.add-server", - None, - move |obj, _, _| { - obj.add_server(); - }, - ); + klass.install_action("explore-servers-popover.add-server", None, |obj, _, _| { + obj.add_server(); + }); klass.install_action( "explore-servers-popover.remove-server", Some(&String::static_variant_type()), - move |obj, _, variant| { + |obj, _, variant| { if let Some(variant) = variant.and_then(String::from_variant) { obj.remove_server(&variant); } 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 09aa8c0a..3fbd9be9 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 @@ -42,8 +42,8 @@ mod imp { fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); - klass.install_action("audio-row.toggle-play", None, move |widget, _, _| { - widget.toggle_play(); + klass.install_action("audio-row.toggle-play", None, |obj, _, _| { + obj.toggle_play(); }); } diff --git a/src/session/view/content/room_details/history_viewer/file_row.rs b/src/session/view/content/room_details/history_viewer/file_row.rs index 3aeefcd6..5b28bf16 100644 --- a/src/session/view/content/room_details/history_viewer/file_row.rs +++ b/src/session/view/content/room_details/history_viewer/file_row.rs @@ -41,15 +41,11 @@ mod imp { fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); - klass.install_action_async( - "file-row.save-file", - None, - move |widget, _, _| async move { - widget.save_file().await; - }, - ); - klass.install_action("file-row.open-file", None, move |widget, _, _| { - widget.open_file(); + klass.install_action_async("file-row.save-file", None, |obj, _, _| async move { + obj.save_file().await; + }); + klass.install_action("file-row.open-file", None, |obj, _, _| { + obj.open_file(); }); } diff --git a/src/session/view/content/room_details/history_viewer/media_item.rs b/src/session/view/content/room_details/history_viewer/media_item.rs index ee8d8e3c..646c8ee6 100644 --- a/src/session/view/content/room_details/history_viewer/media_item.rs +++ b/src/session/view/content/room_details/history_viewer/media_item.rs @@ -48,8 +48,8 @@ mod imp { klass.set_css_name("media-history-viewer-item"); - klass.install_action("media-item.activate", None, move |widget, _, _| { - widget.activate(); + klass.install_action("media-item.activate", None, |obj, _, _| { + obj.activate(); }); add_activate_binding_action(klass, "media-item.activate"); diff --git a/src/session/view/content/room_details/members_page/mod.rs b/src/session/view/content/room_details/members_page/mod.rs index 9e003d2f..c3b2354f 100644 --- a/src/session/view/content/room_details/members_page/mod.rs +++ b/src/session/view/content/room_details/members_page/mod.rs @@ -46,7 +46,7 @@ mod imp { klass.install_action( "members.show-membership-list", Some(&Membership::static_variant_type()), - move |widget, _, param| { + |obj, _, param| { let Some(membership) = param.and_then(|variant| variant.get::()) else { return; @@ -59,32 +59,32 @@ mod imp { _ => return, }; - widget.imp().navigation_view.push_by_tag(subpage); + obj.imp().navigation_view.push_by_tag(subpage); }, ); klass.install_action( "members.show-member", Some(&String::static_variant_type()), - move |widget, _, param| { + |obj, _, param| { let Some(user_id) = param .and_then(|variant| variant.get::()) .and_then(|s| UserId::parse(s).ok()) else { return; }; - let Some(room) = widget.room() else { + let Some(room) = obj.room() else { return; }; let member = room.get_or_create_members().get_or_create(user_id); let user_page = UserPage::new(&member); - user_page.connect_close(clone!(@weak widget => move |_| { - let _ = widget.activate_action("navigation.pop", None); - toast!(widget, gettext("The user is not in the room members list anymore")); + user_page.connect_close(clone!(@weak obj => move |_| { + let _ = obj.activate_action("navigation.pop", None); + toast!(obj, gettext("The user is not in the room members list anymore")); })); - widget.imp().navigation_view.push(&user_page); + obj.imp().navigation_view.push(&user_page); }, ); } diff --git a/src/session/view/content/room_details/mod.rs b/src/session/view/content/room_details/mod.rs index 38a0862a..e6a2cf6f 100644 --- a/src/session/view/content/room_details/mod.rs +++ b/src/session/view/content/room_details/mod.rs @@ -73,12 +73,12 @@ mod imp { klass.install_action( "details.show-subpage", Some(&String::static_variant_type()), - move |widget, _, param| { + |obj, _, param| { let subpage = param .and_then(|variant| variant.get::()) .expect("The parameter should be a valid subpage name"); - widget.show_subpage(subpage, false); + obj.show_subpage(subpage, false); }, ); diff --git a/src/session/view/content/room_history/message_row/mod.rs b/src/session/view/content/room_history/message_row/mod.rs index 09525247..c0872e52 100644 --- a/src/session/view/content/room_history/message_row/mod.rs +++ b/src/session/view/content/room_history/message_row/mod.rs @@ -74,7 +74,7 @@ mod imp { fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); - klass.install_action("message-row.show-media", None, move |obj, _, _| { + klass.install_action("message-row.show-media", None, |obj, _, _| { obj.show_media(); }); } diff --git a/src/session/view/content/room_history/mod.rs b/src/session/view/content/room_history/mod.rs index 2958d214..5cdf9330 100644 --- a/src/session/view/content/room_history/mod.rs +++ b/src/session/view/content/room_history/mod.rs @@ -145,30 +145,30 @@ mod imp { obj.forget().await; }); - klass.install_action("room-history.try-again", None, move |widget, _, _| { - widget.try_again(); + klass.install_action("room-history.try-again", None, |obj, _, _| { + obj.try_again(); }); klass.install_action_async("room-history.permalink", None, |obj, _, _| async move { obj.permalink().await; }); - klass.install_action("room-history.details", None, move |widget, _, _| { - widget.open_room_details(None); + klass.install_action("room-history.details", None, |obj, _, _| { + obj.open_room_details(None); }); - klass.install_action("room-history.invite-members", None, move |widget, _, _| { - widget.open_room_details(Some(room_details::SubpageName::Invite)); + klass.install_action("room-history.invite-members", None, |obj, _, _| { + obj.open_room_details(Some(room_details::SubpageName::Invite)); }); - klass.install_action("room-history.scroll-down", None, move |widget, _, _| { - widget.scroll_down(); + klass.install_action("room-history.scroll-down", None, |obj, _, _| { + obj.scroll_down(); }); klass.install_action( "room-history.scroll-to-event", Some(&EventKey::static_variant_type()), - move |widget, _, v| { + |obj, _, v| { if let Some(event_key) = v.and_then(EventKey::from_variant) { - widget.scroll_to_event(&event_key); + obj.scroll_to_event(&event_key); } }, ); @@ -176,19 +176,19 @@ mod imp { klass.install_action( "room-history.reply", Some(&String::static_variant_type()), - move |widget, _, v| { + |obj, _, v| { if let Some(event_id) = v .and_then(String::from_variant) .and_then(|s| EventId::parse(s).ok()) { - if let Some(event) = widget + if let Some(event) = obj .room() .and_then(|room| { room.timeline().event_by_key(&EventKey::EventId(event_id)) }) .and_downcast() { - widget.message_toolbar().set_reply_to(event); + obj.message_toolbar().set_reply_to(event); } } }, @@ -197,19 +197,19 @@ mod imp { klass.install_action( "room-history.edit", Some(&String::static_variant_type()), - move |widget, _, v| { + |obj, _, v| { if let Some(event_id) = v .and_then(String::from_variant) .and_then(|s| EventId::parse(s).ok()) { - if let Some(event) = widget + if let Some(event) = obj .room() .and_then(|room| { room.timeline().event_by_key(&EventKey::EventId(event_id)) }) .and_downcast() { - widget.message_toolbar().set_edit(event); + obj.message_toolbar().set_edit(event); } } }, diff --git a/src/session/view/content/room_history/read_receipts_list/mod.rs b/src/session/view/content/room_history/read_receipts_list/mod.rs index 8357c9ae..dabceffb 100644 --- a/src/session/view/content/room_history/read_receipts_list/mod.rs +++ b/src/session/view/content/room_history/read_receipts_list/mod.rs @@ -78,8 +78,8 @@ mod imp { klass.set_css_name("read-receipts-list"); klass.set_accessible_role(gtk::AccessibleRole::ToggleButton); - klass.install_action("read-receipts-list.activate", None, move |widget, _, _| { - widget.show_popover(1, 0.0, 0.0); + klass.install_action("read-receipts-list.activate", None, |obj, _, _| { + obj.show_popover(1, 0.0, 0.0); }); add_activate_binding_action(klass, "read-receipts-list.activate"); diff --git a/src/session/view/event_details_dialog.rs b/src/session/view/event_details_dialog.rs index bed14524..e95ce30e 100644 --- a/src/session/view/event_details_dialog.rs +++ b/src/session/view/event_details_dialog.rs @@ -45,17 +45,13 @@ mod imp { Self::bind_template(klass); Self::Type::bind_template_callbacks(klass); - klass.install_action( - "event-details-dialog.copy-source", - None, - move |obj, _, _| { - let clipboard = obj.clipboard(); - let buffer = obj.imp().source_view.buffer(); - let (start_iter, end_iter) = buffer.bounds(); - clipboard.set_text(&buffer.text(&start_iter, &end_iter, true)); - toast!(obj, gettext("Source copied to clipboard")) - }, - ); + klass.install_action("event-details-dialog.copy-source", None, |obj, _, _| { + let clipboard = obj.clipboard(); + let buffer = obj.imp().source_view.buffer(); + let (start_iter, end_iter) = buffer.bounds(); + clipboard.set_text(&buffer.text(&start_iter, &end_iter, true)); + toast!(obj, gettext("Source copied to clipboard")) + }); } fn instance_init(obj: &InitializingObject) { diff --git a/src/session/view/media_viewer.rs b/src/session/view/media_viewer.rs index cdd99bdd..fd815b52 100644 --- a/src/session/view/media_viewer.rs +++ b/src/session/view/media_viewer.rs @@ -73,7 +73,7 @@ mod imp { klass.set_css_name("media-viewer"); - klass.install_action("media-viewer.close", None, move |obj, _, _| { + klass.install_action("media-viewer.close", None, |obj, _, _| { obj.close(); }); klass.add_binding_action( @@ -83,7 +83,7 @@ mod imp { ); // Menu actions - klass.install_action("media-viewer.copy-image", None, move |obj, _, _| { + klass.install_action("media-viewer.copy-image", None, |obj, _, _| { obj.copy_image(); }); diff --git a/src/session/view/session_view.rs b/src/session/view/session_view.rs index 58e6d660..a0e7e51b 100644 --- a/src/session/view/session_view.rs +++ b/src/session/view/session_view.rs @@ -54,14 +54,14 @@ mod imp { fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); - klass.install_action("session.close-room", None, move |obj, _, _| { + klass.install_action("session.close-room", None, |obj, _, _| { obj.select_room(None); }); klass.install_action( "session.show-room", Some(&String::static_variant_type()), - move |obj, _, parameter| { + |obj, _, parameter| { if let Ok(room_id) = <&RoomId>::try_from(&*parameter.unwrap().get::().unwrap()) { @@ -80,15 +80,15 @@ mod imp { } }); - klass.install_action("session.show-content", None, move |obj, _, _| { + klass.install_action("session.show-content", None, |obj, _, _| { obj.show_content(); }); - klass.install_action("session.room-creation", None, move |obj, _, _| { + klass.install_action("session.room-creation", None, |obj, _, _| { obj.show_room_creation_dialog(); }); - klass.install_action("session.show-join-room", None, move |obj, _, _| { + klass.install_action("session.show-join-room", None, |obj, _, _| { obj.show_join_room_dialog(None); }); @@ -102,7 +102,7 @@ mod imp { "session.close-room", ); - klass.install_action("session.toggle-room-search", None, move |obj, _, _| { + klass.install_action("session.toggle-room-search", None, |obj, _, _| { obj.toggle_room_search(); }); diff --git a/src/window.rs b/src/window.rs index 3f9914d2..7be01c3d 100644 --- a/src/window.rs +++ b/src/window.rs @@ -88,14 +88,14 @@ mod imp { klass.add_binding_action(gdk::Key::v, gdk::ModifierType::CONTROL_MASK, "win.paste"); klass.add_binding_action(gdk::Key::Insert, gdk::ModifierType::SHIFT_MASK, "win.paste"); - klass.install_action("win.paste", None, move |obj, _, _| { + klass.install_action("win.paste", None, |obj, _, _| { obj.imp().session.handle_paste_action(); }); klass.install_action( "win.open-account-settings", Some(&String::static_variant_type()), - move |obj, _, variant| { + |obj, _, variant| { if let Some(session_id) = variant.and_then(|v| v.get::()) { obj.open_account_settings(&session_id); }