zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-04-19 11:24:24 +02:00
Code Activity

refactor: fix a couple of clippy warnings

Browse source
This commit is contained in:
Jake Stanger 2022-08-15 21:11:17 +01:00
parent 8576ac5c44
commit 7625635050
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
4 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/config.rs
View file

@ -41,7 +41,7 @@ pub enum BarPosition {
impl Default for BarPosition {
fn default() -> Self {
BarPosition::Bottom
Self::Bottom
}
}
@ -71,7 +71,13 @@ impl Config {
pub fn load() -> Option<Self> {
if let Ok(config_path) = env::var("IRONBAR_CONFIG") {
let path = PathBuf::from(config_path);
Config::load_file(&path, path.extension().unwrap_or_default().to_str().unwrap_or_default())
Self::load_file(
&path,
path.extension()
.unwrap_or_default()
.to_str()
.unwrap_or_default(),
)
} else {
let config_dir = config_dir().expect("Failed to locate user config dir");
@ -82,7 +88,7 @@ impl Config {
.join("ironbar")
.join(format!("config.{extension}"));
Config::load_file(&full_path, extension)
Self::load_file(&full_path, extension)
})
}
}

29
src/main.rs
View file

@ -48,22 +48,25 @@ async fn main() {
.expect("GTK monitor output differs from Sway's")
.name;
if let Some(ref config) = config.monitors {
let config = config.get(monitor_name);
match &config {
Some(MonitorConfig::Single(config)) => {
create_bar(app, &monitor, monitor_name, config.clone());
}
Some(MonitorConfig::Multiple(configs)) => {
for config in configs {
config.monitors.as_ref().map_or_else(
|| {
create_bar(app, &monitor, monitor_name, config.clone());
},
|config| {
let config = config.get(monitor_name);
match &config {
Some(MonitorConfig::Single(config)) => {
create_bar(app, &monitor, monitor_name, config.clone());
}
Some(MonitorConfig::Multiple(configs)) => {
for config in configs {
create_bar(app, &monitor, monitor_name, config.clone());
}
}
_ => {}
}
_ => {}
}
} else {
create_bar(app, &monitor, monitor_name, config.clone());
}
},
)
}
let style_path = config_dir()

5
src/modules/focused.rs
View file

@ -73,10 +73,7 @@ impl Module<gtk::Box> for FocusedModule {
{
rx.attach(None, move |node| {
let value = node
.name
.as_deref()
.unwrap_or_else(|| node.get_id());
let value = node.name.as_deref().unwrap_or_else(|| node.get_id());
let pixbuf = icon::get_icon(&icon_theme, node.get_id(), self.icon_size);

6
src/modules/workspaces.rs
View file

@ -51,13 +51,13 @@ impl Module<gtk::Box> for WorkspacesModule {
let raw = sway.ipc(IpcCommand::GetWorkspaces).unwrap();
let workspaces = serde_json::from_slice::<Vec<Workspace>>(&raw).unwrap();
if !self.all_monitors {
if self.all_monitors {
workspaces
} else {
workspaces
.into_iter()
.filter(|workspace| workspace.output == info.output_name)
.collect()
} else {
workspaces
}
};