From b26ab97c129b94637dedc3a81ec73663627bcd81 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 19 May 2022 20:34:48 +0100 Subject: [PATCH] currency: Break out value.html() Signed-off-by: Ian Jackson --- src/currency.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/currency.rs b/src/currency.rs index b75460c2..23d84ae3 100644 --- a/src/currency.rs +++ b/src/currency.rs @@ -114,14 +114,14 @@ impl PieceTrait for Banknote { let value: &Value = gpc.xdata.get_exp()?; hformat!("{}, {}{}", self.image.describe_html(gpc.face)?, - value.qty, &self.currency) + &value.html(), &self.currency) } #[throws(IE)] fn svg_piece(&self, f: &mut Html, gpc: &GPiece, _gs: &GameState, vpid: VisiblePieceId) { let value: &Value = gpc.xdata.get_exp()?; - self.render(f, vpid, gpc.face, &gpc.xdata, &hformat!("{}", value.qty))?; + self.render(f, vpid, gpc.face, &gpc.xdata, &value.html())? } #[throws(ApiPieceOpError)] @@ -284,6 +284,10 @@ impl PieceTrait for Banknote { }))} } +impl Value { + fn html(&self) -> Html { hformat!("{}", self.qty) } +} + impl Banknote { #[throws(IE)] fn render(&self, f: &mut Html, vpid: VisiblePieceId, face: FaceId, -- 2.30.2