Skip to content

Commit

Permalink
Format PR #1916 with rustfmt 1.4.32
Browse files Browse the repository at this point in the history
  • Loading branch information
@dtolnay
dtolnay committed Jan 23, 2021
1 parent a5ecbdb commit 88ee470
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 57 deletions.
2 changes: 1 addition & 1 deletion serde_test/src/de.rs
View file
Expand Up @@ -250,7 +250,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
{
visitor.visit_enum(DeserializerEnumVisitor { de: self })
}
_ => self.deserialize_any(visitor)
_ => self.deserialize_any(visitor),
}
}

Expand Down
84 changes: 28 additions & 56 deletions test_suite/tests/test_annotations.rs
View file
Expand Up @@ -2661,22 +2661,22 @@ fn test_expecting_message() {

assert_de_tokens_error::<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>(
&[Token::Str("Newtype")],
r#"invalid type: string "Newtype", expected something strange..."#
r#"invalid type: string "Newtype", expected something strange..."#,
);

assert_de_tokens_error::<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>(
&[Token::Str("Struct")],
r#"invalid type: string "Struct", expected something strange..."#
r#"invalid type: string "Struct", expected something strange..."#,
);
}

Expand All @@ -2689,19 +2689,14 @@ fn test_expecting_message_externally_tagged_enum() {
}

assert_de_tokens_error::<Enum>(
&[
Token::Str("ExternallyTagged"),
],
r#"invalid type: string "ExternallyTagged", expected something strange..."#
&[Token::Str("ExternallyTagged")],
r#"invalid type: string "ExternallyTagged", expected something strange..."#,
);

// Check that #[serde(expecting = "...")] doesn't affect variant identifier error message
assert_de_tokens_error::<Enum>(
&[
Token::Enum { name: "Enum" },
Token::Unit,
],
r#"invalid type: unit value, expected variant identifier"#
&[Token::Enum { name: "Enum" }, Token::Unit],
r#"invalid type: unit value, expected variant identifier"#,
);
}

Expand All @@ -2715,20 +2710,14 @@ fn test_expecting_message_internally_tagged_enum() {
}

assert_de_tokens_error::<Enum>(
&[
Token::Str("InternallyTagged"),
],
r#"invalid type: string "InternallyTagged", expected something strange..."#
&[Token::Str("InternallyTagged")],
r#"invalid type: string "InternallyTagged", expected something strange..."#,
);

// Check that #[serde(expecting = "...")] doesn't affect variant identifier error message
assert_de_tokens_error::<Enum>(
&[
Token::Map { len: None },
Token::Str("tag"),
Token::Unit,
],
r#"invalid type: unit value, expected variant identifier"#
&[Token::Map { len: None }, Token::Str("tag"), Token::Unit],
r#"invalid type: unit value, expected variant identifier"#,
);
}

Expand All @@ -2742,28 +2731,19 @@ fn test_expecting_message_adjacently_tagged_enum() {
}

assert_de_tokens_error::<Enum>(
&[
Token::Str("AdjacentlyTagged"),
],
r#"invalid type: string "AdjacentlyTagged", expected something strange..."#
&[Token::Str("AdjacentlyTagged")],
r#"invalid type: string "AdjacentlyTagged", expected something strange..."#,
);

assert_de_tokens_error::<Enum>(
&[
Token::Map { len: None },
Token::Unit,
],
r#"invalid type: unit value, expected "tag", "content", or other ignored fields"#
&[Token::Map { len: None }, 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
assert_de_tokens_error::<Enum>(
&[
Token::Map { len: None },
Token::Str("tag"),
Token::Unit,
],
r#"invalid type: unit value, expected variant identifier"#
&[Token::Map { len: None }, Token::Str("tag"), Token::Unit],
r#"invalid type: unit value, expected variant identifier"#,
);
}

Expand All @@ -2776,12 +2756,7 @@ fn test_expecting_message_untagged_tagged_enum() {
Untagged,
}

assert_de_tokens_error::<Enum>(
&[
Token::Str("Untagged"),
],
r#"something strange..."#
);
assert_de_tokens_error::<Enum>(&[Token::Str("Untagged")], r#"something strange..."#);
}

#[test]
Expand All @@ -2801,10 +2776,8 @@ fn test_expecting_message_identifier_enum() {
}

assert_de_tokens_error::<FieldEnum>(
&[
Token::Unit,
],
r#"invalid type: unit value, expected something strange..."#
&[Token::Unit],
r#"invalid type: unit value, expected something strange..."#,
);

assert_de_tokens_error::<FieldEnum>(
Expand All @@ -2813,23 +2786,22 @@ fn test_expecting_message_identifier_enum() {
Token::Str("Unknown"),
Token::None,
],
r#"invalid type: map, expected something strange..."#
r#"invalid type: map, expected something strange..."#,
);


assert_de_tokens_error::<VariantEnum>(
&[
Token::Unit,
],
r#"invalid type: unit value, expected something strange..."#
&[Token::Unit],
r#"invalid type: unit value, expected something strange..."#,
);

assert_de_tokens_error::<VariantEnum>(
&[
Token::Enum { name: "VariantEnum" },
Token::Enum {
name: "VariantEnum",
},
Token::Str("Unknown"),
Token::None,
],
r#"invalid type: map, expected something strange..."#
r#"invalid type: map, expected something strange..."#,
);
}

0 comments on commit 88ee470

Please sign in to comment.