From 5b5c9294182ffe00473e598969975b437d226cfe Mon Sep 17 00:00:00 2001 From: Bu5hm4nn <“bu5hm4nn@users.noreply.github.com”> Date: Thu, 17 Aug 2023 12:22:50 -1000 Subject: [PATCH] cargo clippy (but I left some in unchanged code, and one that is due to temporary comment) --- src/ui/components/mod.rs | 1 + src/ui/relays/mod.rs | 4 ++-- src/ui/widgets/relay_entry.rs | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs index 67ae3134..256f009c 100644 --- a/src/ui/components/mod.rs +++ b/src/ui/components/mod.rs @@ -88,6 +88,7 @@ pub fn switch_with_size_at( response } +#[allow(clippy::too_many_arguments)] pub fn switch_custom_at( ui: &mut Ui, enabled: bool, diff --git a/src/ui/relays/mod.rs b/src/ui/relays/mod.rs index f8b48acf..c8c27c9d 100644 --- a/src/ui/relays/mod.rs +++ b/src/ui/relays/mod.rs @@ -350,7 +350,7 @@ fn entry_dialog_step1(ui: &mut Ui, app: &mut GossipUi) { GLOBALS.status_queue.write().write( format!( "I asked the overlord to add relay {}. Check for it below.", &app.relays.new_relay_url - ).to_owned()); + )); // send user to known relays page (where the new entry should show up) app.set_page( Page::RelaysKnownNetwork ); @@ -439,7 +439,7 @@ pub(super) fn configure_list_btn(app: &mut GossipUi, ui: &mut Ui) { seen_on_popup_position.y += 18.0; // drop below the icon itself let id: Id = "configure-list-menu".into(); - let mut frame = egui::Frame::popup(&ui.style()); + let mut frame = egui::Frame::popup(ui.style()); let area = egui::Area::new(id) .movable(false) .interactable(true) diff --git a/src/ui/widgets/relay_entry.rs b/src/ui/widgets/relay_entry.rs index fca3d55c..c1bc2576 100644 --- a/src/ui/widgets/relay_entry.rs +++ b/src/ui/widgets/relay_entry.rs @@ -940,9 +940,7 @@ impl RelayEntry { let resp = ui.interact(rect, self.make_id("rank_sub"), Sense::click()) .on_hover_cursor(CursorIcon::PointingHand); if resp.clicked() { - if new_r > 0 { - new_r -= 1; - } + new_r = new_r.saturating_sub(1) } let (fill, txt) = if resp.hovered() { (self.accent_hover, on_text) @@ -973,7 +971,7 @@ impl RelayEntry { } let pos = pos+vec2(80.0,0.0); { - ui.painter().text(pos, Align2::LEFT_TOP, "Relay-picker rank", font.clone(), txt_color); + ui.painter().text(pos, Align2::LEFT_TOP, "Relay-picker rank", font, txt_color); } if new_r != self.relay.rank {