From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 19 Mar 2021 00:40:34 +0000 (+0000)
Subject: xdata: Some reformatting
X-Git-Tag: otter-0.5.0~652
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6b42d5ffff26c9bfb8a2473518727c41844a66e9;p=otter.git

xdata: Some reformatting

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

diff --git a/src/gamestate.rs b/src/gamestate.rs
index e17d5376..e747e43b 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -298,17 +298,12 @@ impl GPiece {
   }
 
   #[throws(IE)]
-  pub fn xdata_mut<
-      T: PieceXData,
-      D: FnOnce() -> T,
-  >(&mut self, def: D) -> &mut T {
+  pub fn xdata_mut<T:PieceXData,D:FnOnce()->T>(&mut self, def: D) -> &mut T {
     self.xdata.get_mut(def)?
   }
 
   #[throws(IE)]
-  pub fn xdata_mut_exp<
-      T: PieceXData,
-  >(&mut self) -> &mut T {
+  pub fn xdata_mut_exp<T:PieceXData>(&mut self) -> &mut T {
     self.xdata.get_mut_exp()?
   }
 
@@ -362,19 +357,16 @@ impl PieceXDataState {
     self.get()?.ok_or_else(|| xdata_missing::<T>())?
   }
 
-  fn get_mut<
-      T: PieceXData,
-      D: FnOnce() -> T,
-  >(&mut self, def: D) -> Result<&mut T, IE> {
+  #[throws(IE)]
+  fn get_mut<T:PieceXData,D:FnOnce()->T>(&mut self, def: D) -> &mut T {
     let xdata = self.get_or_insert_with(|| Box::new(def()));
-    xdata_get_mut_inner(xdata)
+    xdata_get_mut_inner(xdata)?
   }
 
-  fn get_mut_exp<
-      T: PieceXData,
-  >(&mut self) -> Result<&mut T, IE> {
+  #[throws(IE)]
+  fn get_mut_exp<T:PieceXData>(&mut self) -> &mut T {
     let xdata = self.as_mut().ok_or_else(|| xdata_missing::<T>())?;
-    xdata_get_mut_inner(xdata)
+    xdata_get_mut_inner(xdata)?
   }
 }