card_game/src/lib.rs

@@ -656,27 +656,29 @@ where
 #[cfg(feature = "serde")]
 impl<'de, G: Game> serde::de::DeserializeSeed<'de> for Session<G>
 where
-	G: serde::Deserialize<'de>,
+	G: serde::Deserialize<'de> + Clone,
 	G::Instruction: serde::Deserialize<'de>,
 {
 	type Value = SessionState<G>;
-	fn deserialize<D>(deserializer: D) -> Result<Self::Value, D::Error>
+	fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
 	where
 		D: serde::Deserializer<'de>,
 	{
-		struct SessionStateVisitor<G> {
+		struct SessionStateVisitor<G: Game> {
 			state: G,
+			stats: SessionStats<G::Stats>,
+			config: SessionConfig<G::Config>,
 		}
 		impl<'de, G: Game> serde::de::Visitor<'de> for SessionStateVisitor<G>
 		where
-			G: serde::Deserialize<'de>,
+			G: serde::Deserialize<'de> + Clone,
 			G::Instruction: serde::Deserialize<'de>,
 		{
 			type Value = SessionState<G>;
 			fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
 				write!(f, "State History")
 			}
-			fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+			fn visit_seq<A>(mut self, mut seq: A) -> Result<Self::Value, A::Error>
 			where
 				A: serde::de::SeqAccess<'de>,
 			{
@@ -690,13 +692,21 @@ where
 						state: state.clone(),
 						instruction: instruction.clone(),
 					});
-					state.process_instruction(stats, config, instruction);
+					state.process_instruction(
+						&mut self.stats.inner,
+						&self.config.inner,
+						instruction,
+					);
 				}
 				Ok(SessionState { state, history })
 			}
 		}
 		let state = G::deserialize(deserializer)?;
-		deserializer.deserialize_seq(SessionStateVisitor { state })
+		deserializer.deserialize_seq(SessionStateVisitor {
+			state,
+			stats: self.stats,
+			config: self.config,
+		})
 	}
 }
 #[cfg(feature = "serde")]