From 197376633a0f28558bb8ad6ceb50ae9c2cd34be0 Mon Sep 17 00:00:00 2001
From: Thomas O'Donnell <andytom@users.noreply.github.com>
Date: Sat, 18 Jan 2020 08:15:08 +0100
Subject: [PATCH] fix: Fix incorrect prefix usage in cmd_duration module (#832)

Fixed the way the cmd_duration module is setting it's prefix to be the
same as the other modules.
---
 src/modules/cmd_duration.rs     | 10 ++++------
 tests/testsuite/cmd_duration.rs |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/modules/cmd_duration.rs b/src/modules/cmd_duration.rs
index 6c13798d..3555701d 100644
--- a/src/modules/cmd_duration.rs
+++ b/src/modules/cmd_duration.rs
@@ -36,13 +36,11 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
     };
 
     module.set_style(module_color);
-    let cmd_duration_stacked = &format!(
-        "{}{}",
-        config.prefix,
-        render_time(elapsed, config.show_milliseconds)
+    module.create_segment(
+        "cmd_duration",
+        &SegmentConfig::new(&render_time(elapsed, config.show_milliseconds)),
     );
-    module.create_segment("cmd_duration", &SegmentConfig::new(&cmd_duration_stacked));
-    module.get_prefix().set_value("");
+    module.get_prefix().set_value(config.prefix);
 
     Some(module)
 }
diff --git a/tests/testsuite/cmd_duration.rs b/tests/testsuite/cmd_duration.rs
index d2a996a6..978a0cf6 100644
--- a/tests/testsuite/cmd_duration.rs
+++ b/tests/testsuite/cmd_duration.rs
@@ -22,7 +22,7 @@ fn config_blank_duration_5s() -> io::Result<()> {
         .output()?;
     let actual = String::from_utf8(output.stdout).unwrap();
 
-    let expected = format!("{} ", Color::Yellow.bold().paint("took 5s"));
+    let expected = format!("took {} ", Color::Yellow.bold().paint("5s"));
     assert_eq!(expected, actual);
     Ok(())
 }
@@ -54,7 +54,7 @@ fn config_5s_duration_10s() -> io::Result<()> {
         .output()?;
     let actual = String::from_utf8(output.stdout).unwrap();
 
-    let expected = format!("{} ", Color::Yellow.bold().paint("took 10s"));
+    let expected = format!("took {} ", Color::Yellow.bold().paint("10s"));
     assert_eq!(expected, actual);
     Ok(())
 }
@@ -86,7 +86,7 @@ fn config_5s_duration_prefix_underwent() -> io::Result<()> {
         .output()?;
     let actual = String::from_utf8(output.stdout).unwrap();
 
-    let expected = format!("{} ", Color::Yellow.bold().paint("underwent 5s"));
+    let expected = format!("underwent {} ", Color::Yellow.bold().paint("5s"));
     assert_eq!(expected, actual);
     Ok(())
 }