changed Progress:status and Progress:seconds_remaining to be Options

PowerShell · Jan 15, 2025 · 097b71b · 097b71b
1 parent fa6ba24
commit 097b71b
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/dsc_lib/src/util.rs b/dsc_lib/src/util.rs
@@ -43,11 +43,11 @@ impl Default for DscSettingValue {
 #[derive(Default, Debug, Clone, Serialize)]
 pub struct Progress {
     pub activity:  String,
-    #[serde(default, skip_serializing_if = "is_default")]
-    pub status: String,
     pub percent_complete: u16,
-    #[serde(default, skip_serializing_if = "is_default")]
-    pub seconds_remaining: u64,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub status: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub seconds_remaining: Option<u64>,
 }
 
 pub struct ProgressBar {
@@ -58,10 +58,6 @@ pub struct ProgressBar {
     emit_json: bool
 }
 
-fn is_default<T: Default + PartialEq>(t: &T) -> bool {
-    t == &T::default()
-}
-
 impl ProgressBar {
     pub fn new(emit_json: bool) -> ProgressBar {
         ProgressBar {