zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 10:41:03 +02:00
Code Activity

refactor: fix clippy warnings

Browse source
This commit is contained in:
Jake Stanger 2024-04-01 16:33:38 +01:00
parent 10b3b01e5b
commit 1b35354272
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.rs
View file

@ -192,7 +192,7 @@ impl Ironbar {
while let Ok(event) = rx_outputs.recv().await { while let Ok(event) = rx_outputs.recv().await {
match event.event_type { match event.event_type {
OutputEventType::New => { OutputEventType::New => {
match load_output_bars(&instance, &app, event.output) { match load_output_bars(&instance, &app, &event.output) {
Ok(mut new_bars) => { Ok(mut new_bars) => {
instance.bars.borrow_mut().append(&mut new_bars); instance.bars.borrow_mut().append(&mut new_bars);
} }
@ -316,7 +316,7 @@ fn get_display() -> Display {
fn load_output_bars( fn load_output_bars(
ironbar: &Rc<Ironbar>, ironbar: &Rc<Ironbar>,
app: &Application, app: &Application,
output: OutputInfo, output: &OutputInfo,
) -> Result<Vec<Bar>> { ) -> Result<Vec<Bar>> {
let Some(monitor_name) = &output.name else { let Some(monitor_name) = &output.name else {
return Err(Report::msg("Output missing monitor name")); return Err(Report::msg("Output missing monitor name"));

2
src/modules/custom/mod.rs
View file

@ -243,7 +243,7 @@ impl Module<gtk::Box> for CustomModule {
context.button_id = popup_buttons context.button_id = popup_buttons
.borrow() .borrow()
.first() .first()
.map_or(usize::MAX, |button| button.popup_id()); .map_or(usize::MAX, PopupButton::popup_id);
let popup = self let popup = self
.into_popup( .into_popup(

4
src/modules/notifications.rs
View file

@ -75,7 +75,7 @@ fn default_icon_open_dnd() -> String {
} }
impl Icons { impl Icons {
fn icon(&self, value: &swaync::Event) -> &str { fn icon(&self, value: swaync::Event) -> &str {
match (value.cc_open, value.count > 0, value.dnd) { match (value.cc_open, value.count > 0, value.dnd) {
(true, _, true) => &self.open_dnd, (true, _, true) => &self.open_dnd,
(true, true, false) => &self.open_some, (true, true, false) => &self.open_some,
@ -172,7 +172,7 @@ impl Module<Overlay> for NotificationsModule {
let button = button.clone(); let button = button.clone();
glib_recv!(context.subscribe(), ev => { glib_recv!(context.subscribe(), ev => {
let icon = self.icons.icon(&ev); let icon = self.icons.icon(ev);
button.set_label(icon); button.set_label(icon);
label.set_label(&ev.count.to_string()); label.set_label(&ev.count.to_string());

13
src/modules/tray/mod.rs
View file

@ -74,7 +74,7 @@ impl Module<MenuBar> for TrayModule {
// listen to tray updates // listen to tray updates
spawn(async move { spawn(async move {
for (key, (item, menu)) in initial_items.into_iter() { for (key, (item, menu)) in initial_items {
send_async!( send_async!(
tx, tx,
ModuleUpdateEvent::Update(Event::Add(key.clone(), item.into())) ModuleUpdateEvent::Update(Event::Add(key.clone(), item.into()))
@ -89,7 +89,7 @@ impl Module<MenuBar> for TrayModule {
} }
while let Ok(message) = tray_rx.recv().await { while let Ok(message) = tray_rx.recv().await {
send_async!(tx, ModuleUpdateEvent::Update(message)) send_async!(tx, ModuleUpdateEvent::Update(message));
} }
}); });
@ -159,12 +159,11 @@ fn on_update(
let mut menu_item = TrayMenu::new(tx.clone(), address.clone(), *item); let mut menu_item = TrayMenu::new(tx.clone(), address.clone(), *item);
container.add(&menu_item.widget); container.add(&menu_item.widget);
match icon::get_image(&menu_item, icon_theme, icon_size, prefer_icons) { if let Ok(image) = icon::get_image(&menu_item, icon_theme, icon_size, prefer_icons) {
Ok(image) => menu_item.set_image(&image), menu_item.set_image(&image);
Err(_) => { } else {
let label = menu_item.title.clone().unwrap_or(address.clone()); let label = menu_item.title.clone().unwrap_or(address.clone());
menu_item.set_label(&label) menu_item.set_label(&label);
}
}; };
menu_item.widget.show(); menu_item.widget.show();