diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs index fcacb0c3f..1f878151d 100644 --- a/serde/src/de/value.rs +++ b/serde/src/de/value.rs @@ -25,15 +25,13 @@ use lib::*; use self::private::{First, Second}; use __private::de::size_hint; -use de::{self, Expected, IntoDeserializer, SeqAccess}; +use de::{self, Deserializer, Expected, IntoDeserializer, SeqAccess, Visitor}; use ser; //////////////////////////////////////////////////////////////////////////////// -/// For structs that contain a PhantomData. We do not want the trait -/// bound `E: Clone` inferred by derive(Clone). -#[doc(hidden)] -#[macro_export] +// For structs that contain a PhantomData. We do not want the trait +// bound `E: Clone` inferred by derive(Clone). macro_rules! impl_copy_clone { ($ty:ident $(<$lifetime:tt>)*) => { impl<$($lifetime,)* E> Copy for $ty<$($lifetime,)* E> {} @@ -46,9 +44,8 @@ macro_rules! impl_copy_clone { }; } -/// Creates a deserializer any method of which forwards to the specified visitor method -#[doc(hidden)] -#[macro_export(local_inner_macros)] +// Creates a deserializer any method of which forwards to the specified visitor +// method. macro_rules! forward_deserializer { // Non-borrowed references ( @@ -76,15 +73,15 @@ macro_rules! forward_deserializer { impl_copy_clone!($deserializer $(<$lifetime>)*); - impl<'de, $($lifetime,)* E> $crate::de::Deserializer<'de> for $deserializer<$($lifetime,)* E> + impl<'de, $($lifetime,)* E> Deserializer<'de> for $deserializer<$($lifetime,)* E> where - E: $crate::de::Error, + E: de::Error, { type Error = E; - fn deserialize_any(self, visitor: V) -> $crate::export::Result + fn deserialize_any(self, visitor: V) -> Result where - V: $crate::de::Visitor<'de>, + V: Visitor<'de>, { visitor.$visit(self.value) } @@ -120,15 +117,15 @@ macro_rules! forward_deserializer { impl_copy_clone!($deserializer<'de>); - impl<'de, E> $crate::de::Deserializer<'de> for $deserializer<'de, E> + impl<'de, E> Deserializer<'de> for $deserializer<'de, E> where - E: $crate::de::Error, + E: de::Error, { type Error = E; - fn deserialize_any(self, visitor: V) -> $crate::export::Result + fn deserialize_any(self, visitor: V) -> Result where - V: $crate::de::Visitor<'de>, + V: Visitor<'de>, { visitor.$visit(self.value) } diff --git a/serde/src/private/de.rs b/serde/src/private/de.rs index 2432e52ea..b0e75af8b 100644 --- a/serde/src/private/de.rs +++ b/serde/src/private/de.rs @@ -1,7 +1,7 @@ use lib::*; use de::value::{BorrowedBytesDeserializer, BytesDeserializer}; -use de::{Deserialize, DeserializeSeed, Deserializer, Error, IntoDeserializer, Visitor}; +use de::{self, Deserialize, DeserializeSeed, Deserializer, Error, IntoDeserializer, Visitor}; #[cfg(any(feature = "std", feature = "alloc"))] use de::{MapAccess, Unexpected};