Review feedback

client/cli/Cargo.toml

@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4.11"
 atty = "0.2.13"
 regex = "1.4.2"
-lazy_static = "1.4.0"
 ansi_term = "0.12.1"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"

client/cli/src/lib.rs

@@ -319,7 +319,7 @@ pub fn init_logger(
 
 	let subscriber = FmtSubscriber::builder()
 		.with_env_filter(env_filter)
-		.with_writer(MaybeColorWriter(enable_color))
+		.with_writer(MaybeColorWriter::new(enable_color))
 		.event_format(logging::EventFormat {
 			timer,
 			ansi: enable_color,
@@ -351,18 +351,27 @@ pub fn init_logger(
 ///
 /// This is used by the logging to kill colors when they are disabled.
 ///
-/// If the inner is `false`, the colors will be removed before writing to stderr.
+/// If the `enable_colors` is `false`, the colors will be removed before writing to stderr.
 #[derive(Clone)]
-struct MaybeColorWriter(bool);
+struct MaybeColorWriter{
+	enable_colors: bool,
+	remove_color_regex: Regex,
+}
 
-impl std::io::Write for MaybeColorWriter {
-	fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-		lazy_static::lazy_static! {
-			static ref RE: Regex = Regex::new("\x1b\\[[^m]+m").expect("Error initializing color regex");
+impl MaybeColorWriter {
+	fn new(enable_colors: bool) -> Self {
+		Self {
+			enable_colors,
+			remove_color_regex: Regex::new("\x1b\\[[^m]+m")
+				.expect("Error initializing color regex"),
 		}
+	}
+}
 
-		if !self.0 {
-			let replaced = RE.replace_all(buf, &b""[..]);
+impl std::io::Write for MaybeColorWriter {
+	fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+		if !self.enable_colors {
+			let replaced = self.remove_color_regex.replace_all(buf, &b""[..]);
 			std::io::stderr().write(&replaced)?;
 			Ok(buf.len())
 		} else {