From 61fa3206a5b78e11ba9684ae0667226273d2edc9 Mon Sep 17 00:00:00 2001 From: Artem Biryukov Date: Fri, 10 Mar 2017 13:24:42 +0500 Subject: Add Value::into_str and Value::into_array Other changes inside of Deserializer --- lib/src/de.rs | 168 ++++--------------------------------------------------- lib/src/value.rs | 32 +++++++++++ 2 files changed, 42 insertions(+), 158 deletions(-) diff --git a/lib/src/de.rs b/lib/src/de.rs index a59d950..d1673d5 100644 --- a/lib/src/de.rs +++ b/lib/src/de.rs @@ -1,6 +1,7 @@ use serde::de; use value::{Value, ValueKind}; use error::*; +use std::borrow::Cow; use std::iter::Peekable; use std::collections::HashMap; use std::collections::hash_map::Drain; @@ -12,169 +13,20 @@ impl de::Deserializer for Value { fn deserialize(self, visitor: V) -> Result { // Deserialize based on the underlying type match self.kind { - ValueKind::Boolean(value) => { - visitor.visit_bool(value) - } - - ValueKind::Table(map) => { - visitor.visit_map(MapVisitor::new(map)) - } - + ValueKind::Integer(i) => visitor.visit_i64(i), + ValueKind::Boolean(b) => visitor.visit_bool(b), + ValueKind::Float(f) => visitor.visit_f64(f), + // ValueKind::String(Cow::Borrowed(s)) => visitor.visit_str(s), + // ValueKind::String(Cow::Owned(s)) => visitor.visit_string(s), + ValueKind::Table(map) => visitor.visit_map(MapVisitor::new(map)), _ => { unimplemented!(); } } } - #[inline] - fn deserialize_bool(self, visitor: V) -> Result { - visitor.visit_bool(self.into_bool()?) - } - - #[inline] - fn deserialize_u8(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_u16(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_u32(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_u64(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_i8(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_i16(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_i32(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_i64(self, visitor: V) -> Result { - visitor.visit_i64(self.into_int()?) - } - - #[inline] - fn deserialize_f32(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_f64(self, visitor: V) -> Result { - visitor.visit_f64(self.into_float()?) - } - - #[inline] - fn deserialize_char(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_str(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_string(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_bytes(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_byte_buf(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_option(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_unit(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_unit_struct(self, - name: &'static str, - visitor: V) - -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_newtype_struct(self, - name: &'static str, - visitor: V) - -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_seq(self, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_seq_fixed_size(self, - len: usize, - visitor: V) - -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_tuple(self, len: usize, visitor: V) -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_tuple_struct(self, - name: &'static str, - len: usize, - visitor: V) - -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_enum(self, - name: &'static str, - variants: &'static [&'static str], - visitor: V) - -> Result { - unimplemented!(); - } - - #[inline] - fn deserialize_ignored_any(self, visitor: V) -> Result { - unimplemented!(); - } - forward_to_deserialize! { - map - struct - struct_field + bool u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string seq + seq_fixed_size bytes byte_buf map struct unit enum newtype_struct + struct_field ignored_any unit_struct tuple_struct tuple option } } diff --git a/lib/src/value.rs b/lib/src/value.rs index 87e45bc..455e951 100644 --- a/lib/src/value.rs +++ b/lib/src/value.rs @@ -1,3 +1,4 @@ +use std::borrow::Cow; use std::collections::HashMap; use std::fmt::Display; use error::*; @@ -187,6 +188,37 @@ impl Value { ValueKind::Array(_) => Err(ConfigError::invalid_type(self.origin.clone(), Unexpected::Seq, &"a floating point")), } } + + /// Returns `self` into a str, if possible. + pub fn into_str(self) -> Result { + match self.kind { + ValueKind::String(value) => Ok(value), + + // Cannot convert + ValueKind::Float(value) => Err(ConfigError::invalid_type(self.origin, Unexpected::Float(value), &"a string")), + ValueKind::Integer(value) => Err(ConfigError::invalid_type(self.origin, Unexpected::Integer(value), &"a string")), + ValueKind::Boolean(value) => Err(ConfigError::invalid_type(self.origin, Unexpected::Bool(value), &"a string")), + ValueKind::Nil => Err(ConfigError::invalid_type(self.origin, Unexpected::Unit, &"a string")), + ValueKind::Table(_) => Err(ConfigError::invalid_type(self.origin, Unexpected::Map, &"a string")), + ValueKind::Array(_) => Err(ConfigError::invalid_type(self.origin, Unexpected::Seq, &"a string")), + } + } + + /// Returns `self` into an array, if possible + pub fn into_array(self) -> Result> { + match self.kind { + ValueKind::Array(value) => Ok(value), + + // Cannot convert + ValueKind::Float(value) => Err(ConfigError::invalid_type(self.origin, Unexpected::Float(value), &"an array")), + ValueKind::String(value) => Err(ConfigError::invalid_type(self.origin, Unexpected::Str(value), &"an array")), + ValueKind::Integer(value) => Err(ConfigError::invalid_type(self.origin, Unexpected::Integer(value), &"an array")), + ValueKind::Boolean(value) => Err(ConfigError::invalid_type(self.origin, Unexpected::Bool(value), &"an array")), + ValueKind::Nil => Err(ConfigError::invalid_type(self.origin, Unexpected::Unit, &"an array")), + ValueKind::Table(_) => Err(ConfigError::invalid_type(self.origin, Unexpected::Map, &"an array")), + } + } + /// If the `Value` is a Table, returns the associated Map. pub fn into_table(self) -> Result> { match self.kind { -- cgit v1.2.3