abolish two unwraps

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

diff --git a/src/api.rs b/src/api.rs
index ea2ef9f8726cb2cb3138266d7602d55cf4fa5183..2078fb2ac7612817a6cd7b6bfad985443b87ad0f 100644 (file)
--- a/src/api.rs
+++ b/src/api.rs
@@ -108,8 +108,7 @@ fn api_piece_op<O: ApiPieceOp>(form : Json<ApiPiece<O>>)
 
   match (||{
     let p = g_pieces.get(piece).ok_or(OnlineError::PieceGone)?;
-    let pc = gs.pieces.byid_mut(piece)
-      .map_err(|()| OnlineError::PieceGone)?;
+    let pc = gs.pieces.byid_mut(piece)?;
 
     let q_gen = form.gen;
     let u_gen =
@@ -166,8 +165,8 @@ impl ApiPieceOp for ApiPieceGrab {
   fn op(&self, gs: &mut GameState, player: PlayerId, piece: PieceId,
         p: &dyn Piece, lens: &dyn Lens)
         -> (PieceUpdateOp<()>, Vec<LogEntry>) {
-    let pl = gs.players.byid(player).unwrap();
-    let pc = gs.pieces.byid_mut(piece).unwrap();
+    let pl = gs.players.byid(player)?;
+    let pc = gs.pieces.byid_mut(piece)?;
 
     if pc.held.is_some() { throw!(OnlineError::PieceHeld) }
     pc.held = Some(player);

diff --git a/src/error.rs b/src/error.rs
index efb92a76a3b58f6bffb82d9a737c7978a6af816a..b45d88ae153be765ab101cffe403bca5fea974ad 100644 (file)
--- a/src/error.rs
+++ b/src/error.rs
@@ -136,8 +136,8 @@ impl<T> IdForById for T where T : AccessId {
 }
 
 impl IdForById for PieceId {
-  type Error = ();
-  const ERROR : () = ();
+  type Error = OE;
+  const ERROR : OE = OE::PieceGone;
 }
 
 #[macro_export]