From 96237c5271f82b9ae7a1953ed41a0a97f7c31ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Wed, 28 Dec 2022 18:29:06 +0100 Subject: [PATCH] chore: Fix clippy warnings Triggered by the `uninlined_format_args` lint in nightly --- src/components/auth_dialog.rs | 3 +-- src/components/badge.rs | 4 ++-- src/components/video_player.rs | 4 ++-- src/login/homeserver_page.rs | 2 +- src/login/method_page.rs | 2 +- src/session/avatar.rs | 6 +++--- .../content/room_details/general_page/mod.rs | 2 +- .../membership_subpage_row.rs | 2 +- .../content/room_history/message_row/text.rs | 2 +- .../identity_verification_widget.rs | 18 +++++++++--------- src/session/media_viewer.rs | 2 +- src/session/sidebar/row.rs | 2 +- src/utils/matrix.rs | 2 +- src/utils/media.rs | 2 +- src/utils/mod.rs | 2 +- 15 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/components/auth_dialog.rs b/src/components/auth_dialog.rs index 25e6a678..e3a5e148 100644 --- a/src/components/auth_dialog.rs +++ b/src/components/auth_dialog.rs @@ -366,8 +366,7 @@ impl AuthDialog { } let uri = format!( - "{}_matrix/client/r0/auth/{}/fallback/web?session={}", - homeserver, auth_type, session + "{homeserver}_matrix/client/r0/auth/{auth_type}/fallback/web?session={session}" ); let handler = imp diff --git a/src/components/badge.rs b/src/components/badge.rs index 1f722c69..6cc583d4 100644 --- a/src/components/badge.rs +++ b/src/components/badge.rs @@ -94,13 +94,13 @@ impl Badge { match role { MemberRole::ADMIN => { - label.set_text(&format!("{} {}", role, power_level)); + label.set_text(&format!("{role} {power_level}")); self.add_css_class("admin"); self.remove_css_class("mod"); self.show(); } MemberRole::MOD => { - label.set_text(&format!("{} {}", role, power_level)); + label.set_text(&format!("{role} {power_level}")); self.add_css_class("mod"); self.remove_css_class("admin"); self.show(); diff --git a/src/components/video_player.rs b/src/components/video_player.rs index ad1d0037..a67ab3a8 100644 --- a/src/components/video_player.rs +++ b/src/components/video_player.rs @@ -162,11 +162,11 @@ impl VideoPlayer { if hour > 0 { // FIXME: Find how to localize this. // hour:minutes:seconds - format!("{}:{:02}:{:02}", hour, min, sec) + format!("{hour}:{min:02}:{sec:02}") } else { // FIXME: Find how to localize this. // minutes:seconds - format!("{:02}:{:02}", min, sec) + format!("{min:02}:{sec:02}") } } else { "--:--".to_owned() diff --git a/src/login/homeserver_page.rs b/src/login/homeserver_page.rs index 2d2fe414..053c78f3 100644 --- a/src/login/homeserver_page.rs +++ b/src/login/homeserver_page.rs @@ -163,6 +163,6 @@ fn build_homeserver_url(server: &str) -> Result { if server.starts_with("http://") || server.starts_with("https://") { Url::parse(server) } else { - Url::parse(&format!("https://{}", server)) + Url::parse(&format!("https://{server}")) } } diff --git a/src/login/method_page.rs b/src/login/method_page.rs index 1af5d2f4..ae2fe055 100644 --- a/src/login/method_page.rs +++ b/src/login/method_page.rs @@ -159,7 +159,7 @@ impl LoginMethodPage { "Connecting to {domain_name}", &[( "domain_name", - &format!("{}", domain_name), + &format!("{domain_name}"), )], )) } diff --git a/src/session/avatar.rs b/src/session/avatar.rs index b0f7e2e9..19b8993b 100644 --- a/src/session/avatar.rs +++ b/src/session/avatar.rs @@ -311,10 +311,10 @@ impl std::fmt::Display for AvatarError { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { use AvatarError::*; match self { - Filesystem(e) => write!(f, "Could not open room avatar file: {}", e), - Upload(e) => write!(f, "Could not upload room avatar: {}", e), + Filesystem(e) => write!(f, "Could not open room avatar file: {e}"), + Upload(e) => write!(f, "Could not upload room avatar: {e}"), NotAMember => write!(f, "Room avatar can’t be changed when not a member."), - UnknownFiletype(e) => write!(f, "Room avatar file has an unknown filetype: {}", e), + UnknownFiletype(e) => write!(f, "Room avatar file has an unknown filetype: {e}"), } } } diff --git a/src/session/content/room_details/general_page/mod.rs b/src/session/content/room_details/general_page/mod.rs index 4d95428c..79752385 100644 --- a/src/session/content/room_details/general_page/mod.rs +++ b/src/session/content/room_details/general_page/mod.rs @@ -257,6 +257,6 @@ impl GeneralPage { } fn member_count_changed(&self, n: u32) { - self.imp().members_count.set_text(&format!("{}", n)); + self.imp().members_count.set_text(&format!("{n}")); } } diff --git a/src/session/content/room_details/member_page/members_list_view/membership_subpage_row.rs b/src/session/content/room_details/member_page/members_list_view/membership_subpage_row.rs index 7f7499bb..f878a118 100644 --- a/src/session/content/room_details/member_page/members_list_view/membership_subpage_row.rs +++ b/src/session/content/room_details/member_page/members_list_view/membership_subpage_row.rs @@ -151,6 +151,6 @@ impl MembershipSubpageRow { } fn member_count_changed(&self, n: u32) { - self.imp().members_count.set_text(&format!("{}", n)); + self.imp().members_count.set_text(&format!("{n}")); } } diff --git a/src/session/content/room_history/message_row/text.rs b/src/session/content/room_history/message_row/text.rs index 5f110c9a..2d7ed618 100644 --- a/src/session/content/room_history/message_row/text.rs +++ b/src/session/content/room_history/message_row/text.rs @@ -212,7 +212,7 @@ fn create_widget_for_html_block( } let w = LabelWithWidgets::with_label_and_widgets(&label, widgets); w.set_use_markup(true); - w.add_css_class(&format!("h{}", n)); + w.add_css_class(&format!("h{n}")); w.set_ellipsize(ellipsize); w.upcast() } diff --git a/src/session/content/verification/identity_verification_widget.rs b/src/session/content/verification/identity_verification_widget.rs index 183c0b16..a5a7e97d 100644 --- a/src/session/content/verification/identity_verification_widget.rs +++ b/src/session/content/verification/identity_verification_widget.rs @@ -583,55 +583,55 @@ impl IdentityVerificationWidget { .accept_request_instructions // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. - .set_markup(&gettext_f("{user} asked to be verified. Verifying a user increases the security of the conversation.", &[("user", &format!("{}", name))])); + .set_markup(&gettext_f("{user} asked to be verified. Verifying a user increases the security of the conversation.", &[("user", &format!("{name}"))])); imp.scan_qrcode_title .set_markup(&gettext("Verification Request")); imp.scan_qrcode_instructions.set_markup(&gettext_f( // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. "Scan the QR code shown on the device of {user}.", - &[("user", &format!("{}", name))], + &[("user", &format!("{name}"))], )); // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. - imp.qrcode_scanned_message.set_markup(&gettext_f("You scanned the QR code successfully. {user} may need to confirm the verification.", &[("user", &format!("{}", name))])); + imp.qrcode_scanned_message.set_markup(&gettext_f("You scanned the QR code successfully. {user} may need to confirm the verification.", &[("user", &format!("{name}"))])); imp.qrcode_title .set_markup(&gettext("Verification Request")); imp.qrcode_instructions.set_markup(&gettext_f( // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. "Ask {user} to scan this QR code from their session.", - &[("user", &format!("{}", name))], + &[("user", &format!("{name}"))], )); imp.emoji_title.set_markup(&gettext("Verification Request")); imp.emoji_instructions.set_markup(&gettext_f( // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. "Ask {user} if they see the following emoji appear in the same order on their screen.", - &[("user", &format!("{}", name))] + &[("user", &format!("{name}"))] )); imp.completed_title .set_markup(&gettext("Verification Complete")); // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. - imp.completed_message.set_markup(&gettext_f("{user} is verified and you can now be sure that your communication will be private.", &[("user", &format!("{}", name))])); + imp.completed_message.set_markup(&gettext_f("{user} is verified and you can now be sure that your communication will be private.", &[("user", &format!("{name}"))])); imp.wait_for_other_party_title.set_markup(&gettext_f( // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. "Waiting for {user}", - &[("user", &format!("{}", name))], + &[("user", &format!("{name}"))], )); imp.wait_for_other_party_instructions.set_markup(&gettext_f( // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. "Ask {user} to accept the verification request.", - &[("user", &format!("{}", name))], + &[("user", &format!("{name}"))], )); imp.confirm_scanned_qr_code_question.set_markup(&gettext_f( // Translators: Do NOT translate the content between '{' and '}', this is a // variable name. "Does {user} see a confirmation on their session?", - &[("user", &format!("{}", name))], + &[("user", &format!("{name}"))], )); } } diff --git a/src/session/media_viewer.rs b/src/session/media_viewer.rs index 1ecea2fa..12494812 100644 --- a/src/session/media_viewer.rs +++ b/src/session/media_viewer.rs @@ -240,7 +240,7 @@ impl MediaViewer { // we need to store the file. // See: https://gitlab.gnome.org/GNOME/gtk/-/issues/4062 let mut path = cache_dir(); - path.push(format!("{}_{}", uid, filename)); + path.push(format!("{uid}_{filename}")); let file = gio::File::for_path(path); file.replace_contents( &data, diff --git a/src/session/sidebar/row.rs b/src/session/sidebar/row.rs index 7d96e402..46d9da68 100644 --- a/src/session/sidebar/row.rs +++ b/src/session/sidebar/row.rs @@ -230,7 +230,7 @@ impl Row { list_item.set_css_classes(&["room"]); } } else { - panic!("Wrong row item: {:?}", item); + panic!("Wrong row item: {item:?}"); } self.activate_action("sidebar.update-drop-targets", None) .unwrap(); diff --git a/src/utils/matrix.rs b/src/utils/matrix.rs index 6a0ceadf..6fefa6f8 100644 --- a/src/utils/matrix.rs +++ b/src/utils/matrix.rs @@ -13,7 +13,7 @@ use crate::gettext_f; /// the `transaction_id`. pub fn pending_event_ids() -> (OwnedTransactionId, OwnedEventId) { let txn_id = TransactionId::new(); - let event_id = EventId::parse(format!("${}:fractal.gnome.org", txn_id)).unwrap(); + let event_id = EventId::parse(format!("${txn_id}:fractal.gnome.org")).unwrap(); (txn_id, event_id) } diff --git a/src/utils/media.rs b/src/utils/media.rs index f0d16b37..c8852848 100644 --- a/src/utils/media.rs +++ b/src/utils/media.rs @@ -57,7 +57,7 @@ pub fn filename_for_mime(mime_type: Option<&str>, fallback: Option) }; extension - .map(|extension| format!("{}.{}", name, extension)) + .map(|extension| format!("{name}.{extension}")) .unwrap_or(name) } diff --git a/src/utils/mod.rs b/src/utils/mod.rs index b7fcd2ac..132f6ed4 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -107,7 +107,7 @@ pub fn freplace(s: String, args: &[(&str, &str)]) -> String { let mut s = s; for (k, v) in args { - s = s.replace(&format!("{{{}}}", k), v); + s = s.replace(&format!("{{{k}}}"), v); } s