diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs index a1d62758e..4d3d0675e 100644 --- a/serde_test/src/de.rs +++ b/serde_test/src/de.rs @@ -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), } } diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs index 6c648efbd..9e62e0a3d 100644 --- a/test_suite/tests/test_annotations.rs +++ b/test_suite/tests/test_annotations.rs @@ -2661,22 +2661,22 @@ fn test_expecting_message() { assert_de_tokens_error::( &[Token::Str("Unit")], - r#"invalid type: string "Unit", expected something strange..."# + r#"invalid type: string "Unit", expected something strange..."#, ); assert_de_tokens_error::( &[Token::Str("Newtype")], - r#"invalid type: string "Newtype", expected something strange..."# + r#"invalid type: string "Newtype", expected something strange..."#, ); assert_de_tokens_error::( &[Token::Str("Tuple")], - r#"invalid type: string "Tuple", expected something strange..."# + r#"invalid type: string "Tuple", expected something strange..."#, ); assert_de_tokens_error::( &[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::( - &[ - 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::( - &[ - 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"#, ); } @@ -2715,20 +2710,14 @@ fn test_expecting_message_internally_tagged_enum() { } assert_de_tokens_error::( - &[ - 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::( - &[ - 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"#, ); } @@ -2742,28 +2731,19 @@ fn test_expecting_message_adjacently_tagged_enum() { } assert_de_tokens_error::( - &[ - 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::( - &[ - 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::( - &[ - 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"#, ); } @@ -2776,12 +2756,7 @@ fn test_expecting_message_untagged_tagged_enum() { Untagged, } - assert_de_tokens_error::( - &[ - Token::Str("Untagged"), - ], - r#"something strange..."# - ); + assert_de_tokens_error::(&[Token::Str("Untagged")], r#"something strange..."#); } #[test] @@ -2801,10 +2776,8 @@ fn test_expecting_message_identifier_enum() { } assert_de_tokens_error::( - &[ - Token::Unit, - ], - r#"invalid type: unit value, expected something strange..."# + &[Token::Unit], + r#"invalid type: unit value, expected something strange..."#, ); assert_de_tokens_error::( @@ -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::( - &[ - Token::Unit, - ], - r#"invalid type: unit value, expected something strange..."# + &[Token::Unit], + r#"invalid type: unit value, expected something strange..."#, ); assert_de_tokens_error::( &[ - 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..."#, ); }