diff options
author | Matan Kushner <hello@matchai.me> | 2019-10-05 19:03:48 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-05 19:03:48 +0900 |
commit | f2e20bbea2d1d3c6e7191b600273fdf20929da66 (patch) | |
tree | ae0a55fefea02f1af3428705c9363dbf4aa2620a | |
parent | 04512a66d9bc1ebd298a288eded5771fa0419bec (diff) |
revert: chore: Remove logic for the `disabled` option from modul… (#489)
This reverts commit 6c6e0ef1dd0474dde5a4d29300bbf80b60761d53.
-rw-r--r-- | src/modules/memory_usage.rs | 4 | ||||
-rw-r--r-- | src/modules/time.rs | 4 | ||||
-rw-r--r-- | tests/testsuite/time.rs | 20 |
3 files changed, 26 insertions, 2 deletions
diff --git a/src/modules/memory_usage.rs b/src/modules/memory_usage.rs index b8fe4fbf9..e3b7918c7 100644 --- a/src/modules/memory_usage.rs +++ b/src/modules/memory_usage.rs @@ -12,6 +12,10 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { let mut module = context.new_module("memory_usage"); + if module.config_value_bool("disabled").unwrap_or(true) { + return None; + } + let module_style = module .config_value_style("style") .unwrap_or_else(|| Color::White.bold().dimmed()); diff --git a/src/modules/time.rs b/src/modules/time.rs index d86ba01a9..344c17cfb 100644 --- a/src/modules/time.rs +++ b/src/modules/time.rs @@ -7,6 +7,10 @@ use super::{Context, Module}; pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { let mut module = context.new_module("time"); + if module.config_value_bool("disabled").unwrap_or(true) { + return None; + } + let module_style = module .config_value_style("style") .unwrap_or_else(|| Color::Yellow.bold()); diff --git a/tests/testsuite/time.rs b/tests/testsuite/time.rs index ae2e1f168..a253162f7 100644 --- a/tests/testsuite/time.rs +++ b/tests/testsuite/time.rs @@ -11,8 +11,13 @@ should not display when disabled, should display *something* when enabled, and should have the correct prefixes and suffixes in a given config */ #[test] -fn config_default() -> io::Result<()> { - let output = common::render_module("time").output()?; +fn config_enabled() -> io::Result<()> { + let output = common::render_module("time") + .use_config(toml::toml! { + [time] + disabled = false + }) + .output()?; let actual = String::from_utf8(output.stdout).unwrap(); // We can't test what it actually is...but we can assert it's not blank @@ -21,10 +26,21 @@ fn config_default() -> io::Result<()> { } #[test] +fn config_blank() -> io::Result<()> { + let output = common::render_module("time").output()?; + let actual = String::from_utf8(output.stdout).unwrap(); + + let expected = ""; + assert_eq!(expected, actual); + Ok(()) +} + +#[test] fn config_check_prefix_and_suffix() -> io::Result<()> { let output = common::render_module("time") .use_config(toml::toml! { [time] + disabled = false format = "[%T]" }) .output()?; |