1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 23:01:04 +02:00

refactor: fix some strict clippy warnings

This commit is contained in:
Jake Stanger 2024-12-29 00:40:12 +00:00
parent 87a6523367
commit 5136637752
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
6 changed files with 51 additions and 60 deletions

View file

@ -1,7 +1,6 @@
use color_eyre::Result;
use gtk::prelude::*;
use serde::Deserialize;
use std::ops::Deref;
use tokio::sync::mpsc;
use super::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
@ -183,19 +182,19 @@ impl Module<gtk::Box> for KeysModule {
if self.show_caps {
caps.add_class("key");
caps.add_class("caps");
container.add(caps.deref());
container.add(&*caps);
}
if self.show_num {
num.add_class("key");
num.add_class("num");
container.add(num.deref());
container.add(&*num);
}
if self.show_scroll {
scroll.add_class("key");
scroll.add_class("scroll");
container.add(scroll.deref());
container.add(&*scroll);
}
let icons = self.icons;

View file

@ -1,5 +1,4 @@
use std::cell::RefMut;
use std::ops::Deref;
use std::path::PathBuf;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
@ -200,8 +199,8 @@ impl Module<Button> for MusicModule {
label.truncate(truncate);
}
button_contents.add(icon_pause.deref());
button_contents.add(icon_play.deref());
button_contents.add(&*icon_pause);
button_contents.add(&*icon_play);
button_contents.add(&label);
{
@ -328,7 +327,7 @@ impl Module<Button> for MusicModule {
volume_icon.add_class("icon");
volume_box.pack_start(&volume_slider, true, true, 0);
volume_box.pack_end(volume_icon.deref(), false, false, 0);
volume_box.pack_end(&*volume_icon, false, false, 0);
main_container.add(&album_image);
main_container.add(&info_box);
@ -559,7 +558,7 @@ impl IconPrefixedLabel {
icon.add_class("icon-box");
label.add_class("label");
container.add(icon.deref());
container.add(&*icon);
container.add(&label);
Self { label, container }

View file

@ -109,8 +109,7 @@ impl Module<gtk::Box> for TrayModule {
) -> Result<ModuleParts<gtk::Box>> {
let orientation = self
.direction
.map(Orientation::from)
.unwrap_or(info.bar_position.orientation());
.map_or(info.bar_position.orientation(), Orientation::from);
// We use a `Box` here instead of the (supposedly correct) `MenuBar`
// as the latter has issues on Sway with menus focus-stealing from the bar.

View file

@ -155,7 +155,7 @@ fn reorder_workspaces(container: &gtk::Box, sort_order: SortOrder) {
let label = if sort_order == SortOrder::Label {
child
.downcast_ref::<gtk::Button>()
.and_then(|button| button.label())
.and_then(ButtonExt::label)
.unwrap_or_else(|| child.widget_name())
} else {
child.widget_name()