From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Jun 2020 11:56:20 +0000 (+0100)
Subject: own PlayerId
X-Git-Tag: otter-0.2.0~1536
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5b5d8d0785a76947816fef364adf63e6c5c98dce;p=otter.git

own PlayerId
---

diff --git a/src/global.rs b/src/global.rs
index c3bf3536..9cf260c1 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -5,10 +5,16 @@ use crate::imports::*;
 use lazy_static::lazy_static;
 
 slotmap::new_key_type!{
-  pub struct PlayerId;
   pub struct ClientId;
 }
 
+type SKD = slotmap::KeyData;
+#[derive(Copy,Clone,PartialEq,Eq,Serialize,Deserialize,Debug)]
+pub struct PlayerId (SKD);
+impl slotmap::Key for PlayerId { }
+impl From<SKD> for PlayerId { fn from(d : SKD) -> Self { PlayerId(d) } }
+impl From<PlayerId> for SKD { fn from(p : PlayerId) -> Self { p.0 } }
+
 #[derive(Clone,Debug,Eq,PartialEq,Ord,PartialOrd,Hash)]
 struct RawToken (String);
 impl Borrow<str> for RawToken {