pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-07-21 23:45:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some indentation that isn't visible to rustfmt

Browse Source
This commit is contained in:
David Tolnay
2018-12-10 22:31:39 -08:00
parent c2591e9b39
commit 5c24f0f0f3
2 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/de/mod.rs
+18 -10
View File
@@ -237,12 +237,16 @@ macro_rules! declare_error_trait {
#[cold] #[cold]
fn unknown_variant(variant: &str, expected: &'static [&'static str]) -> Self { fn unknown_variant(variant: &str, expected: &'static [&'static str]) -> Self {
if expected.is_empty() { if expected.is_empty() {
Error::custom(format_args!("unknown variant `{}`, there are no variants", Error::custom(format_args!(
variant)) "unknown variant `{}`, there are no variants",
variant
))
} else { } else {
Error::custom(format_args!("unknown variant `{}`, expected {}", Error::custom(format_args!(
variant, "unknown variant `{}`, expected {}",
OneOf { names: expected })) variant,
OneOf { names: expected }
))
} }
} }
@@ -251,12 +255,16 @@ macro_rules! declare_error_trait {
#[cold] #[cold]
fn unknown_field(field: &str, expected: &'static [&'static str]) -> Self { fn unknown_field(field: &str, expected: &'static [&'static str]) -> Self {
if expected.is_empty() { if expected.is_empty() {
Error::custom(format_args!("unknown field `{}`, there are no fields", Error::custom(format_args!(
field)) "unknown field `{}`, there are no fields",
field
))
} else { } else {
Error::custom(format_args!("unknown field `{}`, expected {}", Error::custom(format_args!(
field, "unknown field `{}`, expected {}",
OneOf { names: expected })) field,
OneOf { names: expected }
))
} }
} }
serde_derive/src/de.rs
+26 -15
View File
@@ -1260,11 +1260,15 @@ fn deserialize_externally_tagged_enum(
#variants_stmt #variants_stmt
_serde::Deserializer::deserialize_enum(__deserializer, #type_name, VARIANTS, _serde::Deserializer::deserialize_enum(
__Visitor { __deserializer,
marker: _serde::export::PhantomData::<#this #ty_generics>, #type_name,
lifetime: _serde::export::PhantomData, VARIANTS,
}) __Visitor {
marker: _serde::export::PhantomData::<#this #ty_generics>,
lifetime: _serde::export::PhantomData,
},
)
} }
} }
@@ -1615,12 +1619,14 @@ fn deserialize_adjacently_tagged_enum(
match try!(_serde::de::SeqAccess::next_element(&mut __seq)) { match try!(_serde::de::SeqAccess::next_element(&mut __seq)) {
_serde::export::Some(__field) => { _serde::export::Some(__field) => {
// Visit the second element - the content. // Visit the second element - the content.
match try!(_serde::de::SeqAccess::next_element_seed(&mut __seq, match try!(_serde::de::SeqAccess::next_element_seed(
__Seed { &mut __seq,
field: __field, __Seed {
marker: _serde::export::PhantomData, field: __field,
lifetime: _serde::export::PhantomData, marker: _serde::export::PhantomData,
})) { lifetime: _serde::export::PhantomData,
},
)) {
_serde::export::Some(__ret) => _serde::export::Ok(__ret), _serde::export::Some(__ret) => _serde::export::Ok(__ret),
// There is no second element. // There is no second element.
_serde::export::None => { _serde::export::None => {
@@ -1637,11 +1643,15 @@ fn deserialize_adjacently_tagged_enum(
} }
const FIELDS: &'static [&'static str] = &[#tag, #content]; const FIELDS: &'static [&'static str] = &[#tag, #content];
_serde::Deserializer::deserialize_struct(__deserializer, #type_name, FIELDS, _serde::Deserializer::deserialize_struct(
__deserializer,
#type_name,
FIELDS,
__Visitor { __Visitor {
marker: _serde::export::PhantomData::<#this #ty_generics>, marker: _serde::export::PhantomData::<#this #ty_generics>,
lifetime: _serde::export::PhantomData, lifetime: _serde::export::PhantomData,
}) },
)
} }
} }
@@ -2247,8 +2257,9 @@ fn deserialize_identifier(
#variant_indices => _serde::export::Ok(#constructors), #variant_indices => _serde::export::Ok(#constructors),
)* )*
_ => _serde::export::Err(_serde::de::Error::invalid_value( _ => _serde::export::Err(_serde::de::Error::invalid_value(
_serde::de::Unexpected::Unsigned(__value), _serde::de::Unexpected::Unsigned(__value),
&#fallthrough_msg)) &#fallthrough_msg,
))
} }
} }
} }