chiark / gitweb /
currency: Break out value.html()
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 19 May 2022 19:34:48 +0000 (20:34 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 19 May 2022 19:54:44 +0000 (20:54 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/currency.rs

index b75460c24850f1094bbe274d71fbe23ed3a5f3fd..23d84ae38e6a3a9c7c0365847f6ef53b38fbbae5 100644 (file)
@@ -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,