From f2e20bbea2d1d3c6e7191b600273fdf20929da66 Mon Sep 17 00:00:00 2001
From: Matan Kushner <hello@matchai.me>
Date: Sat, 5 Oct 2019 19:03:48 +0900
Subject: [PATCH] =?UTF-8?q?revert:=20chore:=20Remove=20logic=20for=20the?=
 =?UTF-8?q?=20`disabled`=20option=20from=20modul=E2=80=A6=20(#489)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6c6e0ef1dd0474dde5a4d29300bbf80b60761d53.
---
 src/modules/memory_usage.rs |  4 ++++
 src/modules/time.rs         |  4 ++++
 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 b8fe4fbf..e3b7918c 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 d86ba01a..344c17cf 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 ae2e1f16..a253162f 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
@@ -20,11 +25,22 @@ fn config_default() -> io::Result<()> {
     Ok(())
 }
 
+#[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()?;