From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 19 Mar 2021 00:36:22 +0000 (+0000)
Subject: xdata: Break out xdata_missing
X-Git-Tag: otter-0.5.0~654
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f2a8bec302acc43ec1c2f718b364b2d6a4ff2bcd;p=otter.git

xdata: Break out xdata_missing

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

diff --git a/src/gamestate.rs b/src/gamestate.rs
index f7651498..70e896f5 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -331,6 +331,14 @@ fn xdata_unexpected<T:PieceXData>(got: &dyn PieceXData) -> InternalError {
     &got, T::dummy(),
   ))
 }
+fn xdata_missing<T:PieceXData>() -> InternalError {
+  internal_logic_error(format!(
+    "\n\
+     piece xdata unexpected missing\n\
+     expected something like: {:?}\n",
+    T::dummy(),
+  ))
+}
 
 #[ext(pub)]
 impl PieceXDataState {
@@ -344,13 +352,7 @@ impl PieceXDataState {
 
   #[throws(IE)]
   fn get_exp<T:PieceXData>(&self) -> &T {
-    self.get()?
-      .ok_or_else(|| internal_logic_error(format!(
-        "\n\
-         piece xdata unexpected missing\n\
-         expected something like: {:?}\n",
-        T::dummy(),
-      )))?
+    self.get()?.ok_or_else(|| xdata_missing::<T>())?
   }
 
   fn get_mut<