From ec76fafff08933f6f31fb99ea974bdb5ae97a0af Mon Sep 17 00:00:00 2001
From: Zhenhui Xie <xiezh0831@yahoo.co.jp>
Date: Wed, 8 Jul 2020 06:45:32 +0800
Subject: feat: refactor modules to use format strings (#1374)

---
 src/configs/singularity.rs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'src/configs/singularity.rs')

diff --git a/src/configs/singularity.rs b/src/configs/singularity.rs
index 4ed192426..7eadc5439 100644
--- a/src/configs/singularity.rs
+++ b/src/configs/singularity.rs
@@ -1,26 +1,21 @@
-use crate::config::{ModuleConfig, RootModuleConfig, SegmentConfig};
+use crate::config::{ModuleConfig, RootModuleConfig};
 
-use ansi_term::{Color, Style};
 use starship_module_config_derive::ModuleConfig;
 
 #[derive(Clone, ModuleConfig)]
 pub struct SingularityConfig<'a> {
-    pub symbol: SegmentConfig<'a>,
-    pub label: &'a str,
-    pub prefix: &'a str,
-    pub suffix: &'a str,
-    pub style: Style,
+    pub symbol: &'a str,
+    pub format: &'a str,
+    pub style: &'a str,
     pub disabled: bool,
 }
 
 impl<'a> RootModuleConfig<'a> for SingularityConfig<'a> {
     fn new() -> Self {
         SingularityConfig {
-            symbol: SegmentConfig::default(),
-            label: "",
-            prefix: "[",
-            suffix: "]",
-            style: Color::Blue.bold().dimmed(),
+            format: "[$symbol\\[$env\\]]($style) ",
+            symbol: "",
+            style: "blue bold dimmed",
             disabled: false,
         }
     }
-- 
cgit v1.2.3