diff --git a/src/decoder/serde.rs b/src/decoder/serde.rs index 5db9786..b12984d 100644 --- a/src/decoder/serde.rs +++ b/src/decoder/serde.rs @@ -280,3 +280,46 @@ impl de::Deserializer for UnitDeserializer { visitor.visit_none() } } + +// Based on https://github.com/serde-rs/serde/blob/199ed417bd6afc2071d17759b8c7e0ab8d0ba4cc/serde_json/src/value.rs#L265 +impl de::Deserialize for Value { + fn deserialize(deserializer: &mut D) -> Result where D: de::Deserializer { + struct ValueVisitor; + + impl de::Visitor for ValueVisitor { + type Value = Value; + + fn visit_bool(&mut self, value: bool) -> Result { + Ok(Value::Boolean(value)) + } + + fn visit_i64(&mut self, value: i64) -> Result { + Ok(Value::Integer(value)) + } + + fn visit_f64(&mut self, value: f64) -> Result { + Ok(Value::Float(value)) + } + + fn visit_str(&mut self, value: &str) -> Result { + Ok(Value::String(value.into())) + } + + fn visit_string(&mut self, value: String) -> Result { + Ok(Value::String(value)) + } + + fn visit_seq(&mut self, visitor: V) -> Result where V: de::SeqVisitor { + let values = try!(de::impls::VecVisitor::new().visit_seq(visitor)); + Ok(Value::Array(values)) + } + + fn visit_map(&mut self, visitor: V) -> Result where V: de::MapVisitor { + let values = try!(de::impls::BTreeMapVisitor::new().visit_map(visitor)); + Ok(Value::Table(values)) + } + } + + deserializer.visit(ValueVisitor) + } +}