From 64f54040ef626157af6b6a9ce5258507a10a23fb Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Wed, 30 Nov 2022 22:40:53 +0000
Subject: [PATCH] refactor: move dynamic_label.rs to dynamic_string.rs and fix
 failing test

---
 src/bar.rs                                          | 2 +-
 src/{widgets/dynamic_label.rs => dynamic_string.rs} | 2 +-
 src/main.rs                                         | 2 +-
 src/modules/custom.rs                               | 2 +-
 src/widgets/mod.rs                                  | 3 ---
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename src/{widgets/dynamic_label.rs => dynamic_string.rs} (98%)
 delete mode 100644 src/widgets/mod.rs

diff --git a/src/bar.rs b/src/bar.rs
index 080a4a9..938f0ca 100644
--- a/src/bar.rs
+++ b/src/bar.rs
@@ -7,7 +7,7 @@ use crate::modules::workspaces::WorkspaceUpdate;
 use crate::modules::{Module, ModuleInfoBuilder, ModuleLocation, ModuleUpdateEvent, WidgetContext};
 use crate::popup::Popup;
 use crate::script::{OutputStream, Script};
-use crate::widgets::DynamicString;
+use crate::dynamic_string::DynamicString;
 use crate::{await_sync, Config};
 use chrono::{DateTime, Local};
 use color_eyre::Result;
diff --git a/src/widgets/dynamic_label.rs b/src/dynamic_string.rs
similarity index 98%
rename from src/widgets/dynamic_label.rs
rename to src/dynamic_string.rs
index b693e76..ddd9ebe 100644
--- a/src/widgets/dynamic_label.rs
+++ b/src/dynamic_string.rs
@@ -134,7 +134,7 @@ mod tests {
             DynamicString::new(
                 "Uptime: {{1000:uptime -p | cut -d ' ' -f2-}}",
                 move |string| {
-                    label.set_label(string);
+                    label.set_label(&string);
                     Continue(true)
                 },
             );
diff --git a/src/main.rs b/src/main.rs
index d9ffbaf..5c7e3fe 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,7 @@ mod modules;
 mod popup;
 mod script;
 mod style;
-mod widgets;
+mod dynamic_string;
 
 use crate::bar::create_bar;
 use crate::config::{Config, MonitorConfig};
diff --git a/src/modules/custom.rs b/src/modules/custom.rs
index 34b1061..be08180 100644
--- a/src/modules/custom.rs
+++ b/src/modules/custom.rs
@@ -2,7 +2,7 @@ use crate::config::CommonConfig;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::popup::{ButtonGeometry, Popup};
 use crate::script::Script;
-use crate::widgets::DynamicString;
+use crate::dynamic_string::DynamicString;
 use color_eyre::{Report, Result};
 use gtk::prelude::*;
 use gtk::{Button, Label, Orientation};
diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs
deleted file mode 100644
index 43845de..0000000
--- a/src/widgets/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod dynamic_label;
-
-pub use dynamic_label::DynamicString;