diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs index 16603b9f..51a6e670 100644 --- a/serde/src/de/value.rs +++ b/serde/src/de/value.rs @@ -634,30 +634,30 @@ where //////////////////////////////////////////////////////////////////////////////// -/// A helper deserializer that deserializes a sequence using a `SeqAccess`. +/// A deserializer holding a `SeqAccess`. #[derive(Clone, Debug)] -pub struct SeqVisitorDeserializer { - visitor: V_, +pub struct SeqAccessDeserializer { + seq: A, } -impl SeqVisitorDeserializer { - /// Construct a new `SeqVisitorDeserializer`. - pub fn new(visitor: V_) -> Self { - SeqVisitorDeserializer { visitor: visitor } +impl SeqAccessDeserializer { + /// Construct a new `SeqAccessDeserializer`. + pub fn new(seq: A) -> Self { + SeqAccessDeserializer { seq: seq } } } -impl<'de, V_> de::Deserializer<'de> for SeqVisitorDeserializer +impl<'de, A> de::Deserializer<'de> for SeqAccessDeserializer where - V_: de::SeqAccess<'de>, + A: de::SeqAccess<'de>, { - type Error = V_::Error; + type Error = A::Error; fn deserialize_any(self, visitor: V) -> Result where V: de::Visitor<'de>, { - visitor.visit_seq(self.visitor) + visitor.visit_seq(self.seq) } forward_to_deserialize_any! { @@ -1038,30 +1038,30 @@ where //////////////////////////////////////////////////////////////////////////////// -/// A helper deserializer that deserializes a map using a `MapAccess`. +/// A deserializer holding a `MapAccess`. #[derive(Clone, Debug)] -pub struct MapVisitorDeserializer { - visitor: V_, +pub struct MapAccessDeserializer { + map: A, } -impl MapVisitorDeserializer { - /// Construct a new `MapVisitorDeserializer`. - pub fn new(visitor: V_) -> Self { - MapVisitorDeserializer { visitor: visitor } +impl MapAccessDeserializer { + /// Construct a new `MapAccessDeserializer`. + pub fn new(map: A) -> Self { + MapAccessDeserializer { map: map } } } -impl<'de, V_> de::Deserializer<'de> for MapVisitorDeserializer +impl<'de, A> de::Deserializer<'de> for MapAccessDeserializer where - V_: de::MapAccess<'de>, + A: de::MapAccess<'de>, { - type Error = V_::Error; + type Error = A::Error; fn deserialize_any(self, visitor: V) -> Result where V: de::Visitor<'de>, { - visitor.visit_map(self.visitor) + visitor.visit_map(self.map) } forward_to_deserialize_any! {