summaryrefslogtreecommitdiffstats
path: root/src/options/config/process_columns.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/options/config/process_columns.rs')
-rw-r--r--src/options/config/process_columns.rs29
1 files changed, 9 insertions, 20 deletions
diff --git a/src/options/config/process_columns.rs b/src/options/config/process_columns.rs
index 504faaf3..ea65bf27 100644
--- a/src/options/config/process_columns.rs
+++ b/src/options/config/process_columns.rs
@@ -5,7 +5,8 @@ use crate::widgets::ProcWidgetColumn;
/// Process column settings.
#[derive(Clone, Debug, Default, Deserialize)]
pub struct ProcessConfig {
- pub columns: Option<Vec<ProcWidgetColumn>>,
+ #[serde(default)]
+ pub columns: Vec<ProcWidgetColumn>,
}
#[cfg(test)]
@@ -17,7 +18,7 @@ mod test {
fn empty_column_setting() {
let config = "";
let generated: ProcessConfig = toml_edit::de::from_str(config).unwrap();
- assert!(generated.columns.is_none());
+ assert!(generated.columns.is_empty());
}
#[test]
@@ -29,7 +30,7 @@ mod test {
let generated: ProcessConfig = toml_edit::de::from_str(config).unwrap();
assert_eq!(
generated.columns,
- Some(vec![
+ vec![
ProcWidgetColumn::Cpu,
ProcWidgetColumn::PidOrCount,
ProcWidgetColumn::User,
@@ -41,7 +42,7 @@ mod test {
ProcWidgetColumn::Time,
ProcWidgetColumn::User,
ProcWidgetColumn::State,
- ]),
+ ],
);
}
@@ -55,30 +56,18 @@ mod test {
fn process_column_settings_3() {
let config = r#"columns = ["Twrite", "T.Write"]"#;
let generated: ProcessConfig = toml_edit::de::from_str(config).unwrap();
- assert_eq!(
- generated.columns,
- Some(vec![ProcWidgetColumn::TotalWrite; 2])
- );
+ assert_eq!(generated.columns, vec![ProcWidgetColumn::TotalWrite; 2]);
let config = r#"columns = ["Tread", "T.read"]"#;
let generated: ProcessConfig = toml_edit::de::from_str(config).unwrap();
- assert_eq!(
- generated.columns,
- Some(vec![ProcWidgetColumn::TotalRead; 2])
- );
+ assert_eq!(generated.columns, vec![ProcWidgetColumn::TotalRead; 2]);
let config = r#"columns = ["read", "rps", "r/s"]"#;
let generated: ProcessConfig = toml_edit::de::from_str(config).unwrap();
- assert_eq!(
- generated.columns,
- Some(vec![ProcWidgetColumn::ReadPerSecond; 3])
- );
+ assert_eq!(generated.columns, vec![ProcWidgetColumn::ReadPerSecond; 3]);
let config = r#"columns = ["write", "wps", "w/s"]"#;
let generated: ProcessConfig = toml_edit::de::from_str(config).unwrap();
- assert_eq!(
- generated.columns,
- Some(vec![ProcWidgetColumn::WritePerSecond; 3])
- );
+ assert_eq!(generated.columns, vec![ProcWidgetColumn::WritePerSecond; 3]);
}
}