diff options
| author | Daniel Jankowski <daniel.jankowski@rub.de> | 2023-12-17 15:18:04 +0100 |
|---|---|---|
| committer | Daniel Jankowski <daniel.jankowski@rub.de> | 2023-12-17 15:18:04 +0100 |
| commit | ffad61acab9fa3ec771a911de462fa686bea1d67 (patch) | |
| tree | abb2b9f437c9f3ba0997532eeb1fa2960f1f04e5 /src/widgets/command.rs | |
| parent | chore: update cargo deps (diff) | |
| download | sl0pstatus-ffad61acab9fa3ec771a911de462fa686bea1d67.tar.gz sl0pstatus-ffad61acab9fa3ec771a911de462fa686bea1d67.tar.xz sl0pstatus-ffad61acab9fa3ec771a911de462fa686bea1d67.zip | |
chore: move from to_string to to_owned
Diffstat (limited to '')
| -rw-r--r-- | src/widgets/command.rs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/widgets/command.rs b/src/widgets/command.rs index 9d50b50..c7df9b7 100644 --- a/src/widgets/command.rs +++ b/src/widgets/command.rs @@ -1,3 +1,4 @@ +use lazy_static::lazy_static; use std::{ collections::BTreeMap, fs::{remove_file, File}, @@ -15,6 +16,10 @@ use crate::{config::ZellijState, widgets::widget::Widget}; const TIMESTAMP_FORMAT: &str = "%s"; +lazy_static! { + static ref COMMAND_REGEX: Regex = Regex::new("_[a-zA-Z0-9]+$").unwrap(); +} + #[derive(Clone, Debug)] struct CommandConfig { command: String, @@ -47,7 +52,7 @@ impl Widget for CommandWidget { let command_config = match self.config.get(name) { Some(cc) => cc, None => { - return "".to_string(); + return "".to_owned(); } }; @@ -56,7 +61,7 @@ impl Widget for CommandWidget { let command_result = match state.command_results.get(name) { Some(cr) => cr, None => { - return "".to_string(); + return "".to_owned(); } }; @@ -124,9 +129,8 @@ fn parse_config(zj_conf: BTreeMap<String, String>) -> BTreeMap<String, CommandCo let mut config: BTreeMap<String, CommandConfig> = BTreeMap::new(); - let key_name_regex = Regex::new("_[a-zA-Z0-9]+$").unwrap(); for key in keys { - let command_name = key_name_regex.replace(&key, "").to_string(); + let command_name = COMMAND_REGEX.replace(&key, "").to_string(); let mut command_conf = CommandConfig { command: "".to_owned(), @@ -139,12 +143,12 @@ fn parse_config(zj_conf: BTreeMap<String, String>) -> BTreeMap<String, CommandCo } if key.ends_with("command") { - command_conf.command = zj_conf.get(&key).unwrap().to_string().clone(); + command_conf.command = zj_conf.get(&key).unwrap().to_owned().clone(); } if key.ends_with("format") { command_conf.format = - FormattedPart::from_format_string(zj_conf.get(&key).unwrap().to_string().clone()); + FormattedPart::from_format_string(zj_conf.get(&key).unwrap().to_owned().clone()); } if key.ends_with("interval") { |
