From 4e54aaf7963c3580cc50b56842949b0ce6b3a997 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sun, 8 Jul 2018 19:02:44 -0700 Subject: [PATCH] Format with rustfmt 0.8.2 --- serde/src/de/impls.rs | 40 ++++++++++++++++++++++++---- serde/src/lib.rs | 11 ++++++-- serde_derive/src/lib.rs | 21 ++++++++++++--- serde_derive_internals/lib.rs | 7 ++++- serde_test/src/de.rs | 3 ++- serde_test/src/lib.rs | 8 ++++-- test_suite/tests/test_annotations.rs | 5 +++- test_suite/tests/test_de.rs | 5 +++- test_suite/tests/test_gen.rs | 20 +++++++++++--- 9 files changed, 99 insertions(+), 21 deletions(-) diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs index 373897aa..3e21b948 100644 --- a/serde/src/de/impls.rs +++ b/serde/src/de/impls.rs @@ -1602,7 +1602,13 @@ forwarded_impl!((T), Box<[T]>, Vec::into_boxed_slice); #[cfg(any(feature = "std", feature = "alloc"))] forwarded_impl!((), Box, String::into_boxed_str); -#[cfg(all(not(de_rc_dst), feature = "rc", any(feature = "std", feature = "alloc")))] +#[cfg( + all( + not(de_rc_dst), + feature = "rc", + any(feature = "std", feature = "alloc") + ) +)] forwarded_impl! { /// This impl requires the [`"rc"`] Cargo feature of Serde. /// @@ -1614,7 +1620,13 @@ forwarded_impl! { (T), Arc, Arc::new } -#[cfg(all(not(de_rc_dst), feature = "rc", any(feature = "std", feature = "alloc")))] +#[cfg( + all( + not(de_rc_dst), + feature = "rc", + any(feature = "std", feature = "alloc") + ) +)] forwarded_impl! { /// This impl requires the [`"rc"`] Cargo feature of Serde. /// @@ -1681,7 +1693,13 @@ where //////////////////////////////////////////////////////////////////////////////// -#[cfg(all(de_rc_dst, feature = "rc", any(feature = "std", feature = "alloc")))] +#[cfg( + all( + de_rc_dst, + feature = "rc", + any(feature = "std", feature = "alloc") + ) +)] macro_rules! box_forwarded_impl { ( $(#[doc = $doc:tt])* @@ -1702,7 +1720,13 @@ macro_rules! box_forwarded_impl { }; } -#[cfg(all(de_rc_dst, feature = "rc", any(feature = "std", feature = "alloc")))] +#[cfg( + all( + de_rc_dst, + feature = "rc", + any(feature = "std", feature = "alloc") + ) +)] box_forwarded_impl! { /// This impl requires the [`"rc"`] Cargo feature of Serde. /// @@ -1714,7 +1738,13 @@ box_forwarded_impl! { Rc } -#[cfg(all(de_rc_dst, feature = "rc", any(feature = "std", feature = "alloc")))] +#[cfg( + all( + de_rc_dst, + feature = "rc", + any(feature = "std", feature = "alloc") + ) +)] box_forwarded_impl! { /// This impl requires the [`"rc"`] Cargo feature of Serde. /// diff --git a/serde/src/lib.rs b/serde/src/lib.rs index 12db533e..ff6dbd3c 100644 --- a/serde/src/lib.rs +++ b/serde/src/lib.rs @@ -96,8 +96,15 @@ #![cfg_attr( feature = "cargo-clippy", allow( - cast_lossless, const_static_lifetime, doc_markdown, linkedlist, needless_pass_by_value, - redundant_field_names, type_complexity, unreadable_literal, zero_prefixed_literal + cast_lossless, + const_static_lifetime, + doc_markdown, + linkedlist, + needless_pass_by_value, + redundant_field_names, + type_complexity, + unreadable_literal, + zero_prefixed_literal ) )] // Whitelisted clippy_pedantic lints diff --git a/serde_derive/src/lib.rs b/serde_derive/src/lib.rs index fa6e36eb..ba2f64f5 100644 --- a/serde_derive/src/lib.rs +++ b/serde_derive/src/lib.rs @@ -28,16 +28,29 @@ #![cfg_attr( feature = "cargo-clippy", allow( - enum_variant_names, redundant_field_names, too_many_arguments, used_underscore_binding, - cyclomatic_complexity, needless_pass_by_value + enum_variant_names, + redundant_field_names, + too_many_arguments, + used_underscore_binding, + cyclomatic_complexity, + needless_pass_by_value ) )] // Whitelisted clippy_pedantic lints #![cfg_attr( feature = "cargo-clippy", allow( - items_after_statements, doc_markdown, stutter, similar_names, use_self, single_match_else, - enum_glob_use, match_same_arms, filter_map, cast_possible_truncation, indexing_slicing, + items_after_statements, + doc_markdown, + stutter, + similar_names, + use_self, + single_match_else, + enum_glob_use, + match_same_arms, + filter_map, + cast_possible_truncation, + indexing_slicing, ) )] // The `quote!` macro requires deep recursion. diff --git a/serde_derive_internals/lib.rs b/serde_derive_internals/lib.rs index cbd307b9..56004e78 100644 --- a/serde_derive_internals/lib.rs +++ b/serde_derive_internals/lib.rs @@ -9,7 +9,12 @@ #![doc(html_root_url = "https://docs.rs/serde_derive_internals/0.23.1")] #![cfg_attr( feature = "cargo-clippy", - allow(cyclomatic_complexity, doc_markdown, match_same_arms, redundant_field_names) + allow( + cyclomatic_complexity, + doc_markdown, + match_same_arms, + redundant_field_names + ) )] #[macro_use] diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs index 3b8f28d8..e317f654 100644 --- a/serde_test/src/de.rs +++ b/serde_test/src/de.rs @@ -253,7 +253,8 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> { Token::UnitVariant { name: n, .. } | Token::NewtypeVariant { name: n, .. } | Token::TupleVariant { name: n, .. } - | Token::StructVariant { name: n, .. } if name == n => + | Token::StructVariant { name: n, .. } + if name == n => { visitor.visit_enum(DeserializerEnumVisitor { de: self }) } diff --git a/serde_test/src/lib.rs b/serde_test/src/lib.rs index 4e10504c..e1fe2df6 100644 --- a/serde_test/src/lib.rs +++ b/serde_test/src/lib.rs @@ -169,8 +169,12 @@ #![cfg_attr( feature = "cargo-clippy", allow( - empty_line_after_outer_attr, missing_docs_in_private_items, redundant_field_names, stutter, - use_debug, use_self + empty_line_after_outer_attr, + missing_docs_in_private_items, + redundant_field_names, + stutter, + use_debug, + use_self ) )] diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs index bc45f37c..55455b04 100644 --- a/test_suite/tests/test_annotations.rs +++ b/test_suite/tests/test_annotations.rs @@ -348,7 +348,10 @@ struct ContainsNotDeserialize { a: A, #[serde(skip_deserializing, default)] b: B, - #[serde(deserialize_with = "DeserializeWith::deserialize_with", default)] + #[serde( + deserialize_with = "DeserializeWith::deserialize_with", + default + )] c: C, #[serde(skip_deserializing, default = "MyDefault::my_default")] e: E, diff --git a/test_suite/tests/test_de.rs b/test_suite/tests/test_de.rs index 0218cab8..3933232c 100644 --- a/test_suite/tests/test_de.rs +++ b/test_suite/tests/test_de.rs @@ -6,7 +6,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![cfg_attr(feature = "cargo-clippy", allow(decimal_literal_representation))] +#![cfg_attr( + feature = "cargo-clippy", + allow(decimal_literal_representation) +)] #![cfg_attr(feature = "unstable", feature(never_type))] #[macro_use] diff --git a/test_suite/tests/test_gen.rs b/test_suite/tests/test_gen.rs index 82e4dfc0..e9af34ba 100644 --- a/test_suite/tests/test_gen.rs +++ b/test_suite/tests/test_gen.rs @@ -198,7 +198,12 @@ fn test_gen() { assert::>(); #[derive(Serialize, Deserialize)] - #[serde(bound(serialize = "D: SerializeWith", deserialize = "D: DeserializeWith"))] + #[serde( + bound( + serialize = "D: SerializeWith", + deserialize = "D: DeserializeWith" + ) + )] struct WithTraits2 { #[serde( serialize_with = "SerializeWith::serialize_with", @@ -206,7 +211,8 @@ fn test_gen() { )] d: D, #[serde( - serialize_with = "SerializeWith::serialize_with", bound(serialize = "E: SerializeWith") + serialize_with = "SerializeWith::serialize_with", + bound(serialize = "E: SerializeWith") )] #[serde( deserialize_with = "DeserializeWith::deserialize_with", @@ -234,7 +240,12 @@ fn test_gen() { assert::>(); #[derive(Serialize, Deserialize)] - #[serde(bound(serialize = "D: SerializeWith", deserialize = "D: DeserializeWith"))] + #[serde( + bound( + serialize = "D: SerializeWith", + deserialize = "D: DeserializeWith" + ) + )] enum VariantWithTraits2 { #[serde( serialize_with = "SerializeWith::serialize_with", @@ -242,7 +253,8 @@ fn test_gen() { )] D(D), #[serde( - serialize_with = "SerializeWith::serialize_with", bound(serialize = "E: SerializeWith") + serialize_with = "SerializeWith::serialize_with", + bound(serialize = "E: SerializeWith") )] #[serde( deserialize_with = "DeserializeWith::deserialize_with",