From d6b21ec9f0f4f48e5a0260a7745d845160b5936a Mon Sep 17 00:00:00 2001 From: Matt Bilker Date: Sun, 9 Sep 2018 17:30:26 +0000 Subject: [PATCH] value(de): use class name instead of namespace under serde::de --- src/value/de.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/value/de.rs b/src/value/de.rs index 00a0d85..bb777d7 100644 --- a/src/value/de.rs +++ b/src/value/de.rs @@ -1,7 +1,7 @@ use std::fmt; use std::marker::PhantomData; -use serde::de::{self, Deserialize, EnumAccess, Error, IntoDeserializer, SeqAccess, VariantAccess, Visitor}; +use serde::de::{Deserialize, Deserializer, EnumAccess, Error, IntoDeserializer, SeqAccess, VariantAccess, Visitor}; use serde::de::value::SeqDeserializer; use node::Marshal; @@ -11,7 +11,7 @@ use value::Value; impl<'de> Deserialize<'de> for Value { #[inline] fn deserialize(deserializer: D) -> Result - where D: de::Deserializer<'de> + where D: Deserializer<'de> { trace!("::deserialize()"); @@ -38,7 +38,7 @@ impl<'de> Deserialize<'de> for Value { #[inline] fn visit_string(self, value: String) -> Result - where E: de::Error + where E: Error { trace!("ValueVisitor::visit_string(value: {:?})", value); @@ -51,7 +51,7 @@ impl<'de> Deserialize<'de> for Value { #[inline] fn visit_str(self, value: &str) -> Result - where E: de::Error + where E: Error { trace!("ValueVisitor::visit_str(value: {:?})", value); @@ -64,7 +64,7 @@ impl<'de> Deserialize<'de> for Value { #[inline] fn visit_bytes(self, value: &[u8]) -> Result - where E: de::Error + where E: Error { trace!("ValueVisitor::visit_bytes(value: 0x{:02x?})", value); self.visit_byte_buf(value.to_vec()) @@ -72,7 +72,7 @@ impl<'de> Deserialize<'de> for Value { #[inline] fn visit_borrowed_bytes(self, value: &'de [u8]) -> Result - where E: de::Error + where E: Error { trace!("ValueVisitor::visit_borrowed_bytes(value: 0x{:02x?})", value); self.visit_byte_buf(value.to_vec()) @@ -86,7 +86,7 @@ impl<'de> Deserialize<'de> for Value { #[inline] fn visit_some(self, deserializer: D) -> Result - where D: de::Deserializer<'de> + where D: Deserializer<'de> { trace!("ValueVisitor::visit_some()"); Deserialize::deserialize(deserializer) @@ -124,7 +124,7 @@ impl<'de> Deserialize<'de> for Value { #[inline] fn visit_newtype_struct(self, deserializer: D) -> Result - where D: de::Deserializer<'de> + where D: Deserializer<'de> { trace!("ValueVisitor::visit_newtype_struct()"); @@ -171,8 +171,8 @@ pub struct ValueDeserializer { marker: PhantomData, } -impl<'de, E> de::Deserializer<'de> for ValueDeserializer - where E: de::Error +impl<'de, E> Deserializer<'de> for ValueDeserializer + where E: Error { type Error = E; @@ -236,7 +236,7 @@ impl<'de, E> de::Deserializer<'de> for ValueDeserializer } impl<'de, E> IntoDeserializer<'de, E> for Value - where E: de::Error + where E: Error { type Deserializer = ValueDeserializer;