what is up with serde moving the deserializer

This commit is contained in:
2026-05-30 10:24:24 -07:00
parent cc4824732a
commit fadefe93c2
+32 -12
View File
@@ -665,13 +665,16 @@ where
#[cfg(feature = "serde")] #[cfg(feature = "serde")]
impl<'de, G: Game> serde::Deserialize<'de> for SessionState<G> impl<'de, G: Game> serde::Deserialize<'de> for SessionState<G>
where where
G: serde::Serialize + for<'a> serde::Deserialize<'a>, G: serde::Deserialize<'de>,
G::Instruction: serde::Deserialize<'de>,
{ {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where where
D: serde::Deserializer<'de>, D: serde::Deserializer<'de>,
{ {
struct SessionStateVisitor<G>(core::marker::PhantomData<G>); struct SessionStateVisitor<G> {
state: G,
}
impl<'de, G: Game> serde::de::Visitor<'de> for SessionStateVisitor<G> { impl<'de, G: Game> serde::de::Visitor<'de> for SessionStateVisitor<G> {
type Value = SessionState<G>; type Value = SessionState<G>;
fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -681,27 +684,44 @@ where
where where
A: serde::de::SeqAccess<'de>, A: serde::de::SeqAccess<'de>,
{ {
let mut stack = Stack::new(); let mut state = self.state.clone();
while let Some(card) = seq.next_element()? { let mut history = match seq.size_hint() {
// TODO: Error Some(capacity) => Vec::with_capacity(capacity),
stack.try_push(card).unwrap(); None => Vec::new(),
};
while let Some(instruction) = seq.next_element()? {
history.push(StateSnapshot {
state: state.clone(),
instruction: instruction.clone(),
});
state.process_instruction(stats, config, instruction);
} }
Ok(stack) Ok(SessionState { state, history })
} }
} }
deserializer.deserialize_seq(SessionStateVisitor(core::marker::PhantomData)) let state = G::deserialize(deserializer)?;
deserializer.deserialize_seq(SessionStateVisitor { state })
} }
} }
#[cfg(feature = "serde")] #[cfg(feature = "serde")]
impl<G: Game> serde::Serialize for SessionState<G> { impl<G: Game> serde::Serialize for SessionState<G>
where
G: serde::Serialize,
G::Instruction: serde::Serialize,
{
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where where
S: serde::Serializer, S: serde::Serializer,
{ {
if let Some(state) = self.history.first() {
state.serialize(serializer)?;
}else{
self.state.serialize(serializer)?;
}
use serde::ser::SerializeSeq; use serde::ser::SerializeSeq;
let mut seq = serializer.serialize_seq(Some(self.len()))?; let mut seq = serializer.serialize_seq(Some(self.history.len()))?;
for card in self.as_slice() { for snapshot in &self.history {
seq.serialize_element(card)?; seq.serialize_element(&snapshot.instruction)?;
} }
seq.end() seq.end()
} }