From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 May 2021 19:45:40 +0000 (+0100)
Subject: otter: Further improve error printing
X-Git-Tag: otter-0.6.0~260
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=977eaaeb3477efbc1655be40ce9ad12ab98cfd6c;p=otter.git

otter: Further improve error printing

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

diff --git a/src/bundles.rs b/src/bundles.rs
index ecc9319f..eff4e329 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -9,7 +9,7 @@ use crate::prelude::*;
 pub use crate::prelude::Sha512Trunc256 as Digester;
 pub type DigestWrite<W> = crate::utils::DigestWrite<Digester, W>;
 
-#[derive(Debug,Copy,Clone,Hash,Eq,PartialEq,Serialize,Deserialize)]
+#[derive(Copy,Clone,Hash,Eq,PartialEq,Serialize,Deserialize)]
 pub struct Hash(pub [u8; 32]);
 
 #[derive(Debug,Copy,Clone,Hash,Eq,PartialEq,Serialize,Deserialize)]
@@ -178,6 +178,13 @@ impl BundleSavefile {
   }
 }
 
+impl Debug for Hash {
+  #[throws(fmt::Error)]
+  fn fmt(&self, f: &mut Formatter) {
+    for v in self.0 { write!(f, "{:02x}", v)?; }
+  }
+}
+
 //---------- pathname handling (including Id leafname) ----------
 
 pub fn b_dir(instance: &InstanceName) -> String {