report, reorg

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

diff --git a/src/reporter.rs b/src/reporter.rs
index 015b40203da1366a8043b899e0c5a6f5ae8fbbe8..68f929d907cb8582bbea17be715b18693c1417d5 100644 (file)
--- 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
       },
     }