From dacb031443a8cb3b5113e6271058d5e914a60d67 Mon Sep 17 00:00:00 2001
From: Tangent Wantwight <tangent128@gmail.com>
Date: Sat, 30 May 2020 20:08:02 -0400
Subject: [PATCH] Remove some generics & make some typedefs.

---
 src/net/mod.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/net/mod.rs b/src/net/mod.rs
index dd8284a..d49f487 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -4,16 +4,18 @@ use serde_json::Value;
 pub mod server;
 
 pub type PlayerId = usize;
+pub type PlayerInput = Value;
+pub type GameState = Value;
 
 #[derive(Deserialize, Debug)]
 #[serde(tag = "t")]
-pub enum ClientMessage<I = Value, S = Value> {
+pub enum ClientMessage {
     #[serde(rename = "s")]
-    SetState { s: S },
+    SetState { s: GameState },
     #[serde(rename = "i")]
-    Input { i: I },
+    Input { i: PlayerInput },
     #[serde(rename = "g")]
-    GetState { c: usize, s: S },
+    GetState { c: usize, s: GameState },
 }
 
 #[derive(Serialize, Debug, Clone)]
@@ -24,16 +26,16 @@ pub struct Meta {
 
 #[derive(Serialize, Debug, Clone)]
 #[serde(tag = "t")]
-pub enum ServerMessage<I = Vec<Value>, S = Value> {
+pub enum ServerMessage {
     #[serde(rename = "m")]
     Meta {
         #[serde(flatten)]
         m: Meta,
     },
     #[serde(rename = "s")]
-    SetState { u: Option<PlayerId>, s: S },
+    SetState { u: Option<PlayerId>, s: GameState },
     #[serde(rename = "i")]
-    Input { i: I },
+    Input { i: Vec<PlayerInput> },
     #[serde(rename = "g")]
     GetState { c: usize },
 }