From e25639f77b53783d9409f25627c07e204a888571 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Fri, 5 Feb 2021 16:51:49 +0100 Subject: [PATCH] fix cargo clippy complaints after clone! fix --- Cargo.lock | 4 ++-- src/application.rs | 12 +++--------- src/widgets/accounts/row.rs | 5 +++++ src/widgets/preferences/password_page.rs | 5 +---- src/widgets/preferences/window.rs | 5 +---- src/widgets/providers/dialog.rs | 11 ++++------- src/widgets/window.rs | 6 +++--- 7 files changed, 19 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 705e79f..9603c10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1530,9 +1530,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094" dependencies = [ "matches", "unicode-bidi", diff --git a/src/application.rs b/src/application.rs index 458cc93..3bc3bb2 100644 --- a/src/application.rs +++ b/src/application.rs @@ -79,17 +79,11 @@ mod imp { ) { match pspec.get_name() { "locked" => { - let locked = value - .get() - .expect("type conformity checked by `Object::set_property`") - .unwrap(); + let locked = value.get().unwrap().unwrap(); self.locked.set(locked); } "can-be-locked" => { - let can_be_locked = value - .get() - .expect("type conformity checked by `Object::set_property`") - .unwrap(); + let can_be_locked = value.get().unwrap().unwrap(); self.can_be_locked.set(can_be_locked); } _ => unimplemented!(), @@ -139,7 +133,7 @@ mod imp { win.providers().refilter(); None })).unwrap(); - preferences.connect_notify_local(Some("has-set-password"), clone!(@weak app => move |preferences, prop| { + preferences.connect_notify_local(Some("has-set-password"), clone!(@weak app => move |preferences, _| { let state = preferences.has_set_password(); app.set_can_be_locked(state); })); diff --git a/src/widgets/accounts/row.rs b/src/widgets/accounts/row.rs index 458dd0d..5354e6f 100644 --- a/src/widgets/accounts/row.rs +++ b/src/widgets/accounts/row.rs @@ -143,6 +143,11 @@ impl AccountRow { .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE) .build(); + self.account() + .bind_property("name", &*self_.name_label, "tooltip-text") + .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE) + .build(); + self.account() .bind_property("name", &*self_.name_entry, "text") .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE) diff --git a/src/widgets/preferences/password_page.rs b/src/widgets/preferences/password_page.rs index 0513d99..4e9e565 100644 --- a/src/widgets/preferences/password_page.rs +++ b/src/widgets/preferences/password_page.rs @@ -88,10 +88,7 @@ mod imp { ) { match pspec.get_name() { "has-set-password" => { - let has_set_password = value - .get() - .expect("type conformity checked by `Object::set_property`") - .unwrap(); + let has_set_password = value.get().unwrap().unwrap(); self.has_set_password.set(has_set_password); } _ => unimplemented!(), diff --git a/src/widgets/preferences/window.rs b/src/widgets/preferences/window.rs index 6edf7e3..df40f9b 100644 --- a/src/widgets/preferences/window.rs +++ b/src/widgets/preferences/window.rs @@ -121,10 +121,7 @@ mod imp { ) { match pspec.get_name() { "has-set-password" => { - let has_set_password = value - .get() - .expect("type conformity checked by `Object::set_property`") - .unwrap(); + let has_set_password = value.get().unwrap().unwrap(); self.has_set_password.set(has_set_password); } _ => unimplemented!(), diff --git a/src/widgets/providers/dialog.rs b/src/widgets/providers/dialog.rs index 9a4a604..37eeb95 100644 --- a/src/widgets/providers/dialog.rs +++ b/src/widgets/providers/dialog.rs @@ -123,10 +123,10 @@ impl ProvidersDialog { })); let search_btn = &*self_.search_btn; - search_entry.connect_search_started(clone!(@weak search_btn => move |entry| { + search_entry.connect_search_started(clone!(@weak search_btn => move |_| { search_btn.set_active(true); })); - search_entry.connect_stop_search(clone!(@weak search_btn => move |entry| { + search_entry.connect_stop_search(clone!(@weak search_btn => move |_| { search_btn.set_active(false); })); @@ -196,8 +196,7 @@ impl ProvidersDialog { .connect_local( "updated", false, - clone!(@weak self as dialog => move |args| { - let provider = args.get(1).unwrap().get::().unwrap().unwrap(); + clone!(@weak self as dialog => move |_| { dialog.set_view(View::List); dialog.emit("changed", &[]).unwrap(); None @@ -356,9 +355,7 @@ mod row { ) { match pspec.get_name() { "provider" => { - let provider = value - .get() - .expect("type conformity checked by `Object::set_property`"); + let provider = value.get().unwrap(); self.provider.replace(provider); } _ => unimplemented!(), diff --git a/src/widgets/window.rs b/src/widgets/window.rs index e6b81e0..1a963f2 100644 --- a/src/widgets/window.rs +++ b/src/widgets/window.rs @@ -212,7 +212,7 @@ impl Window { .unwrap(); self_.providers.model().connect_items_changed( - clone!(@weak self as win, @weak app => move |model, _,_,_| { + clone!(@weak self as win, @weak app => move |_, _,_,_| { // We do a check on set_view to ensure we always use the right page if !app.locked() { win.set_view(View::Accounts); @@ -245,10 +245,10 @@ impl Window { let text = entry.get_text().to_string(); providers.search(text); })); - search_entry.connect_search_started(clone!(@weak search_btn => move |entry| { + search_entry.connect_search_started(clone!(@weak search_btn => move |_| { search_btn.set_active(true); })); - search_entry.connect_stop_search(clone!(@weak search_btn => move |entry| { + search_entry.connect_stop_search(clone!(@weak search_btn => move |_| { search_btn.set_active(false); }));