From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jul 2020 02:17:28 +0000 (+0100)
Subject: rename to GameError
X-Git-Tag: otter-0.2.0~1474
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fbb271be990e61cb9e4829cdc04d13de8d1b94cf;p=otter.git

rename to GameError
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 744623f6..54cc90fd 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -134,7 +134,7 @@ fn api_grab(form : Json<ApiGrab>) -> impl response::Responder<'static> {
   let cl = &g.clients.byid(client)?;
   // ^ can only fail if we raced
   let player = cl.player;
-  let r : Result<(),OpError> = (||{
+  let r : Result<(),GameError> = (||{
     let piece = decode_visible_pieceid(form.p);
     let gs = &mut g.gs;
     let p = gs.pieces.byid_mut(piece)?;
@@ -142,8 +142,8 @@ fn api_grab(form : Json<ApiGrab>) -> impl response::Responder<'static> {
     let u_gen =
       if client == p.lastclient { p.gen_lastclient }
       else { p.gen_before_lastclient };
-    if u_gen > q_gen { Err(OpError::Conflict)? }
-    if p.held != None { Err(OpError::PieceHeld)? };
+    if u_gen > q_gen { Err(GameError::Conflict)? }
+    if p.held != None { Err(GameError::PieceHeld)? };
     p.held = Some(player);
     gs.gen.increment();
     let gen = gs.gen;
diff --git a/src/error.rs b/src/error.rs
index 53271619..fd92c2fa 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -5,7 +5,7 @@ use std::sync::PoisonError;
 
 #[derive(Error,Debug)]
 #[error("operation error {:?}",self)]
-pub enum OpError {
+pub enum GameError {
   Conflict,
   PieceGone,
   PieceHeld,
@@ -70,6 +70,6 @@ impl<T> IdForById for T where T : AccessId {
 }
 
 impl IdForById for PieceId {
-  type Error = OpError;
-  const ERROR : OpError = OpError::PieceGone;
+  type Error = GameError;
+  const ERROR : GameError = GameError::PieceGone;
 }