pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-24 18:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format PR #1916 with rustfmt 1.4.32

Browse Source
This commit is contained in:
David Tolnay
2021-01-23 13:39:12 -08:00
parent a5ecbdb4f4
commit 88ee470a1c
2 changed files with 29 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_test/src/de.rs
+1 -1
View File
@@ -250,7 +250,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
{ {
visitor.visit_enum(DeserializerEnumVisitor { de: self }) visitor.visit_enum(DeserializerEnumVisitor { de: self })
} }
_ => self.deserialize_any(visitor) _ => self.deserialize_any(visitor),
} }
} }
test_suite/tests/test_annotations.rs
+28 -56
View File
@@ -2661,22 +2661,22 @@ fn test_expecting_message() {
assert_de_tokens_error::<Unit>( assert_de_tokens_error::<Unit>(
&[Token::Str("Unit")], &[Token::Str("Unit")],
r#"invalid type: string "Unit", expected something strange..."# r#"invalid type: string "Unit", expected something strange..."#,
); );
assert_de_tokens_error::<Newtype>( assert_de_tokens_error::<Newtype>(
&[Token::Str("Newtype")], &[Token::Str("Newtype")],
r#"invalid type: string "Newtype", expected something strange..."# r#"invalid type: string "Newtype", expected something strange..."#,
); );
assert_de_tokens_error::<Tuple>( assert_de_tokens_error::<Tuple>(
&[Token::Str("Tuple")], &[Token::Str("Tuple")],
r#"invalid type: string "Tuple", expected something strange..."# r#"invalid type: string "Tuple", expected something strange..."#,
); );
assert_de_tokens_error::<Struct>( assert_de_tokens_error::<Struct>(
&[Token::Str("Struct")], &[Token::Str("Struct")],
r#"invalid type: string "Struct", expected something strange..."# r#"invalid type: string "Struct", expected something strange..."#,
); );
} }
@@ -2689,19 +2689,14 @@ fn test_expecting_message_externally_tagged_enum() {
} }
assert_de_tokens_error::<Enum>( assert_de_tokens_error::<Enum>(
&[ &[Token::Str("ExternallyTagged")],
Token::Str("ExternallyTagged"), r#"invalid type: string "ExternallyTagged", expected something strange..."#,
],
r#"invalid type: string "ExternallyTagged", expected something strange..."#
); );
// Check that #[serde(expecting = "...")] doesn't affect variant identifier error message // Check that #[serde(expecting = "...")] doesn't affect variant identifier error message
assert_de_tokens_error::<Enum>( assert_de_tokens_error::<Enum>(
&[ &[Token::Enum { name: "Enum" }, Token::Unit],
Token::Enum { name: "Enum" }, r#"invalid type: unit value, expected variant identifier"#,
Token::Unit,
],
r#"invalid type: unit value, expected variant identifier"#
); );
} }
@@ -2715,20 +2710,14 @@ fn test_expecting_message_internally_tagged_enum() {
} }
assert_de_tokens_error::<Enum>( assert_de_tokens_error::<Enum>(
&[ &[Token::Str("InternallyTagged")],
Token::Str("InternallyTagged"), r#"invalid type: string "InternallyTagged", expected something strange..."#,
],
r#"invalid type: string "InternallyTagged", expected something strange..."#
); );
// Check that #[serde(expecting = "...")] doesn't affect variant identifier error message // Check that #[serde(expecting = "...")] doesn't affect variant identifier error message
assert_de_tokens_error::<Enum>( assert_de_tokens_error::<Enum>(
&[ &[Token::Map { len: None }, Token::Str("tag"), Token::Unit],
Token::Map { len: None }, r#"invalid type: unit value, expected variant identifier"#,
Token::Str("tag"),
Token::Unit,
],
r#"invalid type: unit value, expected variant identifier"#
); );
} }
@@ -2742,28 +2731,19 @@ fn test_expecting_message_adjacently_tagged_enum() {
} }
assert_de_tokens_error::<Enum>( assert_de_tokens_error::<Enum>(
&[ &[Token::Str("AdjacentlyTagged")],
Token::Str("AdjacentlyTagged"), r#"invalid type: string "AdjacentlyTagged", expected something strange..."#,
],
r#"invalid type: string "AdjacentlyTagged", expected something strange..."#
); );
assert_de_tokens_error::<Enum>( assert_de_tokens_error::<Enum>(
&[ &[Token::Map { len: None }, Token::Unit],
Token::Map { len: None }, r#"invalid type: unit value, expected "tag", "content", or other ignored fields"#,
Token::Unit,
],
r#"invalid type: unit value, expected "tag", "content", or other ignored fields"#
); );
// Check that #[serde(expecting = "...")] doesn't affect variant identifier error message // Check that #[serde(expecting = "...")] doesn't affect variant identifier error message
assert_de_tokens_error::<Enum>( assert_de_tokens_error::<Enum>(
&[ &[Token::Map { len: None }, Token::Str("tag"), Token::Unit],
Token::Map { len: None }, r#"invalid type: unit value, expected variant identifier"#,
Token::Str("tag"),
Token::Unit,
],
r#"invalid type: unit value, expected variant identifier"#
); );
} }
@@ -2776,12 +2756,7 @@ fn test_expecting_message_untagged_tagged_enum() {
Untagged, Untagged,
} }
assert_de_tokens_error::<Enum>( assert_de_tokens_error::<Enum>(&[Token::Str("Untagged")], r#"something strange..."#);
&[
Token::Str("Untagged"),
],
r#"something strange..."#
);
} }
#[test] #[test]
@@ -2801,10 +2776,8 @@ fn test_expecting_message_identifier_enum() {
} }
assert_de_tokens_error::<FieldEnum>( assert_de_tokens_error::<FieldEnum>(
&[ &[Token::Unit],
Token::Unit, r#"invalid type: unit value, expected something strange..."#,
],
r#"invalid type: unit value, expected something strange..."#
); );
assert_de_tokens_error::<FieldEnum>( assert_de_tokens_error::<FieldEnum>(
@@ -2813,23 +2786,22 @@ fn test_expecting_message_identifier_enum() {
Token::Str("Unknown"), Token::Str("Unknown"),
Token::None, Token::None,
], ],
r#"invalid type: map, expected something strange..."# r#"invalid type: map, expected something strange..."#,
); );
assert_de_tokens_error::<VariantEnum>( assert_de_tokens_error::<VariantEnum>(
&[ &[Token::Unit],
Token::Unit, r#"invalid type: unit value, expected something strange..."#,
],
r#"invalid type: unit value, expected something strange..."#
); );
assert_de_tokens_error::<VariantEnum>( assert_de_tokens_error::<VariantEnum>(
&[ &[
Token::Enum { name: "VariantEnum" }, Token::Enum {
name: "VariantEnum",
},
Token::Str("Unknown"), Token::Str("Unknown"),
Token::None, Token::None,
], ],
r#"invalid type: map, expected something strange..."# r#"invalid type: map, expected something strange..."#,
); );
} }