From 4cf99ea2a2a84b8a25822a26404af61f29ba87b5 Mon Sep 17 00:00:00 2001 From: Guillem Nieto Date: Sun, 5 May 2019 23:53:30 +0200 Subject: Remove ValueWithKey struct While using this library, I end up having lifetime issues with `Config::get`. I've seen that current implementation forces the calleer to match `key` lifetime to the output of the function. My use case is, under some circumstances, return a suffixed version of the config key. Something similar to: ``` if some_condition == true { let key_name = format!("{}_suffix", key); self.config.get(&key_name) } else { self.config.get(key) } ``` This code is noy compiling for me due to conflicting lifetimes. To avoid this, I've started looking to the code and I've found that `key` needed this lifetime because of `ValueWithKey`. The purpouse of this struct seems to be add more information to the errors that are returned to the user. To mitigate this lifetime coupling I've: - Mapped the error on `Config::get` to include the originating key of the current error - Remove all the code related with `ValueWithKey` --- src/de.rs | 128 +------------------------------------------------------------- 1 file changed, 1 insertion(+), 127 deletions(-) (limited to 'src/de.rs') diff --git a/src/de.rs b/src/de.rs index 9267338..9611a21 100644 --- a/src/de.rs +++ b/src/de.rs @@ -3,133 +3,7 @@ use error::*; use serde::de; use std::collections::{HashMap, VecDeque}; use std::iter::Enumerate; -use value::{Value, ValueKind, ValueWithKey, Table}; - -// TODO: Use a macro or some other magic to reduce the code duplication here - -impl<'de> de::Deserializer<'de> for ValueWithKey<'de> { - type Error = ConfigError; - - #[inline] - fn deserialize_any(self, visitor: V) -> Result - where - V: de::Visitor<'de>, - { - // Deserialize based on the underlying type - match self.0.kind { - ValueKind::Nil => visitor.visit_unit(), - ValueKind::Integer(i) => visitor.visit_i64(i), - ValueKind::Boolean(b) => visitor.visit_bool(b), - ValueKind::Float(f) => visitor.visit_f64(f), - ValueKind::String(s) => visitor.visit_string(s), - ValueKind::Array(values) => visitor.visit_seq(SeqAccess::new(values)), - ValueKind::Table(map) => visitor.visit_map(MapAccess::new(map)), - } - } - - #[inline] - fn deserialize_bool>(self, visitor: V) -> Result { - visitor.visit_bool(self.into_bool()?) - } - - #[inline] - fn deserialize_i8>(self, visitor: V) -> Result { - // FIXME: This should *fail* if the value does not fit in the requets integer type - visitor.visit_i8(self.into_int()? as i8) - } - - #[inline] - fn deserialize_i16>(self, visitor: V) -> Result { - // FIXME: This should *fail* if the value does not fit in the requets integer type - visitor.visit_i16(self.into_int()? as i16) - } - - #[inline] - fn deserialize_i32>(self, visitor: V) -> Result { - // FIXME: This should *fail* if the value does not fit in the requets integer type - visitor.visit_i32(self.into_int()? as i32) - } - - #[inline] - fn deserialize_i64>(self, visitor: V) -> Result { - visitor.visit_i64(self.into_int()?) - } - - #[inline] - fn deserialize_u8>(self, visitor: V) -> Result { - // FIXME: This should *fail* if the value does not fit in the requets integer type - visitor.visit_u8(self.into_int()? as u8) - } - - #[inline] - fn deserialize_u16>(self, visitor: V) -> Result { - // FIXME: This should *fail* if the value does not fit in the requets integer type - visitor.visit_u16(self.into_int()? as u16) - } - - #[inline] - fn deserialize_u32>(self, visitor: V) -> Result { - // FIXME: This should *fail* if the value does not fit in the requets integer type - visitor.visit_u32(self.into_int()? as u32) - } - - #[inline] - fn deserialize_u64>(self, visitor: V) -> Result { - // FIXME: This should *fail* if the value does not fit in the requets integer type - visitor.visit_u64(self.into_int()? as u64) - } - - #[inline] - fn deserialize_f32>(self, visitor: V) -> Result { - visitor.visit_f32(self.into_float()? as f32) - } - - #[inline] - fn deserialize_f64>(self, visitor: V) -> Result { - visitor.visit_f64(self.into_float()?) - } - - #[inline] - fn deserialize_str>(self, visitor: V) -> Result { - visitor.visit_string(self.into_str()?) - } - - #[inline] - fn deserialize_string>(self, visitor: V) -> Result { - visitor.visit_string(self.into_str()?) - } - - #[inline] - fn deserialize_option(self, visitor: V) -> Result - where - V: de::Visitor<'de>, - { - // Match an explicit nil as None and everything else as Some - match self.0.kind { - ValueKind::Nil => visitor.visit_none(), - _ => visitor.visit_some(self), - } - } - - fn deserialize_enum( - self, - name: &'static str, - variants: &'static [&'static str], - visitor: V, - ) -> Result - where - V: de::Visitor<'de>, - { - // FIXME: find a way to extend_with_key - visitor.visit_enum(EnumAccess{ value: self.0, name: name, variants: variants }) - } - - forward_to_deserialize_any! { - char seq - bytes byte_buf map struct unit newtype_struct - identifier ignored_any unit_struct tuple_struct tuple - } -} +use value::{Value, ValueKind, Table}; impl<'de> de::Deserializer<'de> for Value { type Error = ConfigError; -- cgit v1.2.3