From 5491b5485945385a83c72a057696287fdab827b5 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 2 Sep 2019 02:43:07 +0200 Subject: [PATCH] Make key and struct_field optional in DeserializerItem The main point of this struct seems to be debugging, as key_struct_field is unused except for debugging. --- src/parser/deserializer.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/parser/deserializer.rs b/src/parser/deserializer.rs index 8d6e74828..9f753ced8 100644 --- a/src/parser/deserializer.rs +++ b/src/parser/deserializer.rs @@ -4,8 +4,7 @@ use serde::{de, forward_to_deserialize_any}; #[derive(Debug)] pub struct DeserializerItem<'de> { - key: String, - struct_field: &'de str, + key_struct_field: Option<(String, &'de str)>, val: Tagged, } @@ -44,8 +43,7 @@ impl<'de> ConfigDeserializer<'de> { trace!("pushing {:?}", value); self.stack.push(DeserializerItem { - key: name.to_string(), - struct_field: name, + key_struct_field: Some((name.to_string(), name)), val: value.unwrap_or_else(|| { Value::nothing().tagged(Tag::unknown_origin(self.call.name_span)) }),