summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhenhui Xie <xiezh0831@yahoo.co.jp>2019-10-05 17:07:33 +0800
committerMatan Kushner <hello@matchai.me>2019-10-05 18:07:33 +0900
commit6c6e0ef1dd0474dde5a4d29300bbf80b60761d53 (patch)
tree7b11e0cb5cadbb395ec8bbffa90f7733ce5f8f49
parent2bfc98641deb4e669c188bac64a6b2f7b98ea1d8 (diff)
chore: Remove logic for the `disabled` option from modules (#486)
-rw-r--r--src/modules/memory_usage.rs4
-rw-r--r--src/modules/time.rs4
-rw-r--r--tests/testsuite/time.rs20
3 files changed, 2 insertions, 26 deletions
diff --git a/src/modules/memory_usage.rs b/src/modules/memory_usage.rs
index e3b7918c7..b8fe4fbf9 100644
--- a/src/modules/memory_usage.rs
+++ b/src/modules/memory_usage.rs
@@ -12,10 +12,6 @@ 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 344c17cfb..d86ba01a9 100644
--- a/src/modules/time.rs
+++ b/src/modules/time.rs
@@ -7,10 +7,6 @@ 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 a253162f7..ae2e1f168 100644
--- a/tests/testsuite/time.rs
+++ b/tests/testsuite/time.rs
@@ -11,13 +11,8 @@ 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_enabled() -> io::Result<()> {
- let output = common::render_module("time")
- .use_config(toml::toml! {
- [time]
- disabled = false
- })
- .output()?;
+fn config_default() -> io::Result<()> {
+ let output = common::render_module("time").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
@@ -26,21 +21,10 @@ fn config_enabled() -> 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()?;