From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Mar 2021 20:11:32 +0000 (+0000)
Subject: abolish two pointless fn inner()
X-Git-Tag: otter-0.4.0~95
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dbc5ddcb25332b4fd3757be02a1b73753d5b23c8;p=otter.git

abolish two pointless fn inner()

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

diff --git a/src/gamestate.rs b/src/gamestate.rs
index fb690c83..bf9ba072 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -437,11 +437,7 @@ impl PieceRenderInstructions {
   pub fn make_defs<'p>(&self, ioccults: &IOccults,
                          gpc: &GPiece, ipc: &IPiece) -> Html
   {
-    #[throws(IE)]
-    fn inner(pri: &PieceRenderInstructions, ioccults: &IOccults,
-             gpc: &GPiece, ipc: &IPiece)
-             -> Html
-  {
+    let pri = self;
     let instead = pri.instead(ioccults, ipc)?;
 
     let o: &dyn OutlineTrait = match instead {
@@ -479,23 +475,16 @@ impl PieceRenderInstructions {
            pri.vpid, o.surround_path()?.0)?;
     defs
   }
-  inner(self, ioccults, gpc, ipc)?
-  }
 
   pub fn describe(&self, ioccults: &IOccults,
                   gpc: &GPiece, ipc: &IPiece) -> Html
   {
-    fn inner(pri: &PieceRenderInstructions, ioccults: &IOccults,
-             gpc: &GPiece, ipc: &IPiece) -> Html
-  {
-    pri.describe_fallible(ioccults, gpc, ipc)
+    self.describe_fallible(ioccults, gpc, ipc)
       .unwrap_or_else(|e| {
         error!("error describing piece: {:?}", e);
         Html::lit("<internal error describing piece>")
       })
   }
-  inner(self, ioccults, gpc, ipc)
-  }
 
   #[throws(IE)]
   pub fn describe_fallible(&self, ioccults: &IOccults,