From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Aug 2021 00:03:52 +0000 (+0100)
Subject: report, reorg
X-Git-Tag: hippotat/1.0.0~357
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=e2fcf2d7f7582b0c4efdf616d656acbbc19d2ca3;p=hippotat.git

report, reorg

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/reporter.rs b/src/reporter.rs
index 015b402..68f929d 100644
--- a/src/reporter.rs
+++ b/src/reporter.rs
@@ -30,11 +30,15 @@ impl<'r> Reporter<'r> {
       },
       Err(e) => {
         // xxx something something error
-        if let Some(req_num) = req_num {
-          warn!("{} #{}: {:?}", self.ic, req_num, e);
-        } else {
-          warn!("{}: {:?}", self.ic, e);
-        }
+        let m = (||{
+          let mut m = self.ic.to_string();
+          if let Some(req_num) = req_num {
+            write!(m, " #{}", req_num)?;
+          }
+          write!(m, ": {:?}", e)?;
+          Ok::<_,fmt::Error>(m)
+        })().unwrap();
+        warn!("{}", m);
         None
       },
     }