aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Jankowski <daniel.jankowski@rub.de>2025-12-17 20:47:24 +0100
committerDaniel Jankowski <daniel.jankowski@rub.de>2025-12-17 20:47:24 +0100
commitd886a28f8936333feaeaa3d0f8f615efa07d38e7 (patch)
treeb13d1ed18ea6179bd0b67eee27cc833c17e1dee5 /src
parentchore: update rust-toolchain (diff)
downloadsl0pstatus-d886a28f8936333feaeaa3d0f8f615efa07d38e7.tar.gz
sl0pstatus-d886a28f8936333feaeaa3d0f8f615efa07d38e7.tar.xz
sl0pstatus-d886a28f8936333feaeaa3d0f8f615efa07d38e7.zip
chore(clippy): fix issues
Diffstat (limited to 'src')
-rw-r--r--src/render.rs17
-rw-r--r--src/widgets/tabs.rs18
2 files changed, 18 insertions, 17 deletions
diff --git a/src/render.rs b/src/render.rs
index 6ef0005..ff34430 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -1,4 +1,4 @@
-use cached::{proc_macro::cached, SizedCache};
+use cached::{SizedCache, proc_macro::cached};
use lazy_static::lazy_static;
use std::{collections::BTreeMap, sync::Arc};
@@ -7,7 +7,7 @@ use regex::Regex;
use zellij_tile::prelude::bail;
use crate::{
- config::{event_mask_from_widget_name, UpdateEventMask, ZellijState},
+ config::{UpdateEventMask, ZellijState, event_mask_from_widget_name},
widgets::widget::Widget,
};
@@ -211,12 +211,13 @@ impl FormattedPart {
let widget_mask = event_mask_from_widget_name(widget_key_name);
let skip_widget_cache = widget_mask & UpdateEventMask::Always as u8 != 0;
- if !skip_widget_cache && widget_mask & state.cache_mask == 0 {
- if let Some(res) = self.cache.get(widget_key) {
- tracing::debug!(msg = "hit", typ = "widget", widget = widget_key);
- output = output.replace(match_name, res);
- continue;
- }
+ if !skip_widget_cache
+ && widget_mask & state.cache_mask == 0
+ && let Some(res) = self.cache.get(widget_key)
+ {
+ tracing::debug!(msg = "hit", typ = "widget", widget = widget_key);
+ output = output.replace(match_name, res);
+ continue;
}
tracing::debug!(
diff --git a/src/widgets/tabs.rs b/src/widgets/tabs.rs
index c2f3f94..ef8f70b 100644
--- a/src/widgets/tabs.rs
+++ b/src/widgets/tabs.rs
@@ -127,10 +127,10 @@ impl Widget for TabsWidget {
output = format!("{}{}", output, content);
- if counter < tabs.len() {
- if let Some(sep) = &self.separator {
- output = format!("{}{}", output, sep.format_string(&sep.content));
- }
+ if counter < tabs.len()
+ && let Some(sep) = &self.separator
+ {
+ output = format!("{}{}", output, sep.format_string(&sep.content));
}
}
@@ -185,11 +185,11 @@ impl Widget for TabsWidget {
let mut rendered_content = self.render_tab(tab, &state.panes, &state.mode);
- if counter < tabs.len() {
- if let Some(sep) = &self.separator {
- rendered_content =
- format!("{}{}", rendered_content, sep.format_string(&sep.content));
- }
+ if counter < tabs.len()
+ && let Some(sep) = &self.separator
+ {
+ rendered_content =
+ format!("{}{}", rendered_content, sep.format_string(&sep.content));
}
let content_len = console::measure_text_width(&rendered_content);