From 1d038bae2bc6c7215e5e9849fe418c6431e5adbd Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 10 Dec 2020 11:59:13 +0100
Subject: Remove feature: State message in "OK" case.

The "OK" case had a state message parameter. This was removed because
"OK" does mean that everything went well. No need to have a message
here.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 src/log/item.rs   | 4 ++--
 src/log/parser.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/log')

diff --git a/src/log/item.rs b/src/log/item.rs
index 58fb466..fc2af80 100644
--- a/src/log/item.rs
+++ b/src/log/item.rs
@@ -13,7 +13,7 @@ pub enum LogItem {
 
     /// The end-state of the process
     /// Either Ok or Error
-    State(Result<String, String>),
+    State(Result<(), String>),
 }
 
 impl LogItem {
@@ -22,7 +22,7 @@ impl LogItem {
             LogItem::Line(s)         => Ok(Display(String::from_utf8(s.to_vec())?)),
             LogItem::Progress(u)     => Ok(Display(format!("#BUTIDO:PROGRESS:{}", u))),
             LogItem::CurrentPhase(p) => Ok(Display(format!("#BUTIDO:PHASE:{}", p))),
-            LogItem::State(Ok(s))    => Ok(Display(format!("#BUTIDO:STATE:OK:{}", s))),
+            LogItem::State(Ok(()))   => Ok(Display(format!("#BUTIDO:STATE:OK"))),
             LogItem::State(Err(s))   => Ok(Display(format!("#BUTIDO:STATE:ERR:{}", s))),
         }
     }
diff --git a/src/log/parser.rs b/src/log/parser.rs
index fc7af20..85e009b 100644
--- a/src/log/parser.rs
+++ b/src/log/parser.rs
@@ -83,7 +83,7 @@ pub fn parser<'a>() -> PomParser<'a, u8, LogItem> {
             (
                 (seq(b"STATE:ERR:") * string().map(|s| LogItem::State(Err(s))))
                 |
-                (seq(b"STATE:OK:") * string().map(|s| LogItem::State(Ok(s))))
+                seq(b"STATE:OK:").map(|_| LogItem::State(Ok(())))
             )
         )
     )
@@ -189,7 +189,7 @@ mod tests {
             Some other log line
             Some other log line
             Some other log line
-            #BUTIDO:STATE:OK:finished successfully
+            #BUTIDO:STATE:OK
         "};
 
         let p = parser();
@@ -249,7 +249,7 @@ mod tests {
         }
         {
             let elem = i.next().unwrap();
-            let expe = LogItem::State(Ok(String::from("finished successfully")));
+            let expe = LogItem::State(Ok(()));
             assert_eq!(*elem, expe, "Expected {}: {:?}", prettify_item(&expe), prettify_item(elem));
         }
         {
-- 
cgit v1.2.3