From 5c24f0f0f300c7bd21bad5b097f6f1919de8477c Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 10 Dec 2018 22:31:39 -0800 Subject: [PATCH] Clean up some indentation that isn't visible to rustfmt --- serde/src/de/mod.rs | 28 ++++++++++++++++++---------- serde_derive/src/de.rs | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs index 4ce53345..c45a53bf 100644 --- a/serde/src/de/mod.rs +++ b/serde/src/de/mod.rs @@ -237,12 +237,16 @@ macro_rules! declare_error_trait { #[cold] fn unknown_variant(variant: &str, expected: &'static [&'static str]) -> Self { if expected.is_empty() { - Error::custom(format_args!("unknown variant `{}`, there are no variants", - variant)) + Error::custom(format_args!( + "unknown variant `{}`, there are no variants", + variant + )) } else { - Error::custom(format_args!("unknown variant `{}`, expected {}", - variant, - OneOf { names: expected })) + Error::custom(format_args!( + "unknown variant `{}`, expected {}", + variant, + OneOf { names: expected } + )) } } @@ -251,12 +255,16 @@ macro_rules! declare_error_trait { #[cold] fn unknown_field(field: &str, expected: &'static [&'static str]) -> Self { if expected.is_empty() { - Error::custom(format_args!("unknown field `{}`, there are no fields", - field)) + Error::custom(format_args!( + "unknown field `{}`, there are no fields", + field + )) } else { - Error::custom(format_args!("unknown field `{}`, expected {}", - field, - OneOf { names: expected })) + Error::custom(format_args!( + "unknown field `{}`, expected {}", + field, + OneOf { names: expected } + )) } } diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index 2114e5ef..7d0ce6a0 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -1260,11 +1260,15 @@ fn deserialize_externally_tagged_enum( #variants_stmt - _serde::Deserializer::deserialize_enum(__deserializer, #type_name, VARIANTS, - __Visitor { - marker: _serde::export::PhantomData::<#this #ty_generics>, - lifetime: _serde::export::PhantomData, - }) + _serde::Deserializer::deserialize_enum( + __deserializer, + #type_name, + 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)) { _serde::export::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, - })) { + match try!(_serde::de::SeqAccess::next_element_seed( + &mut __seq, + __Seed { + field: __field, + marker: _serde::export::PhantomData, + lifetime: _serde::export::PhantomData, + }, + )) { _serde::export::Some(__ret) => _serde::export::Ok(__ret), // There is no second element. _serde::export::None => { @@ -1637,11 +1643,15 @@ fn deserialize_adjacently_tagged_enum( } const FIELDS: &'static [&'static str] = &[#tag, #content]; - _serde::Deserializer::deserialize_struct(__deserializer, #type_name, FIELDS, + _serde::Deserializer::deserialize_struct( + __deserializer, + #type_name, + FIELDS, __Visitor { marker: _serde::export::PhantomData::<#this #ty_generics>, lifetime: _serde::export::PhantomData, - }) + }, + ) } } @@ -2247,8 +2257,9 @@ fn deserialize_identifier( #variant_indices => _serde::export::Ok(#constructors), )* _ => _serde::export::Err(_serde::de::Error::invalid_value( - _serde::de::Unexpected::Unsigned(__value), - &#fallthrough_msg)) + _serde::de::Unexpected::Unsigned(__value), + &#fallthrough_msg, + )) } } }