From dd1f4b483ee204d58465064f6e5bf5a457543b54 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 8 Jan 2021 19:35:52 -0800 Subject: [PATCH] Make it clearer that the private implementation details are private Both of these modules are doc(hidden) and commented "Not public API", but incorrect downstream code sometimes still references them. Naming the module __private will make it more likely to be noticed in code review. --- serde/src/de/impls.rs | 4 +- serde/src/export.rs | 39 - serde/src/integer128.rs | 2 +- serde/src/lib.rs | 11 +- serde/src/macros.rs | 2 +- serde/src/private/macros.rs | 2 +- serde/src/private/mod.rs | 40 + serde/src/ser/impossible.rs | 2 +- serde/src/ser/mod.rs | 2 +- serde_derive/src/de.rs | 508 ++++++----- serde_derive/src/internals/attr.rs | 4 +- serde_derive/src/pretend.rs | 8 +- serde_derive/src/ser.rs | 46 +- serde_derive/src/try.rs | 6 +- test_suite/tests/expand/de_enum.expanded.rs | 862 +++++++++--------- .../tests/expand/default_ty_param.expanded.rs | 223 ++--- .../tests/expand/generic_enum.expanded.rs | 327 +++---- .../tests/expand/generic_struct.expanded.rs | 298 +++--- .../expand/generic_tuple_struct.expanded.rs | 84 +- test_suite/tests/expand/lifetimes.expanded.rs | 332 +++---- test_suite/tests/expand/named_map.expanded.rs | 397 ++++---- .../tests/expand/named_tuple.expanded.rs | 143 +-- .../tests/expand/named_unit.expanded.rs | 17 +- test_suite/tests/expand/ser_enum.expanded.rs | 125 +-- test_suite/tests/expand/void.expanded.rs | 52 +- 25 files changed, 1832 insertions(+), 1704 deletions(-) delete mode 100644 serde/src/export.rs diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs index d9af210e..af87b149 100644 --- a/serde/src/de/impls.rs +++ b/serde/src/de/impls.rs @@ -1906,7 +1906,7 @@ impl<'de> Deserialize<'de> for Duration { b"secs" => Ok(Field::Secs), b"nanos" => Ok(Field::Nanos), _ => { - let value = ::export::from_utf8_lossy(value); + let value = ::__private::from_utf8_lossy(value); Err(Error::unknown_field(&value, FIELDS)) } } @@ -2214,7 +2214,7 @@ mod range { b"start" => Ok(Field::Start), b"end" => Ok(Field::End), _ => { - let value = ::export::from_utf8_lossy(value); + let value = ::__private::from_utf8_lossy(value); Err(Error::unknown_field(&value, FIELDS)) } } diff --git a/serde/src/export.rs b/serde/src/export.rs deleted file mode 100644 index caa1f4dc..00000000 --- a/serde/src/export.rs +++ /dev/null @@ -1,39 +0,0 @@ -pub use lib::clone::Clone; -pub use lib::convert::{From, Into}; -pub use lib::default::Default; -pub use lib::fmt::{self, Formatter}; -pub use lib::marker::PhantomData; -pub use lib::option::Option::{self, None, Some}; -pub use lib::result::Result::{self, Err, Ok}; - -pub use self::string::from_utf8_lossy; - -#[cfg(any(feature = "alloc", feature = "std"))] -pub use lib::{ToString, Vec}; - -#[cfg(core_try_from)] -pub use lib::convert::TryFrom; - -mod string { - use lib::*; - - #[cfg(any(feature = "std", feature = "alloc"))] - pub fn from_utf8_lossy(bytes: &[u8]) -> Cow { - String::from_utf8_lossy(bytes) - } - - // The generated code calls this like: - // - // let value = &_serde::export::from_utf8_lossy(bytes); - // Err(_serde::de::Error::unknown_variant(value, VARIANTS)) - // - // so it is okay for the return type to be different from the std case as long - // as the above works. - #[cfg(not(any(feature = "std", feature = "alloc")))] - pub fn from_utf8_lossy(bytes: &[u8]) -> &str { - // Three unicode replacement characters if it fails. They look like a - // white-on-black question mark. The user will recognize it as invalid - // UTF-8. - str::from_utf8(bytes).unwrap_or("\u{fffd}\u{fffd}\u{fffd}") - } -} diff --git a/serde/src/integer128.rs b/serde/src/integer128.rs index 01d6f34a..3028c0ae 100644 --- a/serde/src/integer128.rs +++ b/serde/src/integer128.rs @@ -10,7 +10,7 @@ /// bother with this macro and may assume support for 128-bit integers. /// /// ```edition2018 -/// # use serde::private::ser::Error; +/// # use serde::__private::ser::Error; /// # /// # struct MySerializer; /// # diff --git a/serde/src/lib.rs b/serde/src/lib.rs index 902fcb2e..47116a3e 100644 --- a/serde/src/lib.rs +++ b/serde/src/lib.rs @@ -266,13 +266,14 @@ pub use de::{Deserialize, Deserializer}; #[doc(inline)] pub use ser::{Serialize, Serializer}; -// Generated code uses these to support no_std. Not public API. +// Used by generated code and doc tests. Not public API. #[doc(hidden)] -pub mod export; +#[path = "private/mod.rs"] +pub mod __private; -// Helpers used by generated code and doc tests. Not public API. -#[doc(hidden)] -pub mod private; +#[allow(unused_imports)] +use self::__private as export; +use self::__private as private; #[cfg(not(feature = "std"))] mod std_error; diff --git a/serde/src/macros.rs b/serde/src/macros.rs index 57600a53..6502a23a 100644 --- a/serde/src/macros.rs +++ b/serde/src/macros.rs @@ -124,7 +124,7 @@ macro_rules! forward_to_deserialize_any { macro_rules! forward_to_deserialize_any_method { ($func:ident<$l:tt, $v:ident>($($arg:ident : $ty:ty),*)) => { #[inline] - fn $func<$v>(self, $($arg: $ty,)* visitor: $v) -> $crate::export::Result<$v::Value, Self::Error> + fn $func<$v>(self, $($arg: $ty,)* visitor: $v) -> $crate::__private::Result<$v::Value, Self::Error> where $v: $crate::de::Visitor<$l>, { diff --git a/serde/src/private/macros.rs b/serde/src/private/macros.rs index 4f7054f5..39d66f63 100644 --- a/serde/src/private/macros.rs +++ b/serde/src/private/macros.rs @@ -37,7 +37,7 @@ macro_rules! __serialize_unimplemented { #[macro_export] macro_rules! __serialize_unimplemented_method { ($func:ident $(<$t:ident>)* ($($arg:ty),*) -> $ret:ident) => { - fn $func $(<$t: ?Sized + $crate::Serialize>)* (self $(, _: $arg)*) -> $crate::export::Result { + fn $func $(<$t: ?Sized + $crate::Serialize>)* (self $(, _: $arg)*) -> $crate::__private::Result { unimplemented!() } }; diff --git a/serde/src/private/mod.rs b/serde/src/private/mod.rs index 79e0a7d0..73355e4d 100644 --- a/serde/src/private/mod.rs +++ b/serde/src/private/mod.rs @@ -2,3 +2,43 @@ mod macros; pub mod de; pub mod ser; + +pub use lib::clone::Clone; +pub use lib::convert::{From, Into}; +pub use lib::default::Default; +pub use lib::fmt::{self, Formatter}; +pub use lib::marker::PhantomData; +pub use lib::option::Option::{self, None, Some}; +pub use lib::result::Result::{self, Err, Ok}; + +pub use self::string::from_utf8_lossy; + +#[cfg(any(feature = "alloc", feature = "std"))] +pub use lib::{ToString, Vec}; + +#[cfg(core_try_from)] +pub use lib::convert::TryFrom; + +mod string { + use lib::*; + + #[cfg(any(feature = "std", feature = "alloc"))] + pub fn from_utf8_lossy(bytes: &[u8]) -> Cow { + String::from_utf8_lossy(bytes) + } + + // The generated code calls this like: + // + // let value = &_serde::__private::from_utf8_lossy(bytes); + // Err(_serde::de::Error::unknown_variant(value, VARIANTS)) + // + // so it is okay for the return type to be different from the std case as long + // as the above works. + #[cfg(not(any(feature = "std", feature = "alloc")))] + pub fn from_utf8_lossy(bytes: &[u8]) -> &str { + // Three unicode replacement characters if it fails. They look like a + // white-on-black question mark. The user will recognize it as invalid + // UTF-8. + str::from_utf8(bytes).unwrap_or("\u{fffd}\u{fffd}\u{fffd}") + } +} diff --git a/serde/src/ser/impossible.rs b/serde/src/ser/impossible.rs index 90bab29a..8a6501e5 100644 --- a/serde/src/ser/impossible.rs +++ b/serde/src/ser/impossible.rs @@ -17,7 +17,7 @@ use ser::{ /// /// ```edition2018 /// # use serde::ser::{Serializer, Impossible}; -/// # use serde::private::ser::Error; +/// # use serde::__private::ser::Error; /// # /// # struct MySerializer; /// # diff --git a/serde/src/ser/mod.rs b/serde/src/ser/mod.rs index 8a4b2e36..1e7ef8ab 100644 --- a/serde/src/ser/mod.rs +++ b/serde/src/ser/mod.rs @@ -711,7 +711,7 @@ pub trait Serializer: Sized { /// /// ```edition2018 /// # use serde::ser::{Serializer, SerializeSeq}; - /// # use serde::private::ser::Error; + /// # use serde::__private::ser::Error; /// # /// # struct MySerializer; /// # diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index 55ab808b..10033e4b 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -35,7 +35,7 @@ pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result(__deserializer: __D) -> #serde::export::Result<#remote #ty_generics, __D::Error> + #vis fn deserialize<__D>(__deserializer: __D) -> #serde::__private::Result<#remote #ty_generics, __D::Error> where __D: #serde::Deserializer<#delife>, { @@ -50,7 +50,7 @@ pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result for #ident #ty_generics #where_clause { - fn deserialize<__D>(__deserializer: __D) -> #serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> #serde::__private::Result where __D: #serde::Deserializer<#delife>, { @@ -165,9 +165,11 @@ fn build_generics(cont: &Container, borrowed: &BorrowedLifetimes) -> syn::Generi Some(predicates) => bound::with_where_predicates(&generics, predicates), None => { let generics = match *cont.attrs.default() { - attr::Default::Default => { - bound::with_self_bound(cont, &generics, &parse_quote!(_serde::export::Default)) - } + attr::Default::Default => bound::with_self_bound( + cont, + &generics, + &parse_quote!(_serde::__private::Default), + ), attr::Default::None | attr::Default::Path(_) => generics, }; @@ -183,7 +185,7 @@ fn build_generics(cont: &Container, borrowed: &BorrowedLifetimes) -> syn::Generi cont, &generics, requires_default, - &parse_quote!(_serde::export::Default), + &parse_quote!(_serde::__private::Default), ) } } @@ -325,7 +327,7 @@ fn deserialize_in_place_body(cont: &Container, params: &Parameters) -> Option(__deserializer: __D, __place: &mut Self) -> _serde::export::Result<(), __D::Error> + fn deserialize_in_place<__D>(__deserializer: __D, __place: &mut Self) -> _serde::__private::Result<(), __D::Error> where __D: _serde::Deserializer<#delife>, { @@ -364,16 +366,16 @@ fn deserialize_transparent(cont: &Container, params: &Parameters) -> Fragment { quote!(#member: __transparent) } else { let value = match field.attrs.default() { - attr::Default::Default => quote!(_serde::export::Default::default()), + attr::Default::Default => quote!(_serde::__private::Default::default()), attr::Default::Path(path) => quote!(#path()), - attr::Default::None => quote!(_serde::export::PhantomData), + attr::Default::None => quote!(_serde::__private::PhantomData), }; quote!(#member: #value) } }); quote_block! { - _serde::export::Result::map( + _serde::__private::Result::map( #path(__deserializer), |__transparent| #this { #(#assign),* }) } @@ -381,17 +383,17 @@ fn deserialize_transparent(cont: &Container, params: &Parameters) -> Fragment { fn deserialize_from(type_from: &syn::Type) -> Fragment { quote_block! { - _serde::export::Result::map( + _serde::__private::Result::map( <#type_from as _serde::Deserialize>::deserialize(__deserializer), - _serde::export::From::from) + _serde::__private::From::from) } } fn deserialize_try_from(type_try_from: &syn::Type) -> Fragment { quote_block! { - _serde::export::Result::and_then( + _serde::__private::Result::and_then( <#type_try_from as _serde::Deserialize>::deserialize(__deserializer), - |v| _serde::export::TryFrom::try_from(v).map_err(_serde::de::Error::custom)) + |v| _serde::__private::TryFrom::try_from(v).map_err(_serde::de::Error::custom)) } } @@ -407,16 +409,16 @@ fn deserialize_unit_struct(params: &Parameters, cattrs: &attr::Container) -> Fra impl<'de> _serde::de::Visitor<'de> for __Visitor { type Value = #this; - fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, #expecting) + fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, #expecting) } #[inline] - fn visit_unit<__E>(self) -> _serde::export::Result + fn visit_unit<__E>(self) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(#this) + _serde::__private::Ok(#this) } } @@ -472,8 +474,8 @@ fn deserialize_tuple( let visitor_expr = quote! { __Visitor { - marker: _serde::export::PhantomData::<#this #ty_generics>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::<#this #ty_generics>, + lifetime: _serde::__private::PhantomData, } }; let dispatch = if let Some(deserializer) = deserializer { @@ -497,21 +499,21 @@ fn deserialize_tuple( quote_block! { struct __Visitor #de_impl_generics #where_clause { - marker: _serde::export::PhantomData<#this #ty_generics>, - lifetime: _serde::export::PhantomData<&#delife ()>, + marker: _serde::__private::PhantomData<#this #ty_generics>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #de_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_ty_generics #where_clause { type Value = #this #ty_generics; - fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, #expecting) + fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, #expecting) } #visit_newtype_struct #[inline] - fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result + fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::__private::Result where __A: _serde::de::SeqAccess<#delife>, { @@ -557,7 +559,7 @@ fn deserialize_tuple_in_place( let visitor_expr = quote! { __Visitor { place: __place, - lifetime: _serde::export::PhantomData, + lifetime: _serde::__private::PhantomData, } }; @@ -587,20 +589,20 @@ fn deserialize_tuple_in_place( quote_block! { struct __Visitor #in_place_impl_generics #where_clause { place: &#place_life mut #this #ty_generics, - lifetime: _serde::export::PhantomData<&#delife ()>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #in_place_impl_generics _serde::de::Visitor<#delife> for __Visitor #in_place_ty_generics #where_clause { type Value = (); - fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, #expecting) + fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, #expecting) } #visit_newtype_struct #[inline] - fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result + fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::__private::Result where __A: _serde::de::SeqAccess<#delife>, { @@ -652,23 +654,23 @@ fn deserialize_seq( let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path); quote!({ #wrapper - _serde::export::Option::map( + _serde::__private::Option::map( try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)), |__wrap| __wrap.value) }) } }; let value_if_none = match field.attrs.default() { - attr::Default::Default => quote!(_serde::export::Default::default()), + attr::Default::Default => quote!(_serde::__private::Default::default()), attr::Default::Path(path) => quote!(#path()), attr::Default::None => quote!( - return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting)); + return _serde::__private::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting)); ), }; let assign = quote! { let #var = match #visit { - _serde::export::Some(__value) => __value, - _serde::export::None => { + _serde::__private::Some(__value) => __value, + _serde::__private::None => { #value_if_none } }; @@ -692,13 +694,13 @@ fn deserialize_seq( if params.has_getter { let this = ¶ms.this; result = quote! { - _serde::export::Into::<#this>::into(#result) + _serde::__private::Into::<#this>::into(#result) }; } let let_default = match cattrs.default() { attr::Default::Default => Some(quote!( - let __default: Self::Value = _serde::export::Default::default(); + let __default: Self::Value = _serde::__private::Default::default(); )), attr::Default::Path(path) => Some(quote!( let __default: Self::Value = #path(); @@ -713,7 +715,7 @@ fn deserialize_seq( quote_block! { #let_default #(#let_values)* - _serde::export::Ok(#result) + _serde::__private::Ok(#result) } } @@ -746,20 +748,20 @@ fn deserialize_seq_in_place( } else { let value_if_none = match field.attrs.default() { attr::Default::Default => quote!( - self.place.#member = _serde::export::Default::default(); + self.place.#member = _serde::__private::Default::default(); ), attr::Default::Path(path) => quote!( self.place.#member = #path(); ), attr::Default::None => quote!( - return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting)); + return _serde::__private::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting)); ), }; let write = match field.attrs.deserialize_with() { None => { quote! { - if let _serde::export::None = try!(_serde::de::SeqAccess::next_element_seed(&mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.#member))) + if let _serde::__private::None = try!(_serde::de::SeqAccess::next_element_seed(&mut __seq, + _serde::__private::de::InPlaceSeed(&mut self.place.#member))) { #value_if_none } @@ -770,10 +772,10 @@ fn deserialize_seq_in_place( quote!({ #wrapper match try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)) { - _serde::export::Some(__wrap) => { + _serde::__private::Some(__wrap) => { self.place.#member = __wrap.value; } - _serde::export::None => { + _serde::__private::None => { #value_if_none } } @@ -789,7 +791,7 @@ fn deserialize_seq_in_place( let (_, ty_generics, _) = params.generics.split_for_impl(); let let_default = match cattrs.default() { attr::Default::Default => Some(quote!( - let __default: #this #ty_generics = _serde::export::Default::default(); + let __default: #this #ty_generics = _serde::__private::Default::default(); )), attr::Default::Path(path) => Some(quote!( let __default: #this #ty_generics = #path(); @@ -804,7 +806,7 @@ fn deserialize_seq_in_place( quote_block! { #let_default #(#write_values)* - _serde::export::Ok(()) + _serde::__private::Ok(()) } } @@ -835,18 +837,18 @@ fn deserialize_newtype_struct( if params.has_getter { let this = ¶ms.this; result = quote! { - _serde::export::Into::<#this>::into(#result) + _serde::__private::Into::<#this>::into(#result) }; } quote! { #[inline] - fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result + fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::__private::Result where __E: _serde::Deserializer<#delife>, { let __field0: #field_ty = #value; - _serde::export::Ok(#result) + _serde::__private::Ok(#result) } } } @@ -861,7 +863,7 @@ fn deserialize_newtype_struct_in_place(params: &Parameters, field: &Field) -> To quote! { #[inline] - fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result + fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::__private::Result where __E: _serde::Deserializer<#delife>, { @@ -924,8 +926,8 @@ fn deserialize_struct( let visitor_expr = quote! { __Visitor { - marker: _serde::export::PhantomData::<#this #ty_generics>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::<#this #ty_generics>, + lifetime: _serde::__private::PhantomData, } }; let dispatch = if let Some(deserializer) = deserializer { @@ -963,7 +965,7 @@ fn deserialize_struct( let visit_seq = match *untagged { Untagged::No if !cattrs.has_flatten() => Some(quote! { #[inline] - fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result + fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::__private::Result where __A: _serde::de::SeqAccess<#delife>, { @@ -978,7 +980,7 @@ fn deserialize_struct( impl #de_impl_generics _serde::de::DeserializeSeed<#delife> for __Visitor #de_ty_generics #where_clause { type Value = #this #ty_generics; - fn deserialize<__D>(self, __deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(self, __deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -994,21 +996,21 @@ fn deserialize_struct( #field_visitor struct __Visitor #de_impl_generics #where_clause { - marker: _serde::export::PhantomData<#this #ty_generics>, - lifetime: _serde::export::PhantomData<&#delife ()>, + marker: _serde::__private::PhantomData<#this #ty_generics>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #de_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_ty_generics #where_clause { type Value = #this #ty_generics; - fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, #expecting) + fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, #expecting) } #visit_seq #[inline] - fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result + fn visit_map<__A>(self, mut __map: __A) -> _serde::__private::Result where __A: _serde::de::MapAccess<#delife>, { @@ -1062,7 +1064,7 @@ fn deserialize_struct_in_place( let visitor_expr = quote! { __Visitor { place: __place, - lifetime: _serde::export::PhantomData, + lifetime: _serde::__private::PhantomData, } }; let dispatch = if let Some(deserializer) = deserializer { @@ -1089,7 +1091,7 @@ fn deserialize_struct_in_place( let visit_seq = quote! { #[inline] - fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result + fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::__private::Result where __A: _serde::de::SeqAccess<#delife>, { @@ -1106,20 +1108,20 @@ fn deserialize_struct_in_place( struct __Visitor #in_place_impl_generics #where_clause { place: &#place_life mut #this #ty_generics, - lifetime: _serde::export::PhantomData<&#delife ()>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #in_place_impl_generics _serde::de::Visitor<#delife> for __Visitor #in_place_ty_generics #where_clause { type Value = (); - fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, #expecting) + fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, #expecting) } #visit_seq #[inline] - fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result + fn visit_map<__A>(self, mut __map: __A) -> _serde::__private::Result where __A: _serde::de::MapAccess<#delife>, { @@ -1229,9 +1231,9 @@ fn deserialize_externally_tagged_enum( // all variants have `#[serde(skip_deserializing)]`. quote! { // FIXME: Once we drop support for Rust 1.15: - // let _serde::export::Err(__err) = _serde::de::EnumAccess::variant::<__Field>(__data); - // _serde::export::Err(__err) - _serde::export::Result::map( + // let _serde::__private::Err(__err) = _serde::de::EnumAccess::variant::<__Field>(__data); + // _serde::__private::Err(__err) + _serde::__private::Result::map( _serde::de::EnumAccess::variant::<__Field>(__data), |(__impossible, _)| match __impossible {}) } @@ -1247,18 +1249,18 @@ fn deserialize_externally_tagged_enum( #variant_visitor struct __Visitor #de_impl_generics #where_clause { - marker: _serde::export::PhantomData<#this #ty_generics>, - lifetime: _serde::export::PhantomData<&#delife ()>, + marker: _serde::__private::PhantomData<#this #ty_generics>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #de_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_ty_generics #where_clause { type Value = #this #ty_generics; - fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, #expecting) + fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, #expecting) } - fn visit_enum<__A>(self, __data: __A) -> _serde::export::Result + fn visit_enum<__A>(self, __data: __A) -> _serde::__private::Result where __A: _serde::de::EnumAccess<#delife>, { @@ -1273,8 +1275,8 @@ fn deserialize_externally_tagged_enum( #type_name, VARIANTS, __Visitor { - marker: _serde::export::PhantomData::<#this #ty_generics>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::<#this #ty_generics>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -1301,7 +1303,7 @@ fn deserialize_internally_tagged_enum( variant, cattrs, quote! { - _serde::private::de::ContentDeserializer::<__D::Error>::new(__tagged.content) + _serde::__private::de::ContentDeserializer::<__D::Error>::new(__tagged.content) }, )); @@ -1317,7 +1319,7 @@ fn deserialize_internally_tagged_enum( let __tagged = try!(_serde::Deserializer::deserialize_any( __deserializer, - _serde::private::de::TaggedContentVisitor::<__Field>::new(#tag))); + _serde::__private::de::TaggedContentVisitor::<__Field>::new(#tag))); match __tagged.tag { #(#variant_arms)* @@ -1366,9 +1368,9 @@ fn deserialize_adjacently_tagged_enum( // If unknown fields are allowed, we pick the visitor that can step over // those. Otherwise we pick the visitor that fails on unknown keys. let field_visitor_ty = if deny_unknown_fields { - quote! { _serde::private::de::TagOrContentFieldVisitor } + quote! { _serde::__private::de::TagOrContentFieldVisitor } } else { - quote! { _serde::private::de::TagContentOtherFieldVisitor } + quote! { _serde::__private::de::TagContentOtherFieldVisitor } }; let tag_or_content = quote! { @@ -1379,7 +1381,7 @@ fn deserialize_adjacently_tagged_enum( }; let mut missing_content = quote! { - _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#content)) + _serde::__private::Err(<__A::Error as _serde::de::Error>::missing_field(#content)) }; let mut missing_content_fallthrough = quote!(); let missing_content_arms = variants @@ -1392,11 +1394,11 @@ fn deserialize_adjacently_tagged_enum( let arm = match variant.style { Style::Unit => quote! { - _serde::export::Ok(#this::#variant_ident) + _serde::__private::Ok(#this::#variant_ident) }, Style::Newtype if variant.attrs.deserialize_with().is_none() => { let span = variant.original.span(); - let func = quote_spanned!(span=> _serde::private::de::missing_field); + let func = quote_spanned!(span=> _serde::__private::de::missing_field); quote! { #func(#content).map(#this::#variant_ident) } @@ -1431,19 +1433,19 @@ fn deserialize_adjacently_tagged_enum( next_key } else { quote!({ - let mut __rk : _serde::export::Option<_serde::private::de::TagOrContentField> = _serde::export::None; - while let _serde::export::Some(__k) = #next_key { + let mut __rk : _serde::__private::Option<_serde::__private::de::TagOrContentField> = _serde::__private::None; + while let _serde::__private::Some(__k) = #next_key { match __k { - _serde::private::de::TagContentOtherField::Other => { + _serde::__private::de::TagContentOtherField::Other => { try!(_serde::de::MapAccess::next_value::<_serde::de::IgnoredAny>(&mut __map)); continue; }, - _serde::private::de::TagContentOtherField::Tag => { - __rk = _serde::export::Some(_serde::private::de::TagOrContentField::Tag); + _serde::__private::de::TagContentOtherField::Tag => { + __rk = _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag); break; } - _serde::private::de::TagContentOtherField::Content => { - __rk = _serde::export::Some(_serde::private::de::TagOrContentField::Content); + _serde::__private::de::TagContentOtherField::Content => { + __rk = _serde::__private::Some(_serde::__private::de::TagOrContentField::Content); break; } } @@ -1458,13 +1460,13 @@ fn deserialize_adjacently_tagged_enum( // at this point immediately produce an error. let visit_remaining_keys = quote! { match #next_relevant_key { - _serde::export::Some(_serde::private::de::TagOrContentField::Tag) => { - _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#tag)) + _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag) => { + _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#tag)) } - _serde::export::Some(_serde::private::de::TagOrContentField::Content) => { - _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#content)) + _serde::__private::Some(_serde::__private::de::TagOrContentField::Content) => { + _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#content)) } - _serde::export::None => _serde::export::Ok(__ret), + _serde::__private::None => _serde::__private::Ok(__ret), } }; @@ -1490,14 +1492,14 @@ fn deserialize_adjacently_tagged_enum( struct __Seed #de_impl_generics #where_clause { field: __Field, - marker: _serde::export::PhantomData<#this #ty_generics>, - lifetime: _serde::export::PhantomData<&#delife ()>, + marker: _serde::__private::PhantomData<#this #ty_generics>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #de_impl_generics _serde::de::DeserializeSeed<#delife> for __Seed #de_ty_generics #where_clause { type Value = #this #ty_generics; - fn deserialize<__D>(self, __deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(self, __deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<#delife>, { @@ -1508,102 +1510,102 @@ fn deserialize_adjacently_tagged_enum( } struct __Visitor #de_impl_generics #where_clause { - marker: _serde::export::PhantomData<#this #ty_generics>, - lifetime: _serde::export::PhantomData<&#delife ()>, + marker: _serde::__private::PhantomData<#this #ty_generics>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #de_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_ty_generics #where_clause { type Value = #this #ty_generics; - fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, #expecting) + fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, #expecting) } - fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result + fn visit_map<__A>(self, mut __map: __A) -> _serde::__private::Result where __A: _serde::de::MapAccess<#delife>, { // Visit the first relevant key. match #next_relevant_key { // First key is the tag. - _serde::export::Some(_serde::private::de::TagOrContentField::Tag) => { + _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag) => { // Parse the tag. let __field = try!(_serde::de::MapAccess::next_value(&mut __map)); // Visit the second key. match #next_relevant_key { // Second key is a duplicate of the tag. - _serde::export::Some(_serde::private::de::TagOrContentField::Tag) => { - _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#tag)) + _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag) => { + _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#tag)) } // Second key is the content. - _serde::export::Some(_serde::private::de::TagOrContentField::Content) => { + _serde::__private::Some(_serde::__private::de::TagOrContentField::Content) => { let __ret = try!(_serde::de::MapAccess::next_value_seed(&mut __map, __Seed { field: __field, - marker: _serde::export::PhantomData, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData, + lifetime: _serde::__private::PhantomData, })); // Visit remaining keys, looking for duplicates. #visit_remaining_keys } // There is no second key; might be okay if the we have a unit variant. - _serde::export::None => #missing_content + _serde::__private::None => #missing_content } } // First key is the content. - _serde::export::Some(_serde::private::de::TagOrContentField::Content) => { + _serde::__private::Some(_serde::__private::de::TagOrContentField::Content) => { // Buffer up the content. - let __content = try!(_serde::de::MapAccess::next_value::<_serde::private::de::Content>(&mut __map)); + let __content = try!(_serde::de::MapAccess::next_value::<_serde::__private::de::Content>(&mut __map)); // Visit the second key. match #next_relevant_key { // Second key is the tag. - _serde::export::Some(_serde::private::de::TagOrContentField::Tag) => { - let __deserializer = _serde::private::de::ContentDeserializer::<__A::Error>::new(__content); + _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag) => { + let __deserializer = _serde::__private::de::ContentDeserializer::<__A::Error>::new(__content); #finish_content_then_tag } // Second key is a duplicate of the content. - _serde::export::Some(_serde::private::de::TagOrContentField::Content) => { - _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#content)) + _serde::__private::Some(_serde::__private::de::TagOrContentField::Content) => { + _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#content)) } // There is no second key. - _serde::export::None => { - _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#tag)) + _serde::__private::None => { + _serde::__private::Err(<__A::Error as _serde::de::Error>::missing_field(#tag)) } } } // There is no first key. - _serde::export::None => { - _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#tag)) + _serde::__private::None => { + _serde::__private::Err(<__A::Error as _serde::de::Error>::missing_field(#tag)) } } } - fn visit_seq<__A>(self, mut __seq: __A) -> _serde::export::Result + fn visit_seq<__A>(self, mut __seq: __A) -> _serde::__private::Result where __A: _serde::de::SeqAccess<#delife>, { // Visit the first element - the tag. match try!(_serde::de::SeqAccess::next_element(&mut __seq)) { - _serde::export::Some(__field) => { + _serde::__private::Some(__field) => { // Visit the second element - the content. match try!(_serde::de::SeqAccess::next_element_seed( &mut __seq, __Seed { field: __field, - marker: _serde::export::PhantomData, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData, + lifetime: _serde::__private::PhantomData, }, )) { - _serde::export::Some(__ret) => _serde::export::Ok(__ret), + _serde::__private::Some(__ret) => _serde::__private::Ok(__ret), // There is no second element. - _serde::export::None => { - _serde::export::Err(_serde::de::Error::invalid_length(1, &self)) + _serde::__private::None => { + _serde::__private::Err(_serde::de::Error::invalid_length(1, &self)) } } } // There is no first element. - _serde::export::None => { - _serde::export::Err(_serde::de::Error::invalid_length(0, &self)) + _serde::__private::None => { + _serde::__private::Err(_serde::de::Error::invalid_length(0, &self)) } } } @@ -1615,8 +1617,8 @@ fn deserialize_adjacently_tagged_enum( #type_name, FIELDS, __Visitor { - marker: _serde::export::PhantomData::<#this #ty_generics>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::<#this #ty_generics>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -1635,7 +1637,9 @@ fn deserialize_untagged_enum( params, variant, cattrs, - quote!(_serde::private::de::ContentRefDeserializer::<__D::Error>::new(&__content)), + quote!( + _serde::__private::de::ContentRefDeserializer::<__D::Error>::new(&__content) + ), )) }); @@ -1651,15 +1655,15 @@ fn deserialize_untagged_enum( ); quote_block! { - let __content = try!(<_serde::private::de::Content as _serde::Deserialize>::deserialize(__deserializer)); + let __content = try!(<_serde::__private::de::Content as _serde::Deserialize>::deserialize(__deserializer)); #( - if let _serde::export::Ok(__ok) = #attempts { - return _serde::export::Ok(__ok); + if let _serde::__private::Ok(__ok) = #attempts { + return _serde::__private::Ok(__ok); } )* - _serde::export::Err(_serde::de::Error::custom(#fallthrough_msg)) + _serde::__private::Err(_serde::de::Error::custom(#fallthrough_msg)) } } @@ -1672,7 +1676,7 @@ fn deserialize_externally_tagged_variant( let (wrapper, wrapper_ty, unwrap_fn) = wrap_deserialize_variant_with(params, variant, path); return quote_block! { #wrapper - _serde::export::Result::map( + _serde::__private::Result::map( _serde::de::VariantAccess::newtype_variant::<#wrapper_ty>(__variant), #unwrap_fn) }; } @@ -1684,7 +1688,7 @@ fn deserialize_externally_tagged_variant( let this = ¶ms.this; quote_block! { try!(_serde::de::VariantAccess::unit_variant(__variant)); - _serde::export::Ok(#this::#variant_ident) + _serde::__private::Ok(#this::#variant_ident) } } Style::Newtype => deserialize_externally_tagged_newtype_variant( @@ -1729,8 +1733,8 @@ fn deserialize_internally_tagged_variant( quote!((#default)) }); quote_block! { - try!(_serde::Deserializer::deserialize_any(#deserializer, _serde::private::de::InternallyTaggedUnitVisitor::new(#type_name, #variant_name))); - _serde::export::Ok(#this::#variant_ident #default) + try!(_serde::Deserializer::deserialize_any(#deserializer, _serde::__private::de::InternallyTaggedUnitVisitor::new(#type_name, #variant_name))); + _serde::__private::Ok(#this::#variant_ident #default) } } Style::Newtype => deserialize_untagged_newtype_variant( @@ -1761,7 +1765,7 @@ fn deserialize_untagged_variant( let (wrapper, wrapper_ty, unwrap_fn) = wrap_deserialize_variant_with(params, variant, path); return quote_block! { #wrapper - _serde::export::Result::map( + _serde::__private::Result::map( <#wrapper_ty as _serde::Deserialize>::deserialize(#deserializer), #unwrap_fn) }; } @@ -1780,10 +1784,10 @@ fn deserialize_untagged_variant( quote_expr! { match _serde::Deserializer::deserialize_any( #deserializer, - _serde::private::de::UntaggedUnitVisitor::new(#type_name, #variant_name) + _serde::__private::de::UntaggedUnitVisitor::new(#type_name, #variant_name) ) { - _serde::export::Ok(()) => _serde::export::Ok(#this::#variant_ident #default), - _serde::export::Err(__err) => _serde::export::Err(__err), + _serde::__private::Ok(()) => _serde::__private::Ok(#this::#variant_ident #default), + _serde::__private::Err(__err) => _serde::__private::Err(__err), } } } @@ -1824,7 +1828,7 @@ fn deserialize_externally_tagged_newtype_variant( let default = Expr(expr_is_missing(field, cattrs)); return quote_block! { try!(_serde::de::VariantAccess::unit_variant(__variant)); - _serde::export::Ok(#this::#variant_ident(#default)) + _serde::__private::Ok(#this::#variant_ident(#default)) }; } @@ -1835,14 +1839,14 @@ fn deserialize_externally_tagged_newtype_variant( let func = quote_spanned!(span=> _serde::de::VariantAccess::newtype_variant::<#field_ty>); quote_expr! { - _serde::export::Result::map(#func(__variant), #this::#variant_ident) + _serde::__private::Result::map(#func(__variant), #this::#variant_ident) } } Some(path) => { let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path); quote_block! { #wrapper - _serde::export::Result::map( + _serde::__private::Result::map( _serde::de::VariantAccess::newtype_variant::<#wrapper_ty>(__variant), |__wrapper| #this::#variant_ident(__wrapper.value)) } @@ -1863,13 +1867,13 @@ fn deserialize_untagged_newtype_variant( let span = field.original.span(); let func = quote_spanned!(span=> <#field_ty as _serde::Deserialize>::deserialize); quote_expr! { - _serde::export::Result::map(#func(#deserializer), #this::#variant_ident) + _serde::__private::Result::map(#func(#deserializer), #this::#variant_ident) } } Some(path) => { quote_block! { - let __value: _serde::export::Result<#field_ty, _> = #path(#deserializer); - _serde::export::Result::map(__value, #this::#variant_ident) + let __value: _serde::__private::Result<#field_ty, _> = #path(#deserializer); + _serde::__private::Result::map(__value, #this::#variant_ident) } } } @@ -1885,18 +1889,18 @@ fn deserialize_generated_identifier( let field_idents: &Vec<_> = &fields.iter().map(|(_, ident, _)| ident).collect(); let (ignore_variant, fallthrough) = if !is_variant && cattrs.has_flatten() { - let ignore_variant = quote!(__other(_serde::private::de::Content<'de>),); - let fallthrough = quote!(_serde::export::Ok(__Field::__other(__value))); + let ignore_variant = quote!(__other(_serde::__private::de::Content<'de>),); + let fallthrough = quote!(_serde::__private::Ok(__Field::__other(__value))); (Some(ignore_variant), Some(fallthrough)) } else if let Some(other_idx) = other_idx { let ignore_variant = fields[other_idx].1.clone(); - let fallthrough = quote!(_serde::export::Ok(__Field::#ignore_variant)); + let fallthrough = quote!(_serde::__private::Ok(__Field::#ignore_variant)); (None, Some(fallthrough)) } else if is_variant || cattrs.deny_unknown_fields() { (None, None) } else { let ignore_variant = quote!(__ignore,); - let fallthrough = quote!(_serde::export::Ok(__Field::__ignore)); + let fallthrough = quote!(_serde::__private::Ok(__Field::__ignore)); (Some(ignore_variant), Some(fallthrough)) }; @@ -1931,7 +1935,7 @@ fn deserialize_generated_identifier( impl<'de> _serde::Deserialize<'de> for __Field #lifetime { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -1959,13 +1963,13 @@ fn deserialize_custom_identifier( let last_ident = &last.ident; if last.attrs.other() { let ordinary = &variants[..variants.len() - 1]; - let fallthrough = quote!(_serde::export::Ok(#this::#last_ident)); + let fallthrough = quote!(_serde::__private::Ok(#this::#last_ident)); (ordinary, Some(fallthrough)) } else if let Style::Newtype = last.style { let ordinary = &variants[..variants.len() - 1]; - let deserializer = quote!(_serde::private::de::IdentifierDeserializer::from(__value)); + let deserializer = quote!(_serde::__private::de::IdentifierDeserializer::from(__value)); let fallthrough = quote! { - _serde::export::Result::map( + _serde::__private::Result::map( _serde::Deserialize::deserialize(#deserializer), #this::#last_ident) }; @@ -2019,8 +2023,8 @@ fn deserialize_custom_identifier( #names_const struct __FieldVisitor #de_impl_generics #where_clause { - marker: _serde::export::PhantomData<#this #ty_generics>, - lifetime: _serde::export::PhantomData<&#delife ()>, + marker: _serde::__private::PhantomData<#this #ty_generics>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #de_impl_generics _serde::de::Visitor<#delife> for __FieldVisitor #de_ty_generics #where_clause { @@ -2030,8 +2034,8 @@ fn deserialize_custom_identifier( } let __visitor = __FieldVisitor { - marker: _serde::export::PhantomData::<#this #ty_generics>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::<#this #ty_generics>, + lifetime: _serde::__private::PhantomData, }; _serde::Deserializer::deserialize_identifier(__deserializer, __visitor) } @@ -2079,7 +2083,7 @@ fn deserialize_identifier( None } else { Some(quote! { - let __value = &_serde::export::from_utf8_lossy(__value); + let __value = &_serde::__private::from_utf8_lossy(__value); }) }; @@ -2091,16 +2095,16 @@ fn deserialize_identifier( ) = if collect_other_fields { ( Some(quote! { - let __value = _serde::private::de::Content::String(_serde::export::ToString::to_string(__value)); + let __value = _serde::__private::de::Content::String(_serde::__private::ToString::to_string(__value)); }), Some(quote! { - let __value = _serde::private::de::Content::Str(__value); + let __value = _serde::__private::de::Content::Str(__value); }), Some(quote! { - let __value = _serde::private::de::Content::ByteBuf(__value.to_vec()); + let __value = _serde::__private::de::Content::ByteBuf(__value.to_vec()); }), Some(quote! { - let __value = _serde::private::de::Content::Bytes(__value); + let __value = _serde::__private::de::Content::Bytes(__value); }), ) } else { @@ -2111,11 +2115,11 @@ fn deserialize_identifier( fallthrough } else if is_variant { quote! { - _serde::export::Err(_serde::de::Error::unknown_variant(__value, VARIANTS)) + _serde::__private::Err(_serde::de::Error::unknown_variant(__value, VARIANTS)) } } else { quote! { - _serde::export::Err(_serde::de::Error::unknown_field(__value, FIELDS)) + _serde::__private::Err(_serde::de::Error::unknown_field(__value, FIELDS)) } }; @@ -2123,104 +2127,104 @@ fn deserialize_identifier( let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len()); let visit_other = if collect_other_fields { quote! { - fn visit_bool<__E>(self, __value: bool) -> _serde::export::Result + fn visit_bool<__E>(self, __value: bool) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::Bool(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::Bool(__value))) } - fn visit_i8<__E>(self, __value: i8) -> _serde::export::Result + fn visit_i8<__E>(self, __value: i8) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::I8(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::I8(__value))) } - fn visit_i16<__E>(self, __value: i16) -> _serde::export::Result + fn visit_i16<__E>(self, __value: i16) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::I16(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::I16(__value))) } - fn visit_i32<__E>(self, __value: i32) -> _serde::export::Result + fn visit_i32<__E>(self, __value: i32) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::I32(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::I32(__value))) } - fn visit_i64<__E>(self, __value: i64) -> _serde::export::Result + fn visit_i64<__E>(self, __value: i64) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::I64(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::I64(__value))) } - fn visit_u8<__E>(self, __value: u8) -> _serde::export::Result + fn visit_u8<__E>(self, __value: u8) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::U8(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::U8(__value))) } - fn visit_u16<__E>(self, __value: u16) -> _serde::export::Result + fn visit_u16<__E>(self, __value: u16) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::U16(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::U16(__value))) } - fn visit_u32<__E>(self, __value: u32) -> _serde::export::Result + fn visit_u32<__E>(self, __value: u32) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::U32(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::U32(__value))) } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::U64(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::U64(__value))) } - fn visit_f32<__E>(self, __value: f32) -> _serde::export::Result + fn visit_f32<__E>(self, __value: f32) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::F32(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::F32(__value))) } - fn visit_f64<__E>(self, __value: f64) -> _serde::export::Result + fn visit_f64<__E>(self, __value: f64) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::F64(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::F64(__value))) } - fn visit_char<__E>(self, __value: char) -> _serde::export::Result + fn visit_char<__E>(self, __value: char) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::Char(__value))) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::Char(__value))) } - fn visit_unit<__E>(self) -> _serde::export::Result + fn visit_unit<__E>(self) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(__Field::__other(_serde::private::de::Content::Unit)) + _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::Unit)) } - fn visit_borrowed_str<__E>(self, __value: &'de str) -> _serde::export::Result + fn visit_borrowed_str<__E>(self, __value: &'de str) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { #( - #field_borrowed_strs => _serde::export::Ok(#constructors), + #field_borrowed_strs => _serde::__private::Ok(#constructors), )* _ => { #value_as_borrowed_str_content @@ -2229,13 +2233,13 @@ fn deserialize_identifier( } } - fn visit_borrowed_bytes<__E>(self, __value: &'de [u8]) -> _serde::export::Result + fn visit_borrowed_bytes<__E>(self, __value: &'de [u8]) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { #( - #field_borrowed_bytes => _serde::export::Ok(#constructors), + #field_borrowed_bytes => _serde::__private::Ok(#constructors), )* _ => { #bytes_to_str @@ -2247,15 +2251,15 @@ fn deserialize_identifier( } } else { quote! { - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { #( - #variant_indices => _serde::export::Ok(#main_constructors), + #variant_indices => _serde::__private::Ok(#main_constructors), )* - _ => _serde::export::Err(_serde::de::Error::invalid_value( + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &#fallthrough_msg, )) @@ -2265,19 +2269,19 @@ fn deserialize_identifier( }; quote_block! { - fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, #expecting) + fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, #expecting) } #visit_other - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>(self, __value: &str) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { #( - #field_strs => _serde::export::Ok(#constructors), + #field_strs => _serde::__private::Ok(#constructors), )* _ => { #value_as_str_content @@ -2286,13 +2290,13 @@ fn deserialize_identifier( } } - fn visit_bytes<__E>(self, __value: &[u8]) -> _serde::export::Result + fn visit_bytes<__E>(self, __value: &[u8]) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { #( - #field_bytes => _serde::export::Ok(#constructors), + #field_bytes => _serde::__private::Ok(#constructors), )* _ => { #bytes_to_str @@ -2385,16 +2389,16 @@ fn deserialize_map( .map(|(field, name)| { let field_ty = field.ty; quote! { - let mut #name: _serde::export::Option<#field_ty> = _serde::export::None; + let mut #name: _serde::__private::Option<#field_ty> = _serde::__private::None; } }); // Collect contents for flatten fields into a buffer let let_collect = if cattrs.has_flatten() { Some(quote! { - let mut __collect = _serde::export::Vec::<_serde::export::Option<( - _serde::private::de::Content, - _serde::private::de::Content + let mut __collect = _serde::__private::Vec::<_serde::__private::Option<( + _serde::__private::de::Content, + _serde::__private::de::Content )>>::new(); }) } else { @@ -2423,9 +2427,9 @@ fn deserialize_map( quote!({ #wrapper match _serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map) { - _serde::export::Ok(__wrapper) => __wrapper.value, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__wrapper) => __wrapper.value, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } }) @@ -2433,10 +2437,10 @@ fn deserialize_map( }; quote! { __Field::#name => { - if _serde::export::Option::is_some(&#name) { - return _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#deser_name)); + if _serde::__private::Option::is_some(&#name) { + return _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#deser_name)); } - #name = _serde::export::Some(#visit); + #name = _serde::__private::Some(#visit); } } }); @@ -2445,7 +2449,7 @@ fn deserialize_map( let ignored_arm = if cattrs.has_flatten() { Some(quote! { __Field::__other(__name) => { - __collect.push(_serde::export::Some(( + __collect.push(_serde::__private::Some(( __name, try!(_serde::de::MapAccess::next_value(&mut __map))))); } @@ -2462,14 +2466,14 @@ fn deserialize_map( let match_keys = if cattrs.deny_unknown_fields() && all_skipped { quote! { // FIXME: Once we drop support for Rust 1.15: - // let _serde::export::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map)); - _serde::export::Option::map( + // let _serde::__private::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map)); + _serde::__private::Option::map( try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)), |__impossible| match __impossible {}); } } else { quote! { - while let _serde::export::Some(__key) = try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)) { + while let _serde::__private::Some(__key) = try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)) { match __key { #(#value_arms)* #ignored_arm @@ -2486,8 +2490,8 @@ fn deserialize_map( quote! { let #name = match #name { - _serde::export::Some(#name) => #name, - _serde::export::None => #missing_expr + _serde::__private::Some(#name) => #name, + _serde::__private::None => #missing_expr }; } }); @@ -2506,22 +2510,22 @@ fn deserialize_map( }; quote! { let #name: #field_ty = try!(#func( - _serde::private::de::FlatMapDeserializer( + _serde::__private::de::FlatMapDeserializer( &mut __collect, - _serde::export::PhantomData))); + _serde::__private::PhantomData))); } }); let collected_deny_unknown_fields = if cattrs.has_flatten() && cattrs.deny_unknown_fields() { Some(quote! { - if let _serde::export::Some(_serde::export::Some((__key, _))) = - __collect.into_iter().filter(_serde::export::Option::is_some).next() + if let _serde::__private::Some(_serde::__private::Some((__key, _))) = + __collect.into_iter().filter(_serde::__private::Option::is_some).next() { - if let _serde::export::Some(__key) = __key.as_str() { - return _serde::export::Err( + if let _serde::__private::Some(__key) = __key.as_str() { + return _serde::__private::Err( _serde::de::Error::custom(format_args!("unknown field `{}`", &__key))); } else { - return _serde::export::Err( + return _serde::__private::Err( _serde::de::Error::custom(format_args!("unexpected map key"))); } } @@ -2542,7 +2546,7 @@ fn deserialize_map( let let_default = match cattrs.default() { attr::Default::Default => Some(quote!( - let __default: Self::Value = _serde::export::Default::default(); + let __default: Self::Value = _serde::__private::Default::default(); )), attr::Default::Path(path) => Some(quote!( let __default: Self::Value = #path(); @@ -2558,7 +2562,7 @@ fn deserialize_map( if params.has_getter { let this = ¶ms.this; result = quote! { - _serde::export::Into::<#this>::into(#result) + _serde::__private::Into::<#this>::into(#result) }; } @@ -2577,7 +2581,7 @@ fn deserialize_map( #collected_deny_unknown_fields - _serde::export::Ok(#result) + _serde::__private::Ok(#result) } } @@ -2653,7 +2657,7 @@ fn deserialize_map_in_place( let visit = match field.attrs.deserialize_with() { None => { quote! { - try!(_serde::de::MapAccess::next_value_seed(&mut __map, _serde::private::de::InPlaceSeed(&mut self.place.#member))) + try!(_serde::de::MapAccess::next_value_seed(&mut __map, _serde::__private::de::InPlaceSeed(&mut self.place.#member))) } } Some(path) => { @@ -2661,9 +2665,9 @@ fn deserialize_map_in_place( quote!({ #wrapper self.place.#member = match _serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map) { - _serde::export::Ok(__wrapper) => __wrapper.value, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__wrapper) => __wrapper.value, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; }) @@ -2672,7 +2676,7 @@ fn deserialize_map_in_place( quote! { __Field::#name => { if #name { - return _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#deser_name)); + return _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#deser_name)); } #visit; #name = true; @@ -2694,14 +2698,14 @@ fn deserialize_map_in_place( let match_keys = if cattrs.deny_unknown_fields() && all_skipped { quote! { // FIXME: Once we drop support for Rust 1.15: - // let _serde::export::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map)); - _serde::export::Option::map( + // let _serde::__private::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map)); + _serde::__private::Option::map( try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)), |__impossible| match __impossible {}); } } else { quote! { - while let _serde::export::Some(__key) = try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)) { + while let _serde::__private::Some(__key) = try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)) { match __key { #(#value_arms_from)* #ignored_arm @@ -2743,7 +2747,7 @@ fn deserialize_map_in_place( let let_default = match cattrs.default() { attr::Default::Default => Some(quote!( - let __default: #this #ty_generics = _serde::export::Default::default(); + let __default: #this #ty_generics = _serde::__private::Default::default(); )), attr::Default::Path(path) => Some(quote!( let __default: #this #ty_generics = #path(); @@ -2764,7 +2768,7 @@ fn deserialize_map_in_place( #(#check_flags)* - _serde::export::Ok(()) + _serde::__private::Ok(()) } } @@ -2787,19 +2791,19 @@ fn wrap_deserialize_with( let wrapper = quote! { struct __DeserializeWith #de_impl_generics #where_clause { value: #value_ty, - phantom: _serde::export::PhantomData<#this #ty_generics>, - lifetime: _serde::export::PhantomData<&#delife ()>, + phantom: _serde::__private::PhantomData<#this #ty_generics>, + lifetime: _serde::__private::PhantomData<&#delife ()>, } impl #de_impl_generics _serde::Deserialize<#delife> for __DeserializeWith #de_ty_generics #where_clause { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<#delife>, { - _serde::export::Ok(__DeserializeWith { + _serde::__private::Ok(__DeserializeWith { value: try!(#deserialize_with(__deserializer)), - phantom: _serde::export::PhantomData, - lifetime: _serde::export::PhantomData, + phantom: _serde::__private::PhantomData, + lifetime: _serde::__private::PhantomData, }) } } @@ -2867,7 +2871,7 @@ fn expr_is_missing(field: &Field, cattrs: &attr::Container) -> Fragment { match field.attrs.default() { attr::Default::Default => { let span = field.original.span(); - let func = quote_spanned!(span=> _serde::export::Default::default); + let func = quote_spanned!(span=> _serde::__private::Default::default); return quote_expr!(#func()); } attr::Default::Path(path) => { @@ -2888,14 +2892,14 @@ fn expr_is_missing(field: &Field, cattrs: &attr::Container) -> Fragment { match field.attrs.deserialize_with() { None => { let span = field.original.span(); - let func = quote_spanned!(span=> _serde::private::de::missing_field); + let func = quote_spanned!(span=> _serde::__private::de::missing_field); quote_expr! { try!(#func(#name)) } } Some(_) => { quote_expr! { - return _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#name)) + return _serde::__private::Err(<__A::Error as _serde::de::Error>::missing_field(#name)) } } } diff --git a/serde_derive/src/internals/attr.rs b/serde_derive/src/internals/attr.rs index e6f72dfe..766910c3 100644 --- a/serde_derive/src/internals/attr.rs +++ b/serde_derive/src/internals/attr.rs @@ -1393,7 +1393,7 @@ impl Field { }; let span = Span::call_site(); path.segments.push(Ident::new("_serde", span).into()); - path.segments.push(Ident::new("private", span).into()); + path.segments.push(Ident::new("__private", span).into()); path.segments.push(Ident::new("de", span).into()); path.segments .push(Ident::new("borrow_cow_str", span).into()); @@ -1410,7 +1410,7 @@ impl Field { }; let span = Span::call_site(); path.segments.push(Ident::new("_serde", span).into()); - path.segments.push(Ident::new("private", span).into()); + path.segments.push(Ident::new("__private", span).into()); path.segments.push(Ident::new("de", span).into()); path.segments .push(Ident::new("borrow_cow_bytes", span).into()); diff --git a/serde_derive/src/pretend.rs b/serde_derive/src/pretend.rs index 7233c236..955ce3d1 100644 --- a/serde_derive/src/pretend.rs +++ b/serde_derive/src/pretend.rs @@ -74,9 +74,9 @@ fn pretend_fields_used(cont: &Container) -> TokenStream { }; quote! { - match _serde::export::None::<#type_ident #ty_generics> { + match _serde::__private::None::<#type_ident #ty_generics> { #( - _serde::export::Some(#patterns) => {} + _serde::__private::Some(#patterns) => {} )* _ => {} } @@ -120,8 +120,8 @@ fn pretend_variants_used(cont: &Container) -> TokenStream { }; quote! { - match _serde::export::None { - _serde::export::Some((#(#placeholders,)*)) => { + match _serde::__private::None { + _serde::__private::Some((#(#placeholders,)*)) => { let _ = #type_ident::#variant_ident #turbofish #pat; } _ => {} diff --git a/serde_derive/src/ser.rs b/serde_derive/src/ser.rs index f29d7380..91154dc6 100644 --- a/serde_derive/src/ser.rs +++ b/serde_derive/src/ser.rs @@ -29,7 +29,7 @@ pub fn expand_derive_serialize(input: &syn::DeriveInput) -> Result(__self: &#remote #ty_generics, __serializer: __S) -> #serde::export::Result<__S::Ok, __S::Error> + #vis fn serialize<__S>(__self: &#remote #ty_generics, __serializer: __S) -> #serde::__private::Result<__S::Ok, __S::Error> where __S: #serde::Serializer, { @@ -42,7 +42,7 @@ pub fn expand_derive_serialize(input: &syn::DeriveInput) -> Result(&self, __serializer: __S) -> #serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>(&self, __serializer: __S) -> #serde::__private::Result<__S::Ok, __S::Error> where __S: #serde::Serializer, { @@ -211,7 +211,7 @@ fn serialize_into(params: &Parameters, type_into: &syn::Type) -> Fragment { let self_var = ¶ms.self_var; quote_block! { _serde::Serialize::serialize( - &_serde::export::Into::<#type_into>::into(_serde::export::Clone::clone(#self_var)), + &_serde::__private::Into::<#type_into>::into(_serde::__private::Clone::clone(#self_var)), __serializer) } } @@ -372,7 +372,7 @@ fn serialize_struct_as_map( let let_mut = mut_if(serialized_fields.peek().is_some() || tag_field_exists); let len = if cattrs.has_flatten() { - quote!(_serde::export::None) + quote!(_serde::__private::None) } else { let len = serialized_fields .map(|field| match field.attrs.skip_serializing_if() { @@ -386,7 +386,7 @@ fn serialize_struct_as_map( quote!(#tag_field_exists as usize), |sum, expr| quote!(#sum + #expr), ); - quote!(_serde::export::Some(#len)) + quote!(_serde::__private::Some(#len)) }; quote_block! { @@ -433,7 +433,7 @@ fn serialize_variant( variant_ident ); let skipped_err = quote! { - _serde::export::Err(_serde::ser::Error::custom(#skipped_msg)) + _serde::__private::Err(_serde::ser::Error::custom(#skipped_msg)) }; let fields_pat = match variant.style { Style::Unit => quote!(), @@ -578,7 +578,7 @@ fn serialize_internally_tagged_variant( if let Some(path) = variant.attrs.serialize_with() { let ser = wrap_serialize_variant_with(params, path, variant); return quote_expr! { - _serde::private::ser::serialize_tagged_newtype( + _serde::__private::ser::serialize_tagged_newtype( __serializer, #enum_ident_str, #variant_ident_str, @@ -607,7 +607,7 @@ fn serialize_internally_tagged_variant( } let span = field.original.span(); - let func = quote_spanned!(span=> _serde::private::ser::serialize_tagged_newtype); + let func = quote_spanned!(span=> _serde::__private::ser::serialize_tagged_newtype); quote_expr! { #func( __serializer, @@ -715,11 +715,11 @@ fn serialize_adjacently_tagged_variant( quote_block! { struct __AdjacentlyTagged #wrapper_generics #where_clause { data: (#(&'__a #fields_ty,)*), - phantom: _serde::export::PhantomData<#this #ty_generics>, + phantom: _serde::__private::PhantomData<#this #ty_generics>, } impl #wrapper_impl_generics _serde::Serialize for __AdjacentlyTagged #wrapper_ty_generics #where_clause { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>(&self, __serializer: __S) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -737,7 +737,7 @@ fn serialize_adjacently_tagged_variant( try!(_serde::ser::SerializeStruct::serialize_field( &mut __struct, #content, &__AdjacentlyTagged { data: (#(#fields_ident,)*), - phantom: _serde::export::PhantomData::<#this #ty_generics>, + phantom: _serde::__private::PhantomData::<#this #ty_generics>, })); _serde::ser::SerializeStruct::end(__struct) } @@ -978,18 +978,18 @@ fn serialize_struct_variant_with_flatten<'a>( quote_block! { struct __EnumFlatten #wrapper_generics #where_clause { data: (#(&'__a #fields_ty,)*), - phantom: _serde::export::PhantomData<#this #ty_generics>, + phantom: _serde::__private::PhantomData<#this #ty_generics>, } impl #wrapper_impl_generics _serde::Serialize for __EnumFlatten #wrapper_ty_generics #where_clause { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>(&self, __serializer: __S) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { let (#(#members,)*) = self.data; let #let_mut __serde_state = try!(_serde::Serializer::serialize_map( __serializer, - _serde::export::None)); + _serde::__private::None)); #(#serialize_fields)* _serde::ser::SerializeMap::end(__serde_state) } @@ -1002,7 +1002,7 @@ fn serialize_struct_variant_with_flatten<'a>( #variant_name, &__EnumFlatten { data: (#(#members,)*), - phantom: _serde::export::PhantomData::<#this #ty_generics>, + phantom: _serde::__private::PhantomData::<#this #ty_generics>, }) } } @@ -1010,7 +1010,7 @@ fn serialize_struct_variant_with_flatten<'a>( quote_block! { let #let_mut __serde_state = try!(_serde::Serializer::serialize_map( __serializer, - _serde::export::None)); + _serde::__private::None)); try!(_serde::ser::SerializeMap::serialize_entry( &mut __serde_state, #tag, @@ -1024,7 +1024,7 @@ fn serialize_struct_variant_with_flatten<'a>( quote_block! { let #let_mut __serde_state = try!(_serde::Serializer::serialize_map( __serializer, - _serde::export::None)); + _serde::__private::None)); #(#serialize_fields)* _serde::ser::SerializeMap::end(__serde_state) } @@ -1113,7 +1113,7 @@ fn serialize_struct_visitor( let ser = if field.attrs.flatten() { let func = quote_spanned!(span=> _serde::Serialize::serialize); quote! { - try!(#func(&#field_expr, _serde::private::ser::FlatMapSerializer(&mut __serde_state))); + try!(#func(&#field_expr, _serde::__private::ser::FlatMapSerializer(&mut __serde_state))); } } else { let func = struct_trait.serialize_field(span); @@ -1208,11 +1208,11 @@ fn wrap_serialize_with( quote!({ struct __SerializeWith #wrapper_impl_generics #where_clause { values: (#(&'__a #field_tys, )*), - phantom: _serde::export::PhantomData<#this #ty_generics>, + phantom: _serde::__private::PhantomData<#this #ty_generics>, } impl #wrapper_impl_generics _serde::Serialize for __SerializeWith #wrapper_ty_generics #where_clause { - fn serialize<__S>(&self, __s: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>(&self, __s: __S) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -1222,7 +1222,7 @@ fn wrap_serialize_with( &__SerializeWith { values: (#(#field_exprs, )*), - phantom: _serde::export::PhantomData::<#this #ty_generics>, + phantom: _serde::__private::PhantomData::<#this #ty_generics>, } }) } @@ -1258,11 +1258,11 @@ fn get_member(params: &Parameters, field: &Field, member: &Member) -> TokenStrea quote!(&#self_var.#member) }; let ty = field.ty; - quote!(_serde::private::ser::constrain::<#ty>(#inner)) + quote!(_serde::__private::ser::constrain::<#ty>(#inner)) } (true, Some(getter)) => { let ty = field.ty; - quote!(_serde::private::ser::constrain::<#ty>(&#getter(#self_var))) + quote!(_serde::__private::ser::constrain::<#ty>(&#getter(#self_var))) } (false, Some(_)) => { unreachable!("getter is only allowed for remote impls"); diff --git a/serde_derive/src/try.rs b/serde_derive/src/try.rs index 48829b63..48cceeba 100644 --- a/serde_derive/src/try.rs +++ b/serde_derive/src/try.rs @@ -13,9 +13,9 @@ pub fn replacement() -> TokenStream { macro_rules! try { (#dollar __expr:expr) => { match #dollar __expr { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } diff --git a/test_suite/tests/expand/de_enum.expanded.rs b/test_suite/tests/expand/de_enum.expanded.rs index c5d44f8a..14bcd927 100644 --- a/test_suite/tests/expand/de_enum.expanded.rs +++ b/test_suite/tests/expand/de_enum.expanded.rs @@ -19,7 +19,10 @@ const _: () = { C: _serde::Serialize, D: _serde::Serialize, { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -35,45 +38,45 @@ const _: () = { "Seq", 0 + 1 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field0, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field2, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field3, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeTupleVariant::end(__serde_state) @@ -91,9 +94,9 @@ const _: () = { "Map", 0 + 1 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -101,9 +104,9 @@ const _: () = { "a", a, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -111,9 +114,9 @@ const _: () = { "b", b, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -121,9 +124,9 @@ const _: () = { "c", c, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -131,9 +134,9 @@ const _: () = { "d", d, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStructVariant::end(__serde_state) @@ -152,45 +155,45 @@ const _: () = { "_Seq2", 0 + 1 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field0, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field2, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field3, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeTupleVariant::end(__serde_state) @@ -208,9 +211,9 @@ const _: () = { "_Map2", 0 + 1 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -218,9 +221,9 @@ const _: () = { "a", a, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -228,9 +231,9 @@ const _: () = { "b", b, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -238,9 +241,9 @@ const _: () = { "c", c, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -248,9 +251,9 @@ const _: () = { "d", d, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStructVariant::end(__serde_state) @@ -271,7 +274,7 @@ const _: () = { C: _serde::Deserialize<'de>, D: _serde::Deserialize<'de>, { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -289,39 +292,42 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "variant identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "variant identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - 1u64 => _serde::export::Ok(__Field::__field1), - 2u64 => _serde::export::Ok(__Field::__field2), - 3u64 => _serde::export::Ok(__Field::__field3), - 4u64 => _serde::export::Ok(__Field::__field4), - 5u64 => _serde::export::Ok(__Field::__field5), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + 1u64 => _serde::__private::Ok(__Field::__field1), + 2u64 => _serde::__private::Ok(__Field::__field2), + 3u64 => _serde::__private::Ok(__Field::__field3), + 4u64 => _serde::__private::Ok(__Field::__field4), + 5u64 => _serde::__private::Ok(__Field::__field5), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"variant index 0 <= i < 6", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "Unit" => _serde::export::Ok(__Field::__field0), - "Seq" => _serde::export::Ok(__Field::__field1), - "Map" => _serde::export::Ok(__Field::__field2), - "_Unit2" => _serde::export::Ok(__Field::__field3), - "_Seq2" => _serde::export::Ok(__Field::__field4), - "_Map2" => _serde::export::Ok(__Field::__field5), - _ => _serde::export::Err(_serde::de::Error::unknown_variant( + "Unit" => _serde::__private::Ok(__Field::__field0), + "Seq" => _serde::__private::Ok(__Field::__field1), + "Map" => _serde::__private::Ok(__Field::__field2), + "_Unit2" => _serde::__private::Ok(__Field::__field3), + "_Seq2" => _serde::__private::Ok(__Field::__field4), + "_Map2" => _serde::__private::Ok(__Field::__field5), + _ => _serde::__private::Err(_serde::de::Error::unknown_variant( __value, VARIANTS, )), } @@ -329,20 +335,20 @@ const _: () = { fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"Unit" => _serde::export::Ok(__Field::__field0), - b"Seq" => _serde::export::Ok(__Field::__field1), - b"Map" => _serde::export::Ok(__Field::__field2), - b"_Unit2" => _serde::export::Ok(__Field::__field3), - b"_Seq2" => _serde::export::Ok(__Field::__field4), - b"_Map2" => _serde::export::Ok(__Field::__field5), + b"Unit" => _serde::__private::Ok(__Field::__field0), + b"Seq" => _serde::__private::Ok(__Field::__field1), + b"Map" => _serde::__private::Ok(__Field::__field2), + b"_Unit2" => _serde::__private::Ok(__Field::__field3), + b"_Seq2" => _serde::__private::Ok(__Field::__field4), + b"_Map2" => _serde::__private::Ok(__Field::__field5), _ => { - let __value = &_serde::export::from_utf8_lossy(__value); - _serde::export::Err(_serde::de::Error::unknown_variant( + let __value = &_serde::__private::from_utf8_lossy(__value); + _serde::__private::Err(_serde::de::Error::unknown_variant( __value, VARIANTS, )) } @@ -351,7 +357,9 @@ const _: () = { } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -364,8 +372,8 @@ const _: () = { C: _serde::Deserialize<'de>, D: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, B, C, D> _serde::de::Visitor<'de> for __Visitor<'de, B, C, D> where @@ -376,31 +384,31 @@ const _: () = { type Value = DeEnum; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "enum DeEnum") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "enum DeEnum") } fn visit_enum<__A>( self, __data: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::EnumAccess<'de>, { match match _serde::de::EnumAccess::variant(__data) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { (__Field::__field0, __variant) => { match _serde::de::VariantAccess::unit_variant(__variant) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; - _serde::export::Ok(DeEnum::Unit) + _serde::__private::Ok(DeEnum::Unit) } (__Field::__field1, __variant) => { struct __Visitor<'de, B, C, D> @@ -409,8 +417,8 @@ const _: () = { C: _serde::Deserialize<'de>, D: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, B, C, D> _serde::de::Visitor<'de> for __Visitor<'de, B, C, D> where @@ -421,9 +429,10 @@ const _: () = { type Value = DeEnum; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "tuple variant DeEnum::Seq", ) @@ -432,7 +441,7 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { @@ -441,14 +450,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 0usize, &"tuple variant DeEnum::Seq with 4 elements", @@ -461,14 +470,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 1usize, &"tuple variant DeEnum::Seq with 4 elements", @@ -481,14 +490,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 2usize, &"tuple variant DeEnum::Seq with 4 elements", @@ -501,14 +510,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 3usize, &"tuple variant DeEnum::Seq with 4 elements", @@ -516,7 +525,7 @@ const _: () = { ); } }; - _serde::export::Ok(DeEnum::Seq( + _serde::__private::Ok(DeEnum::Seq( __field0, __field1, __field2, __field3, )) } @@ -525,8 +534,8 @@ const _: () = { __variant, 4usize, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -544,9 +553,10 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "field identifier", ) @@ -554,49 +564,51 @@ const _: () = { fn visit_u64<__E>( self, __value: u64, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - 1u64 => _serde::export::Ok(__Field::__field1), - 2u64 => _serde::export::Ok(__Field::__field2), - 3u64 => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Err(_serde::de::Error::invalid_value( - _serde::de::Unexpected::Unsigned(__value), - &"field index 0 <= i < 4", - )), + 0u64 => _serde::__private::Ok(__Field::__field0), + 1u64 => _serde::__private::Ok(__Field::__field1), + 2u64 => _serde::__private::Ok(__Field::__field2), + 3u64 => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Err( + _serde::de::Error::invalid_value( + _serde::de::Unexpected::Unsigned(__value), + &"field index 0 <= i < 4", + ), + ), } } fn visit_str<__E>( self, __value: &str, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "a" => _serde::export::Ok(__Field::__field0), - "b" => _serde::export::Ok(__Field::__field1), - "c" => _serde::export::Ok(__Field::__field2), - "d" => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Ok(__Field::__ignore), + "a" => _serde::__private::Ok(__Field::__field0), + "b" => _serde::__private::Ok(__Field::__field1), + "c" => _serde::__private::Ok(__Field::__field2), + "d" => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"a" => _serde::export::Ok(__Field::__field0), - b"b" => _serde::export::Ok(__Field::__field1), - b"c" => _serde::export::Ok(__Field::__field2), - b"d" => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Ok(__Field::__ignore), + b"a" => _serde::__private::Ok(__Field::__field0), + b"b" => _serde::__private::Ok(__Field::__field1), + b"c" => _serde::__private::Ok(__Field::__field2), + b"d" => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Ok(__Field::__ignore), } } } @@ -604,7 +616,7 @@ const _: () = { #[inline] fn deserialize<__D>( __deserializer: __D, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -620,8 +632,8 @@ const _: () = { C: _serde::Deserialize<'de>, D: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, B, C, D> _serde::de::Visitor<'de> for __Visitor<'de, B, C, D> where @@ -632,9 +644,10 @@ const _: () = { type Value = DeEnum; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "struct variant DeEnum::Map", ) @@ -643,7 +656,7 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { @@ -652,14 +665,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 0usize, &"struct variant DeEnum::Map with 4 elements", @@ -672,14 +685,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 1usize, &"struct variant DeEnum::Map with 4 elements", @@ -692,14 +705,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 2usize, &"struct variant DeEnum::Map with 4 elements", @@ -712,14 +725,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 3usize, &"struct variant DeEnum::Map with 4 elements", @@ -727,7 +740,7 @@ const _: () = { ); } }; - _serde::export::Ok(DeEnum::Map { + _serde::__private::Ok(DeEnum::Map { a: __field0, b: __field1, c: __field2, @@ -738,84 +751,84 @@ const _: () = { fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { - let mut __field0: _serde::export::Option = - _serde::export::None; - let mut __field1: _serde::export::Option = - _serde::export::None; - let mut __field2: _serde::export::Option = - _serde::export::None; - let mut __field3: _serde::export::Option = - _serde::export::None; - while let _serde::export::Some(__key) = + let mut __field0: _serde::__private::Option = + _serde::__private::None; + let mut __field1: _serde::__private::Option = + _serde::__private::None; + let mut __field2: _serde::__private::Option = + _serde::__private::None; + let mut __field3: _serde::__private::Option = + _serde::__private::None; + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { - if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; + if _serde::__private::Option::is_some(&__field0) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; } - __field0 = _serde::export::Some( + __field0 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field1 => { - if _serde::export::Option::is_some(&__field1) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("b")) ; + if _serde::__private::Option::is_some(&__field1) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("b")) ; } - __field1 = _serde::export::Some( + __field1 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field2 => { - if _serde::export::Option::is_some(&__field2) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("c")) ; + if _serde::__private::Option::is_some(&__field2) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("c")) ; } - __field2 = _serde::export::Some( + __field2 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field3 => { - if _serde::export::Option::is_some(&__field3) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("d")) ; + if _serde::__private::Option::is_some(&__field3) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("d")) ; } - __field3 = _serde::export::Some( + __field3 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); @@ -826,59 +839,59 @@ const _: () = { >( &mut __map ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } let __field0 = match __field0 { - _serde::export::Some(__field0) => __field0, - _serde::export::None => { - match _serde::private::de::missing_field("a") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field0) => __field0, + _serde::__private::None => { + match _serde::__private::de::missing_field("a") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; let __field1 = match __field1 { - _serde::export::Some(__field1) => __field1, - _serde::export::None => { - match _serde::private::de::missing_field("b") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field1) => __field1, + _serde::__private::None => { + match _serde::__private::de::missing_field("b") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; let __field2 = match __field2 { - _serde::export::Some(__field2) => __field2, - _serde::export::None => { - match _serde::private::de::missing_field("c") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field2) => __field2, + _serde::__private::None => { + match _serde::__private::de::missing_field("c") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; let __field3 = match __field3 { - _serde::export::Some(__field3) => __field3, - _serde::export::None => { - match _serde::private::de::missing_field("d") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field3) => __field3, + _serde::__private::None => { + match _serde::__private::de::missing_field("d") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; - _serde::export::Ok(DeEnum::Map { + _serde::__private::Ok(DeEnum::Map { a: __field0, b: __field1, c: __field2, @@ -891,19 +904,19 @@ const _: () = { __variant, FIELDS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } (__Field::__field3, __variant) => { match _serde::de::VariantAccess::unit_variant(__variant) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; - _serde::export::Ok(DeEnum::_Unit2) + _serde::__private::Ok(DeEnum::_Unit2) } (__Field::__field4, __variant) => { struct __Visitor<'de, B, C, D> @@ -912,8 +925,8 @@ const _: () = { C: _serde::Deserialize<'de>, D: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, B, C, D> _serde::de::Visitor<'de> for __Visitor<'de, B, C, D> where @@ -924,9 +937,10 @@ const _: () = { type Value = DeEnum; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "tuple variant DeEnum::_Seq2", ) @@ -935,7 +949,7 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { @@ -944,14 +958,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 0usize, &"tuple variant DeEnum::_Seq2 with 4 elements", @@ -964,14 +978,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 1usize, &"tuple variant DeEnum::_Seq2 with 4 elements", @@ -984,14 +998,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 2usize, &"tuple variant DeEnum::_Seq2 with 4 elements", @@ -1004,14 +1018,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 3usize, &"tuple variant DeEnum::_Seq2 with 4 elements", @@ -1019,7 +1033,7 @@ const _: () = { ); } }; - _serde::export::Ok(DeEnum::_Seq2( + _serde::__private::Ok(DeEnum::_Seq2( __field0, __field1, __field2, __field3, )) } @@ -1028,8 +1042,8 @@ const _: () = { __variant, 4usize, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -1047,9 +1061,10 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "field identifier", ) @@ -1057,49 +1072,51 @@ const _: () = { fn visit_u64<__E>( self, __value: u64, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - 1u64 => _serde::export::Ok(__Field::__field1), - 2u64 => _serde::export::Ok(__Field::__field2), - 3u64 => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Err(_serde::de::Error::invalid_value( - _serde::de::Unexpected::Unsigned(__value), - &"field index 0 <= i < 4", - )), + 0u64 => _serde::__private::Ok(__Field::__field0), + 1u64 => _serde::__private::Ok(__Field::__field1), + 2u64 => _serde::__private::Ok(__Field::__field2), + 3u64 => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Err( + _serde::de::Error::invalid_value( + _serde::de::Unexpected::Unsigned(__value), + &"field index 0 <= i < 4", + ), + ), } } fn visit_str<__E>( self, __value: &str, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "a" => _serde::export::Ok(__Field::__field0), - "b" => _serde::export::Ok(__Field::__field1), - "c" => _serde::export::Ok(__Field::__field2), - "d" => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Ok(__Field::__ignore), + "a" => _serde::__private::Ok(__Field::__field0), + "b" => _serde::__private::Ok(__Field::__field1), + "c" => _serde::__private::Ok(__Field::__field2), + "d" => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"a" => _serde::export::Ok(__Field::__field0), - b"b" => _serde::export::Ok(__Field::__field1), - b"c" => _serde::export::Ok(__Field::__field2), - b"d" => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Ok(__Field::__ignore), + b"a" => _serde::__private::Ok(__Field::__field0), + b"b" => _serde::__private::Ok(__Field::__field1), + b"c" => _serde::__private::Ok(__Field::__field2), + b"d" => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Ok(__Field::__ignore), } } } @@ -1107,7 +1124,7 @@ const _: () = { #[inline] fn deserialize<__D>( __deserializer: __D, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -1123,8 +1140,8 @@ const _: () = { C: _serde::Deserialize<'de>, D: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, B, C, D> _serde::de::Visitor<'de> for __Visitor<'de, B, C, D> where @@ -1135,9 +1152,10 @@ const _: () = { type Value = DeEnum; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "struct variant DeEnum::_Map2", ) @@ -1146,7 +1164,7 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { @@ -1155,14 +1173,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 0usize, &"struct variant DeEnum::_Map2 with 4 elements", @@ -1175,14 +1193,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 1usize, &"struct variant DeEnum::_Map2 with 4 elements", @@ -1195,14 +1213,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 2usize, &"struct variant DeEnum::_Map2 with 4 elements", @@ -1215,14 +1233,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err( _serde::de::Error::invalid_length( 3usize, &"struct variant DeEnum::_Map2 with 4 elements", @@ -1230,7 +1248,7 @@ const _: () = { ); } }; - _serde::export::Ok(DeEnum::_Map2 { + _serde::__private::Ok(DeEnum::_Map2 { a: __field0, b: __field1, c: __field2, @@ -1241,84 +1259,84 @@ const _: () = { fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { - let mut __field0: _serde::export::Option = - _serde::export::None; - let mut __field1: _serde::export::Option = - _serde::export::None; - let mut __field2: _serde::export::Option = - _serde::export::None; - let mut __field3: _serde::export::Option = - _serde::export::None; - while let _serde::export::Some(__key) = + let mut __field0: _serde::__private::Option = + _serde::__private::None; + let mut __field1: _serde::__private::Option = + _serde::__private::None; + let mut __field2: _serde::__private::Option = + _serde::__private::None; + let mut __field3: _serde::__private::Option = + _serde::__private::None; + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { - if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; + if _serde::__private::Option::is_some(&__field0) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; } - __field0 = _serde::export::Some( + __field0 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field1 => { - if _serde::export::Option::is_some(&__field1) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("b")) ; + if _serde::__private::Option::is_some(&__field1) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("b")) ; } - __field1 = _serde::export::Some( + __field1 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field2 => { - if _serde::export::Option::is_some(&__field2) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("c")) ; + if _serde::__private::Option::is_some(&__field2) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("c")) ; } - __field2 = _serde::export::Some( + __field2 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field3 => { - if _serde::export::Option::is_some(&__field3) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("d")) ; + if _serde::__private::Option::is_some(&__field3) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("d")) ; } - __field3 = _serde::export::Some( + __field3 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); @@ -1329,59 +1347,59 @@ const _: () = { >( &mut __map ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } let __field0 = match __field0 { - _serde::export::Some(__field0) => __field0, - _serde::export::None => { - match _serde::private::de::missing_field("a") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field0) => __field0, + _serde::__private::None => { + match _serde::__private::de::missing_field("a") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; let __field1 = match __field1 { - _serde::export::Some(__field1) => __field1, - _serde::export::None => { - match _serde::private::de::missing_field("b") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field1) => __field1, + _serde::__private::None => { + match _serde::__private::de::missing_field("b") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; let __field2 = match __field2 { - _serde::export::Some(__field2) => __field2, - _serde::export::None => { - match _serde::private::de::missing_field("c") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field2) => __field2, + _serde::__private::None => { + match _serde::__private::de::missing_field("c") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; let __field3 = match __field3 { - _serde::export::Some(__field3) => __field3, - _serde::export::None => { - match _serde::private::de::missing_field("d") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field3) => __field3, + _serde::__private::None => { + match _serde::__private::de::missing_field("d") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; - _serde::export::Ok(DeEnum::_Map2 { + _serde::__private::Ok(DeEnum::_Map2 { a: __field0, b: __field1, c: __field2, @@ -1394,8 +1412,8 @@ const _: () = { __variant, FIELDS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -1409,8 +1427,8 @@ const _: () = { "DeEnum", VARIANTS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } diff --git a/test_suite/tests/expand/default_ty_param.expanded.rs b/test_suite/tests/expand/default_ty_param.expanded.rs index 8aaa3ab4..ab6f5b6a 100644 --- a/test_suite/tests/expand/default_ty_param.expanded.rs +++ b/test_suite/tests/expand/default_ty_param.expanded.rs @@ -15,7 +15,10 @@ const _: () = { extern crate serde as _serde; #[automatically_derived] impl> _serde::Serialize for DefaultTyParam { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -24,9 +27,9 @@ const _: () = { "DefaultTyParam", false as usize + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStruct::serialize_field( @@ -34,9 +37,9 @@ const _: () = { "phantom", &self.phantom, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStruct::end(__serde_state) @@ -50,7 +53,7 @@ const _: () = { extern crate serde as _serde; #[automatically_derived] impl<'de, T: AssociatedType> _serde::Deserialize<'de> for DefaultTyParam { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -64,47 +67,52 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "field identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "field identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"field index 0 <= i < 1", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "phantom" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + "phantom" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"phantom" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + b"phantom" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -112,76 +120,77 @@ const _: () = { } } struct __Visitor<'de, T: AssociatedType> { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, T: AssociatedType> _serde::de::Visitor<'de> for __Visitor<'de, T> { type Value = DefaultTyParam; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "struct DefaultTyParam") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "struct DefaultTyParam") } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { let __field0 = match match _serde::de::SeqAccess::next_element::>( &mut __seq, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"struct DefaultTyParam with 1 element", )); } }; - _serde::export::Ok(DefaultTyParam { phantom: __field0 }) + _serde::__private::Ok(DefaultTyParam { phantom: __field0 }) } #[inline] fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { - let mut __field0: _serde::export::Option> = _serde::export::None; - while let _serde::export::Some(__key) = + let mut __field0: _serde::__private::Option> = + _serde::__private::None; + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { - if _serde::export::Option::is_some(&__field0) { - return _serde::export::Err( + if _serde::__private::Option::is_some(&__field0) { + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field( "phantom", ), ); } - __field0 = _serde::export::Some( + __field0 = _serde::__private::Some( match _serde::de::MapAccess::next_value::>( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); @@ -191,25 +200,26 @@ const _: () = { _serde::de::IgnoredAny, >(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } let __field0 = match __field0 { - _serde::export::Some(__field0) => __field0, - _serde::export::None => match _serde::private::de::missing_field("phantom") - { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field0) => __field0, + _serde::__private::None => { + match _serde::__private::de::missing_field("phantom") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); + } } - }, + } }; - _serde::export::Ok(DefaultTyParam { phantom: __field0 }) + _serde::__private::Ok(DefaultTyParam { phantom: __field0 }) } } const FIELDS: &'static [&'static str] = &["phantom"]; @@ -218,15 +228,15 @@ const _: () = { "DefaultTyParam", FIELDS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } fn deserialize_in_place<__D>( __deserializer: __D, __place: &mut Self, - ) -> _serde::export::Result<(), __D::Error> + ) -> _serde::__private::Result<(), __D::Error> where __D: _serde::Deserializer<'de>, { @@ -240,47 +250,52 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "field identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "field identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"field index 0 <= i < 1", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "phantom" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + "phantom" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"phantom" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + b"phantom" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -289,7 +304,7 @@ const _: () = { } struct __Visitor<'de, 'place, T: AssociatedType + 'place> { place: &'place mut DefaultTyParam, - lifetime: _serde::export::PhantomData<&'de ()>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'place, T: AssociatedType + 'place> _serde::de::Visitor<'de> for __Visitor<'de, 'place, T> @@ -297,55 +312,55 @@ const _: () = { type Value = (); fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "struct DefaultTyParam") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "struct DefaultTyParam") } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.phantom), + _serde::__private::de::InPlaceSeed(&mut self.place.phantom), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"struct DefaultTyParam with 1 element", )); } - _serde::export::Ok(()) + _serde::__private::Ok(()) } #[inline] fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { let mut __field0: bool = false; - while let _serde::export::Some(__key) = + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { if __field0 { - return _serde::export::Err( + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field( "phantom", ), @@ -353,11 +368,11 @@ const _: () = { } match _serde::de::MapAccess::next_value_seed( &mut __map, - _serde::private::de::InPlaceSeed(&mut self.place.phantom), + _serde::__private::de::InPlaceSeed(&mut self.place.phantom), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; __field0 = true; @@ -367,23 +382,23 @@ const _: () = { _serde::de::IgnoredAny, >(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } if !__field0 { - self.place.phantom = match _serde::private::de::missing_field("phantom") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + self.place.phantom = match _serde::__private::de::missing_field("phantom") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; }; - _serde::export::Ok(()) + _serde::__private::Ok(()) } } const FIELDS: &'static [&'static str] = &["phantom"]; @@ -393,7 +408,7 @@ const _: () = { FIELDS, __Visitor { place: __place, - lifetime: _serde::export::PhantomData, + lifetime: _serde::__private::PhantomData, }, ) } diff --git a/test_suite/tests/expand/generic_enum.expanded.rs b/test_suite/tests/expand/generic_enum.expanded.rs index 6f4cf28f..fae6de11 100644 --- a/test_suite/tests/expand/generic_enum.expanded.rs +++ b/test_suite/tests/expand/generic_enum.expanded.rs @@ -16,7 +16,10 @@ const _: () = { T: _serde::Serialize, U: _serde::Serialize, { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -44,27 +47,27 @@ const _: () = { "Seq", 0 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field0, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeTupleVariant::end(__serde_state) @@ -77,9 +80,9 @@ const _: () = { "Map", 0 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -87,9 +90,9 @@ const _: () = { "x", x, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -97,9 +100,9 @@ const _: () = { "y", y, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStructVariant::end(__serde_state) @@ -119,7 +122,7 @@ const _: () = { T: _serde::Deserialize<'de>, U: _serde::Deserialize<'de>, { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -135,35 +138,38 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "variant identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "variant identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - 1u64 => _serde::export::Ok(__Field::__field1), - 2u64 => _serde::export::Ok(__Field::__field2), - 3u64 => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + 1u64 => _serde::__private::Ok(__Field::__field1), + 2u64 => _serde::__private::Ok(__Field::__field2), + 3u64 => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"variant index 0 <= i < 4", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "Unit" => _serde::export::Ok(__Field::__field0), - "NewType" => _serde::export::Ok(__Field::__field1), - "Seq" => _serde::export::Ok(__Field::__field2), - "Map" => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Err(_serde::de::Error::unknown_variant( + "Unit" => _serde::__private::Ok(__Field::__field0), + "NewType" => _serde::__private::Ok(__Field::__field1), + "Seq" => _serde::__private::Ok(__Field::__field2), + "Map" => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Err(_serde::de::Error::unknown_variant( __value, VARIANTS, )), } @@ -171,18 +177,18 @@ const _: () = { fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"Unit" => _serde::export::Ok(__Field::__field0), - b"NewType" => _serde::export::Ok(__Field::__field1), - b"Seq" => _serde::export::Ok(__Field::__field2), - b"Map" => _serde::export::Ok(__Field::__field3), + b"Unit" => _serde::__private::Ok(__Field::__field0), + b"NewType" => _serde::__private::Ok(__Field::__field1), + b"Seq" => _serde::__private::Ok(__Field::__field2), + b"Map" => _serde::__private::Ok(__Field::__field3), _ => { - let __value = &_serde::export::from_utf8_lossy(__value); - _serde::export::Err(_serde::de::Error::unknown_variant( + let __value = &_serde::__private::from_utf8_lossy(__value); + _serde::__private::Err(_serde::de::Error::unknown_variant( __value, VARIANTS, )) } @@ -191,7 +197,9 @@ const _: () = { } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -203,8 +211,8 @@ const _: () = { T: _serde::Deserialize<'de>, U: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, T, U> _serde::de::Visitor<'de> for __Visitor<'de, T, U> where @@ -214,33 +222,33 @@ const _: () = { type Value = GenericEnum; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "enum GenericEnum") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "enum GenericEnum") } fn visit_enum<__A>( self, __data: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::EnumAccess<'de>, { match match _serde::de::EnumAccess::variant(__data) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { (__Field::__field0, __variant) => { match _serde::de::VariantAccess::unit_variant(__variant) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; - _serde::export::Ok(GenericEnum::Unit) + _serde::__private::Ok(GenericEnum::Unit) } - (__Field::__field1, __variant) => _serde::export::Result::map( + (__Field::__field1, __variant) => _serde::__private::Result::map( _serde::de::VariantAccess::newtype_variant::(__variant), GenericEnum::NewType, ), @@ -250,8 +258,8 @@ const _: () = { T: _serde::Deserialize<'de>, U: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, T, U> _serde::de::Visitor<'de> for __Visitor<'de, T, U> where @@ -261,9 +269,10 @@ const _: () = { type Value = GenericEnum; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "tuple variant GenericEnum::Seq", ) @@ -272,7 +281,7 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { @@ -281,14 +290,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (0usize , & "tuple variant GenericEnum::Seq with 2 elements")) ; + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde :: __private :: Err (_serde :: de :: Error :: invalid_length (0usize , & "tuple variant GenericEnum::Seq with 2 elements")) ; } }; let __field1 = match match _serde::de::SeqAccess::next_element::< @@ -296,25 +305,25 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (1usize , & "tuple variant GenericEnum::Seq with 2 elements")) ; + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde :: __private :: Err (_serde :: de :: Error :: invalid_length (1usize , & "tuple variant GenericEnum::Seq with 2 elements")) ; } }; - _serde::export::Ok(GenericEnum::Seq(__field0, __field1)) + _serde::__private::Ok(GenericEnum::Seq(__field0, __field1)) } } _serde::de::VariantAccess::tuple_variant( __variant, 2usize, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -330,9 +339,10 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "field identifier", ) @@ -340,43 +350,45 @@ const _: () = { fn visit_u64<__E>( self, __value: u64, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - 1u64 => _serde::export::Ok(__Field::__field1), - _ => _serde::export::Err(_serde::de::Error::invalid_value( - _serde::de::Unexpected::Unsigned(__value), - &"field index 0 <= i < 2", - )), + 0u64 => _serde::__private::Ok(__Field::__field0), + 1u64 => _serde::__private::Ok(__Field::__field1), + _ => _serde::__private::Err( + _serde::de::Error::invalid_value( + _serde::de::Unexpected::Unsigned(__value), + &"field index 0 <= i < 2", + ), + ), } } fn visit_str<__E>( self, __value: &str, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "x" => _serde::export::Ok(__Field::__field0), - "y" => _serde::export::Ok(__Field::__field1), - _ => _serde::export::Ok(__Field::__ignore), + "x" => _serde::__private::Ok(__Field::__field0), + "y" => _serde::__private::Ok(__Field::__field1), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"x" => _serde::export::Ok(__Field::__field0), - b"y" => _serde::export::Ok(__Field::__field1), - _ => _serde::export::Ok(__Field::__ignore), + b"x" => _serde::__private::Ok(__Field::__field0), + b"y" => _serde::__private::Ok(__Field::__field1), + _ => _serde::__private::Ok(__Field::__ignore), } } } @@ -384,7 +396,7 @@ const _: () = { #[inline] fn deserialize<__D>( __deserializer: __D, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -399,8 +411,8 @@ const _: () = { T: _serde::Deserialize<'de>, U: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, T, U> _serde::de::Visitor<'de> for __Visitor<'de, T, U> where @@ -410,9 +422,10 @@ const _: () = { type Value = GenericEnum; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "struct variant GenericEnum::Map", ) @@ -421,7 +434,7 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { @@ -430,14 +443,14 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant GenericEnum::Map with 2 elements")) ; + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde :: __private :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant GenericEnum::Map with 2 elements")) ; } }; let __field1 = match match _serde::de::SeqAccess::next_element::< @@ -445,17 +458,17 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (1usize , & "struct variant GenericEnum::Map with 2 elements")) ; + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde :: __private :: Err (_serde :: de :: Error :: invalid_length (1usize , & "struct variant GenericEnum::Map with 2 elements")) ; } }; - _serde::export::Ok(GenericEnum::Map { + _serde::__private::Ok(GenericEnum::Map { x: __field0, y: __field1, }) @@ -464,50 +477,50 @@ const _: () = { fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { - let mut __field0: _serde::export::Option = - _serde::export::None; - let mut __field1: _serde::export::Option = - _serde::export::None; - while let _serde::export::Some(__key) = + let mut __field0: _serde::__private::Option = + _serde::__private::None; + let mut __field1: _serde::__private::Option = + _serde::__private::None; + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { - if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("x")) ; + if _serde::__private::Option::is_some(&__field0) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("x")) ; } - __field0 = _serde::export::Some( + __field0 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field1 => { - if _serde::export::Option::is_some(&__field1) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("y")) ; + if _serde::__private::Option::is_some(&__field1) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("y")) ; } - __field1 = _serde::export::Some( + __field1 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); @@ -518,37 +531,37 @@ const _: () = { >( &mut __map ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } let __field0 = match __field0 { - _serde::export::Some(__field0) => __field0, - _serde::export::None => { - match _serde::private::de::missing_field("x") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field0) => __field0, + _serde::__private::None => { + match _serde::__private::de::missing_field("x") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; let __field1 = match __field1 { - _serde::export::Some(__field1) => __field1, - _serde::export::None => { - match _serde::private::de::missing_field("y") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field1) => __field1, + _serde::__private::None => { + match _serde::__private::de::missing_field("y") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; - _serde::export::Ok(GenericEnum::Map { + _serde::__private::Ok(GenericEnum::Map { x: __field0, y: __field1, }) @@ -559,8 +572,8 @@ const _: () = { __variant, FIELDS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -573,8 +586,8 @@ const _: () = { "GenericEnum", VARIANTS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } diff --git a/test_suite/tests/expand/generic_struct.expanded.rs b/test_suite/tests/expand/generic_struct.expanded.rs index 59d2e51d..1882a1dd 100644 --- a/test_suite/tests/expand/generic_struct.expanded.rs +++ b/test_suite/tests/expand/generic_struct.expanded.rs @@ -12,7 +12,10 @@ const _: () = { where T: _serde::Serialize, { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -21,15 +24,15 @@ const _: () = { "GenericStruct", false as usize + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStruct::serialize_field(&mut __serde_state, "x", &self.x) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStruct::end(__serde_state) @@ -46,7 +49,7 @@ const _: () = { where T: _serde::Deserialize<'de>, { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -60,47 +63,52 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "field identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "field identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"field index 0 <= i < 1", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "x" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + "x" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"x" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + b"x" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -111,8 +119,8 @@ const _: () = { where T: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, T> _serde::de::Visitor<'de> for __Visitor<'de, T> where @@ -121,64 +129,64 @@ const _: () = { type Value = GenericStruct; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "struct GenericStruct") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "struct GenericStruct") } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { let __field0 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"struct GenericStruct with 1 element", )); } }; - _serde::export::Ok(GenericStruct { x: __field0 }) + _serde::__private::Ok(GenericStruct { x: __field0 }) } #[inline] fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { - let mut __field0: _serde::export::Option = _serde::export::None; - while let _serde::export::Some(__key) = + let mut __field0: _serde::__private::Option = _serde::__private::None; + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { - if _serde::export::Option::is_some(&__field0) { - return _serde::export::Err( + if _serde::__private::Option::is_some(&__field0) { + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field("x"), ); } - __field0 = _serde::export::Some( + __field0 = _serde::__private::Some( match _serde::de::MapAccess::next_value::(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); @@ -188,24 +196,26 @@ const _: () = { _serde::de::IgnoredAny, >(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } let __field0 = match __field0 { - _serde::export::Some(__field0) => __field0, - _serde::export::None => match _serde::private::de::missing_field("x") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field0) => __field0, + _serde::__private::None => { + match _serde::__private::de::missing_field("x") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); + } } - }, + } }; - _serde::export::Ok(GenericStruct { x: __field0 }) + _serde::__private::Ok(GenericStruct { x: __field0 }) } } const FIELDS: &'static [&'static str] = &["x"]; @@ -214,15 +224,15 @@ const _: () = { "GenericStruct", FIELDS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } fn deserialize_in_place<__D>( __deserializer: __D, __place: &mut Self, - ) -> _serde::export::Result<(), __D::Error> + ) -> _serde::__private::Result<(), __D::Error> where __D: _serde::Deserializer<'de>, { @@ -236,47 +246,52 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "field identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "field identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"field index 0 <= i < 1", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "x" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + "x" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"x" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + b"x" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -288,7 +303,7 @@ const _: () = { T: _serde::Deserialize<'de>, { place: &'place mut GenericStruct, - lifetime: _serde::export::PhantomData<&'de ()>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'place, T: 'place> _serde::de::Visitor<'de> for __Visitor<'de, 'place, T> where @@ -297,65 +312,65 @@ const _: () = { type Value = (); fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "struct GenericStruct") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "struct GenericStruct") } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.x), + _serde::__private::de::InPlaceSeed(&mut self.place.x), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"struct GenericStruct with 1 element", )); } - _serde::export::Ok(()) + _serde::__private::Ok(()) } #[inline] fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { let mut __field0: bool = false; - while let _serde::export::Some(__key) = + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { if __field0 { - return _serde::export::Err( + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field("x"), ); } match _serde::de::MapAccess::next_value_seed( &mut __map, - _serde::private::de::InPlaceSeed(&mut self.place.x), + _serde::__private::de::InPlaceSeed(&mut self.place.x), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; __field0 = true; @@ -365,23 +380,23 @@ const _: () = { _serde::de::IgnoredAny, >(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } if !__field0 { - self.place.x = match _serde::private::de::missing_field("x") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + self.place.x = match _serde::__private::de::missing_field("x") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; }; - _serde::export::Ok(()) + _serde::__private::Ok(()) } } const FIELDS: &'static [&'static str] = &["x"]; @@ -391,7 +406,7 @@ const _: () = { FIELDS, __Visitor { place: __place, - lifetime: _serde::export::PhantomData, + lifetime: _serde::__private::PhantomData, }, ) } @@ -408,7 +423,10 @@ const _: () = { where T: _serde::Serialize, { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -430,7 +448,7 @@ const _: () = { where T: _serde::Deserialize<'de>, { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -438,8 +456,8 @@ const _: () = { where T: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, T> _serde::de::Visitor<'de> for __Visitor<'de, T> where @@ -448,9 +466,9 @@ const _: () = { type Value = GenericNewTypeStruct; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str( __formatter, "tuple struct GenericNewTypeStruct", ) @@ -459,57 +477,57 @@ const _: () = { fn visit_newtype_struct<__E>( self, __e: __E, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::Deserializer<'de>, { let __field0: T = match ::deserialize(__e) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; - _serde::export::Ok(GenericNewTypeStruct(__field0)) + _serde::__private::Ok(GenericNewTypeStruct(__field0)) } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { let __field0 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"tuple struct GenericNewTypeStruct with 1 element", )); } }; - _serde::export::Ok(GenericNewTypeStruct(__field0)) + _serde::__private::Ok(GenericNewTypeStruct(__field0)) } } _serde::Deserializer::deserialize_newtype_struct( __deserializer, "GenericNewTypeStruct", __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } fn deserialize_in_place<__D>( __deserializer: __D, __place: &mut Self, - ) -> _serde::export::Result<(), __D::Error> + ) -> _serde::__private::Result<(), __D::Error> where __D: _serde::Deserializer<'de>, { @@ -518,7 +536,7 @@ const _: () = { T: _serde::Deserialize<'de>, { place: &'place mut GenericNewTypeStruct, - lifetime: _serde::export::PhantomData<&'de ()>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'place, T: 'place> _serde::de::Visitor<'de> for __Visitor<'de, 'place, T> where @@ -527,9 +545,9 @@ const _: () = { type Value = (); fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str( __formatter, "tuple struct GenericNewTypeStruct", ) @@ -538,7 +556,7 @@ const _: () = { fn visit_newtype_struct<__E>( self, __e: __E, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::Deserializer<'de>, { @@ -548,25 +566,25 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.0), + _serde::__private::de::InPlaceSeed(&mut self.place.0), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"tuple struct GenericNewTypeStruct with 1 element", )); } - _serde::export::Ok(()) + _serde::__private::Ok(()) } } _serde::Deserializer::deserialize_newtype_struct( @@ -574,7 +592,7 @@ const _: () = { "GenericNewTypeStruct", __Visitor { place: __place, - lifetime: _serde::export::PhantomData, + lifetime: _serde::__private::PhantomData, }, ) } diff --git a/test_suite/tests/expand/generic_tuple_struct.expanded.rs b/test_suite/tests/expand/generic_tuple_struct.expanded.rs index 8eaf0e7e..f387b6af 100644 --- a/test_suite/tests/expand/generic_tuple_struct.expanded.rs +++ b/test_suite/tests/expand/generic_tuple_struct.expanded.rs @@ -11,7 +11,7 @@ const _: () = { T: _serde::Deserialize<'de>, U: _serde::Deserialize<'de>, { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -20,8 +20,8 @@ const _: () = { T: _serde::Deserialize<'de>, U: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, T, U> _serde::de::Visitor<'de> for __Visitor<'de, T, U> where @@ -31,9 +31,9 @@ const _: () = { type Value = GenericTupleStruct; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str( __formatter, "tuple struct GenericTupleStruct", ) @@ -42,20 +42,20 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { let __field0 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"tuple struct GenericTupleStruct with 2 elements", )); @@ -63,20 +63,20 @@ const _: () = { }; let __field1 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 1usize, &"tuple struct GenericTupleStruct with 2 elements", )); } }; - _serde::export::Ok(GenericTupleStruct(__field0, __field1)) + _serde::__private::Ok(GenericTupleStruct(__field0, __field1)) } } _serde::Deserializer::deserialize_tuple_struct( @@ -84,15 +84,15 @@ const _: () = { "GenericTupleStruct", 2usize, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } fn deserialize_in_place<__D>( __deserializer: __D, __place: &mut Self, - ) -> _serde::export::Result<(), __D::Error> + ) -> _serde::__private::Result<(), __D::Error> where __D: _serde::Deserializer<'de>, { @@ -102,7 +102,7 @@ const _: () = { U: _serde::Deserialize<'de>, { place: &'place mut GenericTupleStruct, - lifetime: _serde::export::PhantomData<&'de ()>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'place, T: 'place, U: 'place> _serde::de::Visitor<'de> for __Visitor<'de, 'place, T, U> where @@ -112,9 +112,9 @@ const _: () = { type Value = (); fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str( __formatter, "tuple struct GenericTupleStruct", ) @@ -123,39 +123,39 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.0), + _serde::__private::de::InPlaceSeed(&mut self.place.0), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"tuple struct GenericTupleStruct with 2 elements", )); } - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.1), + _serde::__private::de::InPlaceSeed(&mut self.place.1), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 1usize, &"tuple struct GenericTupleStruct with 2 elements", )); } - _serde::export::Ok(()) + _serde::__private::Ok(()) } } _serde::Deserializer::deserialize_tuple_struct( @@ -164,7 +164,7 @@ const _: () = { 2usize, __Visitor { place: __place, - lifetime: _serde::export::PhantomData, + lifetime: _serde::__private::PhantomData, }, ) } diff --git a/test_suite/tests/expand/lifetimes.expanded.rs b/test_suite/tests/expand/lifetimes.expanded.rs index df498ca6..1daabf1c 100644 --- a/test_suite/tests/expand/lifetimes.expanded.rs +++ b/test_suite/tests/expand/lifetimes.expanded.rs @@ -12,7 +12,10 @@ const _: () = { extern crate serde as _serde; #[automatically_derived] impl<'a> _serde::Serialize for Lifetimes<'a> { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -43,9 +46,9 @@ const _: () = { "LifetimeMap", 0 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -53,9 +56,9 @@ const _: () = { "a", a, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStructVariant::end(__serde_state) @@ -68,9 +71,9 @@ const _: () = { "NoLifetimeMap", 0 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -78,9 +81,9 @@ const _: () = { "a", a, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStructVariant::end(__serde_state) @@ -96,7 +99,7 @@ const _: () = { extern crate serde as _serde; #[automatically_derived] impl<'de, 'a> _serde::Deserialize<'de> for Lifetimes<'a> { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -112,35 +115,38 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "variant identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "variant identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - 1u64 => _serde::export::Ok(__Field::__field1), - 2u64 => _serde::export::Ok(__Field::__field2), - 3u64 => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + 1u64 => _serde::__private::Ok(__Field::__field1), + 2u64 => _serde::__private::Ok(__Field::__field2), + 3u64 => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"variant index 0 <= i < 4", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "LifetimeSeq" => _serde::export::Ok(__Field::__field0), - "NoLifetimeSeq" => _serde::export::Ok(__Field::__field1), - "LifetimeMap" => _serde::export::Ok(__Field::__field2), - "NoLifetimeMap" => _serde::export::Ok(__Field::__field3), - _ => _serde::export::Err(_serde::de::Error::unknown_variant( + "LifetimeSeq" => _serde::__private::Ok(__Field::__field0), + "NoLifetimeSeq" => _serde::__private::Ok(__Field::__field1), + "LifetimeMap" => _serde::__private::Ok(__Field::__field2), + "NoLifetimeMap" => _serde::__private::Ok(__Field::__field3), + _ => _serde::__private::Err(_serde::de::Error::unknown_variant( __value, VARIANTS, )), } @@ -148,18 +154,18 @@ const _: () = { fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"LifetimeSeq" => _serde::export::Ok(__Field::__field0), - b"NoLifetimeSeq" => _serde::export::Ok(__Field::__field1), - b"LifetimeMap" => _serde::export::Ok(__Field::__field2), - b"NoLifetimeMap" => _serde::export::Ok(__Field::__field3), + b"LifetimeSeq" => _serde::__private::Ok(__Field::__field0), + b"NoLifetimeSeq" => _serde::__private::Ok(__Field::__field1), + b"LifetimeMap" => _serde::__private::Ok(__Field::__field2), + b"NoLifetimeMap" => _serde::__private::Ok(__Field::__field3), _ => { - let __value = &_serde::export::from_utf8_lossy(__value); - _serde::export::Err(_serde::de::Error::unknown_variant( + let __value = &_serde::__private::from_utf8_lossy(__value); + _serde::__private::Err(_serde::de::Error::unknown_variant( __value, VARIANTS, )) } @@ -168,7 +174,9 @@ const _: () = { } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -176,35 +184,35 @@ const _: () = { } } struct __Visitor<'de, 'a> { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'a> _serde::de::Visitor<'de> for __Visitor<'de, 'a> { type Value = Lifetimes<'a>; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "enum Lifetimes") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "enum Lifetimes") } fn visit_enum<__A>( self, __data: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::EnumAccess<'de>, { match match _serde::de::EnumAccess::variant(__data) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - (__Field::__field0, __variant) => _serde::export::Result::map( + (__Field::__field0, __variant) => _serde::__private::Result::map( _serde::de::VariantAccess::newtype_variant::<&'a i32>(__variant), Lifetimes::LifetimeSeq, ), - (__Field::__field1, __variant) => _serde::export::Result::map( + (__Field::__field1, __variant) => _serde::__private::Result::map( _serde::de::VariantAccess::newtype_variant::(__variant), Lifetimes::NoLifetimeSeq, ), @@ -219,9 +227,10 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "field identifier", ) @@ -229,40 +238,42 @@ const _: () = { fn visit_u64<__E>( self, __value: u64, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Err(_serde::de::Error::invalid_value( - _serde::de::Unexpected::Unsigned(__value), - &"field index 0 <= i < 1", - )), + 0u64 => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Err( + _serde::de::Error::invalid_value( + _serde::de::Unexpected::Unsigned(__value), + &"field index 0 <= i < 1", + ), + ), } } fn visit_str<__E>( self, __value: &str, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "a" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + "a" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"a" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + b"a" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } } @@ -270,7 +281,7 @@ const _: () = { #[inline] fn deserialize<__D>( __deserializer: __D, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -281,16 +292,17 @@ const _: () = { } } struct __Visitor<'de, 'a> { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'a> _serde::de::Visitor<'de> for __Visitor<'de, 'a> { type Value = Lifetimes<'a>; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "struct variant Lifetimes::LifetimeMap", ) @@ -299,7 +311,7 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { @@ -308,49 +320,49 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant Lifetimes::LifetimeMap with 1 element")) ; + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde :: __private :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant Lifetimes::LifetimeMap with 1 element")) ; } }; - _serde::export::Ok(Lifetimes::LifetimeMap { a: __field0 }) + _serde::__private::Ok(Lifetimes::LifetimeMap { a: __field0 }) } #[inline] fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { - let mut __field0: _serde::export::Option<&'a i32> = - _serde::export::None; - while let _serde::export::Some(__key) = + let mut __field0: _serde::__private::Option<&'a i32> = + _serde::__private::None; + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { - if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; + if _serde::__private::Option::is_some(&__field0) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; } - __field0 = _serde::export::Some( + __field0 = _serde::__private::Some( match _serde::de::MapAccess::next_value::<&'a i32>( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); @@ -361,26 +373,26 @@ const _: () = { >( &mut __map ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } let __field0 = match __field0 { - _serde::export::Some(__field0) => __field0, - _serde::export::None => { - match _serde::private::de::missing_field("a") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field0) => __field0, + _serde::__private::None => { + match _serde::__private::de::missing_field("a") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; - _serde::export::Ok(Lifetimes::LifetimeMap { a: __field0 }) + _serde::__private::Ok(Lifetimes::LifetimeMap { a: __field0 }) } } const FIELDS: &'static [&'static str] = &["a"]; @@ -388,8 +400,8 @@ const _: () = { __variant, FIELDS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -404,9 +416,10 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "field identifier", ) @@ -414,40 +427,42 @@ const _: () = { fn visit_u64<__E>( self, __value: u64, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Err(_serde::de::Error::invalid_value( - _serde::de::Unexpected::Unsigned(__value), - &"field index 0 <= i < 1", - )), + 0u64 => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Err( + _serde::de::Error::invalid_value( + _serde::de::Unexpected::Unsigned(__value), + &"field index 0 <= i < 1", + ), + ), } } fn visit_str<__E>( self, __value: &str, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "a" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + "a" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"a" => _serde::export::Ok(__Field::__field0), - _ => _serde::export::Ok(__Field::__ignore), + b"a" => _serde::__private::Ok(__Field::__field0), + _ => _serde::__private::Ok(__Field::__ignore), } } } @@ -455,7 +470,7 @@ const _: () = { #[inline] fn deserialize<__D>( __deserializer: __D, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -466,16 +481,17 @@ const _: () = { } } struct __Visitor<'de, 'a> { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'a> _serde::de::Visitor<'de> for __Visitor<'de, 'a> { type Value = Lifetimes<'a>; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str( + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result + { + _serde::__private::Formatter::write_str( __formatter, "struct variant Lifetimes::NoLifetimeMap", ) @@ -484,7 +500,7 @@ const _: () = { fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { @@ -493,49 +509,49 @@ const _: () = { >( &mut __seq ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant Lifetimes::NoLifetimeMap with 1 element")) ; + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde :: __private :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant Lifetimes::NoLifetimeMap with 1 element")) ; } }; - _serde::export::Ok(Lifetimes::NoLifetimeMap { a: __field0 }) + _serde::__private::Ok(Lifetimes::NoLifetimeMap { a: __field0 }) } #[inline] fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { - let mut __field0: _serde::export::Option = - _serde::export::None; - while let _serde::export::Some(__key) = + let mut __field0: _serde::__private::Option = + _serde::__private::None; + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { - if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; + if _serde::__private::Option::is_some(&__field0) { + return _serde :: __private :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; } - __field0 = _serde::export::Some( + __field0 = _serde::__private::Some( match _serde::de::MapAccess::next_value::( &mut __map, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); @@ -546,26 +562,26 @@ const _: () = { >( &mut __map ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } let __field0 = match __field0 { - _serde::export::Some(__field0) => __field0, - _serde::export::None => { - match _serde::private::de::missing_field("a") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field0) => __field0, + _serde::__private::None => { + match _serde::__private::de::missing_field("a") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } } }; - _serde::export::Ok(Lifetimes::NoLifetimeMap { a: __field0 }) + _serde::__private::Ok(Lifetimes::NoLifetimeMap { a: __field0 }) } } const FIELDS: &'static [&'static str] = &["a"]; @@ -573,8 +589,8 @@ const _: () = { __variant, FIELDS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } @@ -592,8 +608,8 @@ const _: () = { "Lifetimes", VARIANTS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } diff --git a/test_suite/tests/expand/named_map.expanded.rs b/test_suite/tests/expand/named_map.expanded.rs index ce43b663..3865b84d 100644 --- a/test_suite/tests/expand/named_map.expanded.rs +++ b/test_suite/tests/expand/named_map.expanded.rs @@ -16,7 +16,10 @@ const _: () = { B: _serde::Serialize, C: _serde::Serialize, { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -25,27 +28,27 @@ const _: () = { "SerNamedMap", false as usize + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStruct::serialize_field(&mut __serde_state, "a", &self.a) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStruct::serialize_field(&mut __serde_state, "b", &self.b) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStruct::serialize_field(&mut __serde_state, "c", &self.c) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStruct::end(__serde_state) @@ -69,7 +72,7 @@ const _: () = { B: _serde::Deserialize<'de>, C: _serde::Deserialize<'de>, { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -85,53 +88,58 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "field identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "field identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - 1u64 => _serde::export::Ok(__Field::__field1), - 2u64 => _serde::export::Ok(__Field::__field2), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + 1u64 => _serde::__private::Ok(__Field::__field1), + 2u64 => _serde::__private::Ok(__Field::__field2), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"field index 0 <= i < 3", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "a" => _serde::export::Ok(__Field::__field0), - "b" => _serde::export::Ok(__Field::__field1), - "c" => _serde::export::Ok(__Field::__field2), - _ => _serde::export::Ok(__Field::__ignore), + "a" => _serde::__private::Ok(__Field::__field0), + "b" => _serde::__private::Ok(__Field::__field1), + "c" => _serde::__private::Ok(__Field::__field2), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"a" => _serde::export::Ok(__Field::__field0), - b"b" => _serde::export::Ok(__Field::__field1), - b"c" => _serde::export::Ok(__Field::__field2), - _ => _serde::export::Ok(__Field::__ignore), + b"a" => _serde::__private::Ok(__Field::__field0), + b"b" => _serde::__private::Ok(__Field::__field1), + b"c" => _serde::__private::Ok(__Field::__field2), + _ => _serde::__private::Ok(__Field::__ignore), } } } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -144,8 +152,8 @@ const _: () = { B: _serde::Deserialize<'de>, C: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, A, B, C> _serde::de::Visitor<'de> for __Visitor<'de, A, B, C> where @@ -156,28 +164,28 @@ const _: () = { type Value = DeNamedMap; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "struct DeNamedMap") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "struct DeNamedMap") } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { let __field0 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"struct DeNamedMap with 3 elements", )); @@ -185,14 +193,14 @@ const _: () = { }; let __field1 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 1usize, &"struct DeNamedMap with 3 elements", )); @@ -200,20 +208,20 @@ const _: () = { }; let __field2 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 2usize, &"struct DeNamedMap with 3 elements", )); } }; - _serde::export::Ok(DeNamedMap { + _serde::__private::Ok(DeNamedMap { a: __field0, b: __field1, c: __field2, @@ -223,63 +231,63 @@ const _: () = { fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { - let mut __field0: _serde::export::Option = _serde::export::None; - let mut __field1: _serde::export::Option = _serde::export::None; - let mut __field2: _serde::export::Option = _serde::export::None; - while let _serde::export::Some(__key) = + let mut __field0: _serde::__private::Option = _serde::__private::None; + let mut __field1: _serde::__private::Option = _serde::__private::None; + let mut __field2: _serde::__private::Option = _serde::__private::None; + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { - if _serde::export::Option::is_some(&__field0) { - return _serde::export::Err( + if _serde::__private::Option::is_some(&__field0) { + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field("a"), ); } - __field0 = _serde::export::Some( + __field0 = _serde::__private::Some( match _serde::de::MapAccess::next_value::(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field1 => { - if _serde::export::Option::is_some(&__field1) { - return _serde::export::Err( + if _serde::__private::Option::is_some(&__field1) { + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field("b"), ); } - __field1 = _serde::export::Some( + __field1 = _serde::__private::Some( match _serde::de::MapAccess::next_value::(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); } __Field::__field2 => { - if _serde::export::Option::is_some(&__field2) { - return _serde::export::Err( + if _serde::__private::Option::is_some(&__field2) { + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field("c"), ); } - __field2 = _serde::export::Some( + __field2 = _serde::__private::Some( match _serde::de::MapAccess::next_value::(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }, ); @@ -289,42 +297,48 @@ const _: () = { _serde::de::IgnoredAny, >(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } let __field0 = match __field0 { - _serde::export::Some(__field0) => __field0, - _serde::export::None => match _serde::private::de::missing_field("a") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field0) => __field0, + _serde::__private::None => { + match _serde::__private::de::missing_field("a") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); + } } - }, + } }; let __field1 = match __field1 { - _serde::export::Some(__field1) => __field1, - _serde::export::None => match _serde::private::de::missing_field("b") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field1) => __field1, + _serde::__private::None => { + match _serde::__private::de::missing_field("b") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); + } } - }, + } }; let __field2 = match __field2 { - _serde::export::Some(__field2) => __field2, - _serde::export::None => match _serde::private::de::missing_field("c") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Some(__field2) => __field2, + _serde::__private::None => { + match _serde::__private::de::missing_field("c") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); + } } - }, + } }; - _serde::export::Ok(DeNamedMap { + _serde::__private::Ok(DeNamedMap { a: __field0, b: __field1, c: __field2, @@ -337,15 +351,15 @@ const _: () = { "DeNamedMap", FIELDS, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } fn deserialize_in_place<__D>( __deserializer: __D, __place: &mut Self, - ) -> _serde::export::Result<(), __D::Error> + ) -> _serde::__private::Result<(), __D::Error> where __D: _serde::Deserializer<'de>, { @@ -361,53 +375,58 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "field identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "field identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - 0u64 => _serde::export::Ok(__Field::__field0), - 1u64 => _serde::export::Ok(__Field::__field1), - 2u64 => _serde::export::Ok(__Field::__field2), - _ => _serde::export::Err(_serde::de::Error::invalid_value( + 0u64 => _serde::__private::Ok(__Field::__field0), + 1u64 => _serde::__private::Ok(__Field::__field1), + 2u64 => _serde::__private::Ok(__Field::__field2), + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"field index 0 <= i < 3", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - "a" => _serde::export::Ok(__Field::__field0), - "b" => _serde::export::Ok(__Field::__field1), - "c" => _serde::export::Ok(__Field::__field2), - _ => _serde::export::Ok(__Field::__ignore), + "a" => _serde::__private::Ok(__Field::__field0), + "b" => _serde::__private::Ok(__Field::__field1), + "c" => _serde::__private::Ok(__Field::__field2), + _ => _serde::__private::Ok(__Field::__ignore), } } fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - b"a" => _serde::export::Ok(__Field::__field0), - b"b" => _serde::export::Ok(__Field::__field1), - b"c" => _serde::export::Ok(__Field::__field2), - _ => _serde::export::Ok(__Field::__ignore), + b"a" => _serde::__private::Ok(__Field::__field0), + b"b" => _serde::__private::Ok(__Field::__field1), + b"c" => _serde::__private::Ok(__Field::__field2), + _ => _serde::__private::Ok(__Field::__ignore), } } } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -421,7 +440,7 @@ const _: () = { C: _serde::Deserialize<'de>, { place: &'place mut DeNamedMap, - lifetime: _serde::export::PhantomData<&'de ()>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'place, A: 'place, B: 'place, C: 'place> _serde::de::Visitor<'de> for __Visitor<'de, 'place, A, B, C> @@ -433,129 +452,129 @@ const _: () = { type Value = (); fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "struct DeNamedMap") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "struct DeNamedMap") } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.a), + _serde::__private::de::InPlaceSeed(&mut self.place.a), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"struct DeNamedMap with 3 elements", )); } - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.b), + _serde::__private::de::InPlaceSeed(&mut self.place.b), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 1usize, &"struct DeNamedMap with 3 elements", )); } - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.c), + _serde::__private::de::InPlaceSeed(&mut self.place.c), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 2usize, &"struct DeNamedMap with 3 elements", )); } - _serde::export::Ok(()) + _serde::__private::Ok(()) } #[inline] fn visit_map<__A>( self, mut __map: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::MapAccess<'de>, { let mut __field0: bool = false; let mut __field1: bool = false; let mut __field2: bool = false; - while let _serde::export::Some(__key) = + while let _serde::__private::Some(__key) = match _serde::de::MapAccess::next_key::<__Field>(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { match __key { __Field::__field0 => { if __field0 { - return _serde::export::Err( + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field("a"), ); } match _serde::de::MapAccess::next_value_seed( &mut __map, - _serde::private::de::InPlaceSeed(&mut self.place.a), + _serde::__private::de::InPlaceSeed(&mut self.place.a), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; __field0 = true; } __Field::__field1 => { if __field1 { - return _serde::export::Err( + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field("b"), ); } match _serde::de::MapAccess::next_value_seed( &mut __map, - _serde::private::de::InPlaceSeed(&mut self.place.b), + _serde::__private::de::InPlaceSeed(&mut self.place.b), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; __field1 = true; } __Field::__field2 => { if __field2 { - return _serde::export::Err( + return _serde::__private::Err( <__A::Error as _serde::de::Error>::duplicate_field("c"), ); } match _serde::de::MapAccess::next_value_seed( &mut __map, - _serde::private::de::InPlaceSeed(&mut self.place.c), + _serde::__private::de::InPlaceSeed(&mut self.place.c), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; __field2 = true; @@ -565,39 +584,39 @@ const _: () = { _serde::de::IgnoredAny, >(&mut __map) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; } } } if !__field0 { - self.place.a = match _serde::private::de::missing_field("a") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + self.place.a = match _serde::__private::de::missing_field("a") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; }; if !__field1 { - self.place.b = match _serde::private::de::missing_field("b") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + self.place.b = match _serde::__private::de::missing_field("b") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; }; if !__field2 { - self.place.c = match _serde::private::de::missing_field("c") { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + self.place.c = match _serde::__private::de::missing_field("c") { + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; }; - _serde::export::Ok(()) + _serde::__private::Ok(()) } } const FIELDS: &'static [&'static str] = &["a", "b", "c"]; @@ -607,7 +626,7 @@ const _: () = { FIELDS, __Visitor { place: __place, - lifetime: _serde::export::PhantomData, + lifetime: _serde::__private::PhantomData, }, ) } diff --git a/test_suite/tests/expand/named_tuple.expanded.rs b/test_suite/tests/expand/named_tuple.expanded.rs index 8b5e4eee..707ca076 100644 --- a/test_suite/tests/expand/named_tuple.expanded.rs +++ b/test_suite/tests/expand/named_tuple.expanded.rs @@ -12,7 +12,10 @@ const _: () = { B: _serde::Serialize, C: _serde::Serialize, { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -21,27 +24,27 @@ const _: () = { "SerNamedTuple", 0 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleStruct::serialize_field(&mut __serde_state, &self.0) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleStruct::serialize_field(&mut __serde_state, &self.1) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleStruct::serialize_field(&mut __serde_state, &self.2) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeTupleStruct::end(__serde_state) @@ -61,7 +64,7 @@ const _: () = { B: _serde::Deserialize<'de>, C: _serde::Deserialize<'de>, { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -71,8 +74,8 @@ const _: () = { B: _serde::Deserialize<'de>, C: _serde::Deserialize<'de>, { - marker: _serde::export::PhantomData>, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, A, B, C> _serde::de::Visitor<'de> for __Visitor<'de, A, B, C> where @@ -83,28 +86,31 @@ const _: () = { type Value = DeNamedTuple; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "tuple struct DeNamedTuple") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str( + __formatter, + "tuple struct DeNamedTuple", + ) } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { let __field0 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"tuple struct DeNamedTuple with 3 elements", )); @@ -112,14 +118,14 @@ const _: () = { }; let __field1 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 1usize, &"tuple struct DeNamedTuple with 3 elements", )); @@ -127,20 +133,20 @@ const _: () = { }; let __field2 = match match _serde::de::SeqAccess::next_element::(&mut __seq) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - _serde::export::Some(__value) => __value, - _serde::export::None => { - return _serde::export::Err(_serde::de::Error::invalid_length( + _serde::__private::Some(__value) => __value, + _serde::__private::None => { + return _serde::__private::Err(_serde::de::Error::invalid_length( 2usize, &"tuple struct DeNamedTuple with 3 elements", )); } }; - _serde::export::Ok(DeNamedTuple(__field0, __field1, __field2)) + _serde::__private::Ok(DeNamedTuple(__field0, __field1, __field2)) } } _serde::Deserializer::deserialize_tuple_struct( @@ -148,15 +154,15 @@ const _: () = { "DeNamedTuple", 3usize, __Visitor { - marker: _serde::export::PhantomData::>, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::>, + lifetime: _serde::__private::PhantomData, }, ) } fn deserialize_in_place<__D>( __deserializer: __D, __place: &mut Self, - ) -> _serde::export::Result<(), __D::Error> + ) -> _serde::__private::Result<(), __D::Error> where __D: _serde::Deserializer<'de>, { @@ -167,7 +173,7 @@ const _: () = { C: _serde::Deserialize<'de>, { place: &'place mut DeNamedTuple, - lifetime: _serde::export::PhantomData<&'de ()>, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de, 'place, A: 'place, B: 'place, C: 'place> _serde::de::Visitor<'de> for __Visitor<'de, 'place, A, B, C> @@ -179,61 +185,64 @@ const _: () = { type Value = (); fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "tuple struct DeNamedTuple") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str( + __formatter, + "tuple struct DeNamedTuple", + ) } #[inline] fn visit_seq<__A>( self, mut __seq: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::SeqAccess<'de>, { - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.0), + _serde::__private::de::InPlaceSeed(&mut self.place.0), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 0usize, &"tuple struct DeNamedTuple with 3 elements", )); } - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.1), + _serde::__private::de::InPlaceSeed(&mut self.place.1), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 1usize, &"tuple struct DeNamedTuple with 3 elements", )); } - if let _serde::export::None = match _serde::de::SeqAccess::next_element_seed( + if let _serde::__private::None = match _serde::de::SeqAccess::next_element_seed( &mut __seq, - _serde::private::de::InPlaceSeed(&mut self.place.2), + _serde::__private::de::InPlaceSeed(&mut self.place.2), ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } } { - return _serde::export::Err(_serde::de::Error::invalid_length( + return _serde::__private::Err(_serde::de::Error::invalid_length( 2usize, &"tuple struct DeNamedTuple with 3 elements", )); } - _serde::export::Ok(()) + _serde::__private::Ok(()) } } _serde::Deserializer::deserialize_tuple_struct( @@ -242,7 +251,7 @@ const _: () = { 3usize, __Visitor { place: __place, - lifetime: _serde::export::PhantomData, + lifetime: _serde::__private::PhantomData, }, ) } diff --git a/test_suite/tests/expand/named_unit.expanded.rs b/test_suite/tests/expand/named_unit.expanded.rs index dfe44ddd..44329246 100644 --- a/test_suite/tests/expand/named_unit.expanded.rs +++ b/test_suite/tests/expand/named_unit.expanded.rs @@ -7,7 +7,10 @@ const _: () = { extern crate serde as _serde; #[automatically_derived] impl _serde::Serialize for NamedUnit { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -22,7 +25,7 @@ const _: () = { extern crate serde as _serde; #[automatically_derived] impl<'de> _serde::Deserialize<'de> for NamedUnit { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -31,16 +34,16 @@ const _: () = { type Value = NamedUnit; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "unit struct NamedUnit") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "unit struct NamedUnit") } #[inline] - fn visit_unit<__E>(self) -> _serde::export::Result + fn visit_unit<__E>(self) -> _serde::__private::Result where __E: _serde::de::Error, { - _serde::export::Ok(NamedUnit) + _serde::__private::Ok(NamedUnit) } } _serde::Deserializer::deserialize_unit_struct(__deserializer, "NamedUnit", __Visitor) diff --git a/test_suite/tests/expand/ser_enum.expanded.rs b/test_suite/tests/expand/ser_enum.expanded.rs index 3f4db97d..40b45e07 100644 --- a/test_suite/tests/expand/ser_enum.expanded.rs +++ b/test_suite/tests/expand/ser_enum.expanded.rs @@ -23,7 +23,10 @@ const _: () = { C: _serde::Serialize, D: _serde::Serialize, { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -42,45 +45,45 @@ const _: () = { "Seq", 0 + 1 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field0, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field2, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field3, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeTupleVariant::end(__serde_state) @@ -98,9 +101,9 @@ const _: () = { "Map", 0 + 1 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -108,9 +111,9 @@ const _: () = { "a", a, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -118,9 +121,9 @@ const _: () = { "b", b, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -128,9 +131,9 @@ const _: () = { "c", c, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -138,9 +141,9 @@ const _: () = { "d", d, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStructVariant::end(__serde_state) @@ -159,45 +162,45 @@ const _: () = { "_Seq2", 0 + 1 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field0, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field2, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeTupleVariant::serialize_field( &mut __serde_state, __field3, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeTupleVariant::end(__serde_state) @@ -215,9 +218,9 @@ const _: () = { "_Map2", 0 + 1 + 1 + 1 + 1, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -225,9 +228,9 @@ const _: () = { "a", a, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -235,9 +238,9 @@ const _: () = { "b", b, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -245,9 +248,9 @@ const _: () = { "c", c, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; match _serde::ser::SerializeStructVariant::serialize_field( @@ -255,9 +258,9 @@ const _: () = { "d", d, ) { - _serde::export::Ok(__val) => __val, - _serde::export::Err(__err) => { - return _serde::export::Err(__err); + _serde::__private::Ok(__val) => __val, + _serde::__private::Err(__err) => { + return _serde::__private::Err(__err); } }; _serde::ser::SerializeStructVariant::end(__serde_state) diff --git a/test_suite/tests/expand/void.expanded.rs b/test_suite/tests/expand/void.expanded.rs index fb98c321..65c3d2c6 100644 --- a/test_suite/tests/expand/void.expanded.rs +++ b/test_suite/tests/expand/void.expanded.rs @@ -7,7 +7,10 @@ const _: () = { extern crate serde as _serde; #[automatically_derived] impl _serde::Serialize for Void { - fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error> + fn serialize<__S>( + &self, + __serializer: __S, + ) -> _serde::__private::Result<__S::Ok, __S::Error> where __S: _serde::Serializer, { @@ -22,7 +25,7 @@ const _: () = { extern crate serde as _serde; #[automatically_derived] impl<'de> _serde::Deserialize<'de> for Void { - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -33,27 +36,30 @@ const _: () = { type Value = __Field; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "variant identifier") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "variant identifier") } - fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result + fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - _ => _serde::export::Err(_serde::de::Error::invalid_value( + _ => _serde::__private::Err(_serde::de::Error::invalid_value( _serde::de::Unexpected::Unsigned(__value), &"variant index 0 <= i < 0", )), } } - fn visit_str<__E>(self, __value: &str) -> _serde::export::Result + fn visit_str<__E>( + self, + __value: &str, + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { - _ => _serde::export::Err(_serde::de::Error::unknown_variant( + _ => _serde::__private::Err(_serde::de::Error::unknown_variant( __value, VARIANTS, )), } @@ -61,14 +67,14 @@ const _: () = { fn visit_bytes<__E>( self, __value: &[u8], - ) -> _serde::export::Result + ) -> _serde::__private::Result where __E: _serde::de::Error, { match __value { _ => { - let __value = &_serde::export::from_utf8_lossy(__value); - _serde::export::Err(_serde::de::Error::unknown_variant( + let __value = &_serde::__private::from_utf8_lossy(__value); + _serde::__private::Err(_serde::de::Error::unknown_variant( __value, VARIANTS, )) } @@ -77,7 +83,9 @@ const _: () = { } impl<'de> _serde::Deserialize<'de> for __Field { #[inline] - fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result + fn deserialize<__D>( + __deserializer: __D, + ) -> _serde::__private::Result where __D: _serde::Deserializer<'de>, { @@ -85,25 +93,25 @@ const _: () = { } } struct __Visitor<'de> { - marker: _serde::export::PhantomData, - lifetime: _serde::export::PhantomData<&'de ()>, + marker: _serde::__private::PhantomData, + lifetime: _serde::__private::PhantomData<&'de ()>, } impl<'de> _serde::de::Visitor<'de> for __Visitor<'de> { type Value = Void; fn expecting( &self, - __formatter: &mut _serde::export::Formatter, - ) -> _serde::export::fmt::Result { - _serde::export::Formatter::write_str(__formatter, "enum Void") + __formatter: &mut _serde::__private::Formatter, + ) -> _serde::__private::fmt::Result { + _serde::__private::Formatter::write_str(__formatter, "enum Void") } fn visit_enum<__A>( self, __data: __A, - ) -> _serde::export::Result + ) -> _serde::__private::Result where __A: _serde::de::EnumAccess<'de>, { - _serde::export::Result::map( + _serde::__private::Result::map( _serde::de::EnumAccess::variant::<__Field>(__data), |(__impossible, _)| match __impossible {}, ) @@ -115,8 +123,8 @@ const _: () = { "Void", VARIANTS, __Visitor { - marker: _serde::export::PhantomData::, - lifetime: _serde::export::PhantomData, + marker: _serde::__private::PhantomData::, + lifetime: _serde::__private::PhantomData, }, ) }