diff --git a/serde_test/src/assert.rs b/serde_test/src/assert.rs index 892850e4..5d38270c 100644 --- a/serde_test/src/assert.rs +++ b/serde_test/src/assert.rs @@ -7,10 +7,10 @@ use token::Token; use std::fmt::Debug; -pub fn assert_tokens(value: &T, tokens: Vec>) +pub fn assert_tokens(value: &T, tokens: &[Token<'static>]) where T: Serialize + Deserialize + PartialEq + Debug, { - assert_ser_tokens(value, &tokens[..]); + assert_ser_tokens(value, tokens); assert_de_tokens(value, tokens); } @@ -32,20 +32,20 @@ pub fn assert_ser_tokens_error(value: &T, tokens: &[Token], error: Error) assert_eq!(ser.next_token(), None); } -pub fn assert_de_tokens(value: &T, tokens: Vec>) +pub fn assert_de_tokens(value: &T, tokens: &[Token<'static>]) where T: Deserialize + PartialEq + Debug, { - let mut de = Deserializer::new(tokens.into_iter()); + let mut de = Deserializer::new(tokens.to_vec().into_iter()); let v: Result = Deserialize::deserialize(&mut de); assert_eq!(v.as_ref(), Ok(value)); assert_eq!(de.next_token(), None); } // Expect an error deserializing tokens into a T -pub fn assert_de_tokens_error(tokens: Vec>, error: Error) +pub fn assert_de_tokens_error(tokens: &[Token<'static>], error: Error) where T: Deserialize + PartialEq + Debug, { - let mut de = Deserializer::new(tokens.into_iter()); + let mut de = Deserializer::new(tokens.to_vec().into_iter()); let v: Result = Deserialize::deserialize(&mut de); assert_eq!(v, Err(error)); // There may be one token left if a peek caused the error diff --git a/testing/tests/test_annotations.rs b/testing/tests/test_annotations.rs index 245f0a22..0a795725 100644 --- a/testing/tests/test_annotations.rs +++ b/testing/tests/test_annotations.rs @@ -81,7 +81,7 @@ struct DefaultStruct fn test_default_struct() { assert_de_tokens( &DefaultStruct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 }, - vec![ + &[ Token::StructStart("DefaultStruct", Some(3)), Token::StructSep, @@ -110,7 +110,7 @@ fn test_default_struct() { assert_de_tokens( &DefaultStruct { a1: 1, a2: 0, a3: 123, a4: 0, a5: 123 }, - vec![ + &[ Token::StructStart("DefaultStruct", Some(1)), Token::StructSep, @@ -144,7 +144,7 @@ enum DefaultEnum fn test_default_enum() { assert_de_tokens( &DefaultEnum::Struct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 }, - vec![ + &[ Token::EnumMapStart("DefaultEnum", "Struct", Some(5)), Token::EnumMapSep, @@ -173,7 +173,7 @@ fn test_default_enum() { assert_de_tokens( &DefaultEnum::Struct { a1: 1, a2: 0, a3: 123, a4: 0, a5: 123 }, - vec![ + &[ Token::EnumMapStart("DefaultEnum", "Struct", Some(5)), Token::EnumMapSep, @@ -207,7 +207,7 @@ struct ContainsNoStdDefault { fn test_no_std_default() { assert_de_tokens( &ContainsNoStdDefault { a: NoStdDefault(123) }, - vec![ + &[ Token::StructStart("ContainsNoStdDefault", Some(1)), Token::StructEnd, ] @@ -215,7 +215,7 @@ fn test_no_std_default() { assert_de_tokens( &ContainsNoStdDefault { a: NoStdDefault(8) }, - vec![ + &[ Token::StructStart("ContainsNoStdDefault", Some(1)), Token::StructSep, @@ -280,7 +280,7 @@ fn test_elt_not_deserialize() { c: NotDeserializeStruct(123), e: NotDeserializeEnum::Trouble, }, - vec![ + &[ Token::StructStart("ContainsNotDeserialize", Some(3)), Token::StructEnd, ] @@ -298,7 +298,7 @@ fn test_ignore_unknown() { // 'Default' allows unknown. Basic smoke test of ignore... assert_de_tokens( &DefaultStruct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 }, - vec![ + &[ Token::StructStart("DefaultStruct", Some(5)), Token::StructSep, @@ -333,7 +333,7 @@ fn test_ignore_unknown() { ); assert_de_tokens_error::( - vec![ + &[ Token::StructStart("DenyUnknown", Some(2)), Token::StructSep, @@ -367,7 +367,7 @@ struct RenameStructSerializeDeserialize { fn test_rename_struct() { assert_tokens( &RenameStruct { a1: 1, a2: 2 }, - vec![ + &[ Token::StructStart("Superhero", Some(2)), Token::StructSep, @@ -401,7 +401,7 @@ fn test_rename_struct() { assert_de_tokens( &RenameStructSerializeDeserialize { a1: 1, a2: 2 }, - vec![ + &[ Token::StructStart("SuperheroDe", Some(2)), Token::StructSep, @@ -449,14 +449,14 @@ enum RenameEnumSerializeDeserialize { fn test_rename_enum() { assert_tokens( &RenameEnum::Batman, - vec![ + &[ Token::EnumUnit("Superhero", "bruce_wayne"), ] ); assert_tokens( &RenameEnum::Superman(0), - vec![ + &[ Token::EnumNewType("Superhero", "clark_kent"), Token::I8(0), ] @@ -464,7 +464,7 @@ fn test_rename_enum() { assert_tokens( &RenameEnum::WonderWoman(0, 1), - vec![ + &[ Token::EnumSeqStart("Superhero", "diana_prince", Some(2)), Token::EnumSeqSep, @@ -479,7 +479,7 @@ fn test_rename_enum() { assert_tokens( &RenameEnum::Flash { a: 1 }, - vec![ + &[ Token::EnumMapStart("Superhero", "barry_allan", Some(1)), Token::EnumMapSep, @@ -515,7 +515,7 @@ fn test_rename_enum() { a: 0, b: String::new(), }, - vec![ + &[ Token::EnumMapStart("SuperheroDe", "jason_todd", Some(2)), Token::EnumMapSep, @@ -805,7 +805,7 @@ fn test_deserialize_with_struct() { a: 1, b: 2, }, - vec![ + &[ Token::StructStart("DeserializeWithStruct", Some(2)), Token::StructSep, @@ -825,7 +825,7 @@ fn test_deserialize_with_struct() { a: 1, b: 123, }, - vec![ + &[ Token::StructStart("DeserializeWithStruct", Some(2)), Token::StructSep, @@ -857,7 +857,7 @@ fn test_deserialize_with_enum() { a: 1, b: 2, }, - vec![ + &[ Token::EnumMapStart("DeserializeWithEnum", "Struct", Some(2)), Token::EnumMapSep, @@ -877,7 +877,7 @@ fn test_deserialize_with_enum() { a: 1, b: 123, }, - vec![ + &[ Token::EnumMapStart("DeserializeWithEnum", "Struct", Some(2)), Token::EnumMapSep, @@ -896,7 +896,7 @@ fn test_deserialize_with_enum() { #[test] fn test_missing_renamed_field_struct() { assert_de_tokens_error::( - vec![ + &[ Token::StructStart("Superhero", Some(2)), Token::StructSep, @@ -909,7 +909,7 @@ fn test_missing_renamed_field_struct() { ); assert_de_tokens_error::( - vec![ + &[ Token::StructStart("SuperheroDe", Some(2)), Token::StructSep, @@ -925,7 +925,7 @@ fn test_missing_renamed_field_struct() { #[test] fn test_missing_renamed_field_enum() { assert_de_tokens_error::( - vec![ + &[ Token::EnumMapStart("Superhero", "barry_allan", Some(1)), Token::EnumMapEnd, @@ -934,7 +934,7 @@ fn test_missing_renamed_field_enum() { ); assert_de_tokens_error::>( - vec![ + &[ Token::EnumMapStart("SuperheroDe", "jason_todd", Some(2)), Token::EnumMapSep, diff --git a/testing/tests/test_de.rs b/testing/tests/test_de.rs index 3212e74c..fcd17448 100644 --- a/testing/tests/test_de.rs +++ b/testing/tests/test_de.rs @@ -76,7 +76,7 @@ macro_rules! declare_error_tests { } } -fn assert_de_tokens_ignore(ignorable_tokens: Vec>) { +fn assert_de_tokens_ignore(ignorable_tokens: &[Token<'static>]) { #[derive(PartialEq, Debug, Deserialize)] struct IgnoreBase { a: i32, @@ -96,7 +96,7 @@ fn assert_de_tokens_ignore(ignorable_tokens: Vec>) { Token::Str("ignored") ] .into_iter() - .chain(ignorable_tokens.into_iter()) + .chain(ignorable_tokens.to_vec().into_iter()) .chain(vec![ Token::MapEnd, ].into_iter()) @@ -120,103 +120,103 @@ fn assert_de_tokens_ignore(ignorable_tokens: Vec>) { declare_tests! { test_bool { - true => vec![Token::Bool(true)], - false => vec![Token::Bool(false)], + true => &[Token::Bool(true)], + false => &[Token::Bool(false)], } test_isize { - 0isize => vec![Token::Isize(0)], - 0isize => vec![Token::I8(0)], - 0isize => vec![Token::I16(0)], - 0isize => vec![Token::I32(0)], - 0isize => vec![Token::I64(0)], - 0isize => vec![Token::Usize(0)], - 0isize => vec![Token::U8(0)], - 0isize => vec![Token::U16(0)], - 0isize => vec![Token::U32(0)], - 0isize => vec![Token::U64(0)], - 0isize => vec![Token::F32(0.)], - 0isize => vec![Token::F64(0.)], + 0isize => &[Token::Isize(0)], + 0isize => &[Token::I8(0)], + 0isize => &[Token::I16(0)], + 0isize => &[Token::I32(0)], + 0isize => &[Token::I64(0)], + 0isize => &[Token::Usize(0)], + 0isize => &[Token::U8(0)], + 0isize => &[Token::U16(0)], + 0isize => &[Token::U32(0)], + 0isize => &[Token::U64(0)], + 0isize => &[Token::F32(0.)], + 0isize => &[Token::F64(0.)], } test_ints { - 0isize => vec![Token::Isize(0)], - 0i8 => vec![Token::I8(0)], - 0i16 => vec![Token::I16(0)], - 0i32 => vec![Token::I32(0)], - 0i64 => vec![Token::I64(0)], + 0isize => &[Token::Isize(0)], + 0i8 => &[Token::I8(0)], + 0i16 => &[Token::I16(0)], + 0i32 => &[Token::I32(0)], + 0i64 => &[Token::I64(0)], } test_uints { - 0usize => vec![Token::Usize(0)], - 0u8 => vec![Token::U8(0)], - 0u16 => vec![Token::U16(0)], - 0u32 => vec![Token::U32(0)], - 0u64 => vec![Token::U64(0)], + 0usize => &[Token::Usize(0)], + 0u8 => &[Token::U8(0)], + 0u16 => &[Token::U16(0)], + 0u32 => &[Token::U32(0)], + 0u64 => &[Token::U64(0)], } test_floats { - 0f32 => vec![Token::F32(0.)], - 0f64 => vec![Token::F64(0.)], + 0f32 => &[Token::F32(0.)], + 0f64 => &[Token::F64(0.)], } test_char { - 'a' => vec![Token::Char('a')], - 'a' => vec![Token::Str("a")], - 'a' => vec![Token::String("a".to_owned())], + 'a' => &[Token::Char('a')], + 'a' => &[Token::Str("a")], + 'a' => &[Token::String("a".to_owned())], } test_string { - "abc".to_owned() => vec![Token::Str("abc")], - "abc".to_owned() => vec![Token::String("abc".to_owned())], - "a".to_owned() => vec![Token::Char('a')], + "abc".to_owned() => &[Token::Str("abc")], + "abc".to_owned() => &[Token::String("abc".to_owned())], + "a".to_owned() => &[Token::Char('a')], } test_option { - None:: => vec![Token::Unit], - None:: => vec![Token::Option(false)], - Some(1) => vec![Token::I32(1)], - Some(1) => vec![ + None:: => &[Token::Unit], + None:: => &[Token::Option(false)], + Some(1) => &[Token::I32(1)], + Some(1) => &[ Token::Option(true), Token::I32(1), ], } test_result { - Ok::(0) => vec![ + Ok::(0) => &[ Token::EnumStart("Result"), Token::Str("Ok"), Token::I32(0), ], - Err::(1) => vec![ + Err::(1) => &[ Token::EnumStart("Result"), Token::Str("Err"), Token::I32(1), ], } test_unit { - () => vec![Token::Unit], - () => vec![ + () => &[Token::Unit], + () => &[ Token::SeqStart(Some(0)), Token::SeqEnd, ], - () => vec![ + () => &[ Token::SeqStart(None), Token::SeqEnd, ], - () => vec![ + () => &[ Token::TupleStructStart("Anything", Some(0)), Token::SeqEnd, ], } test_unit_struct { - UnitStruct => vec![Token::Unit], - UnitStruct => vec![ + UnitStruct => &[Token::Unit], + UnitStruct => &[ Token::UnitStruct("UnitStruct"), ], - UnitStruct => vec![ + UnitStruct => &[ Token::SeqStart(Some(0)), Token::SeqEnd, ], - UnitStruct => vec![ + UnitStruct => &[ Token::SeqStart(None), Token::SeqEnd, ], } test_tuple_struct { - TupleStruct(1, 2, 3) => vec![ + TupleStruct(1, 2, 3) => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::I32(1), @@ -228,7 +228,7 @@ declare_tests! { Token::I32(3), Token::SeqEnd, ], - TupleStruct(1, 2, 3) => vec![ + TupleStruct(1, 2, 3) => &[ Token::SeqStart(None), Token::SeqSep, Token::I32(1), @@ -240,7 +240,7 @@ declare_tests! { Token::I32(3), Token::SeqEnd, ], - TupleStruct(1, 2, 3) => vec![ + TupleStruct(1, 2, 3) => &[ Token::TupleStructStart("TupleStruct", Some(3)), Token::TupleStructSep, Token::I32(1), @@ -252,7 +252,7 @@ declare_tests! { Token::I32(3), Token::TupleStructEnd, ], - TupleStruct(1, 2, 3) => vec![ + TupleStruct(1, 2, 3) => &[ Token::TupleStructStart("TupleStruct", None), Token::TupleStructSep, Token::I32(1), @@ -266,14 +266,14 @@ declare_tests! { ], } test_btreeset { - BTreeSet::::new() => vec![ + BTreeSet::::new() => &[ Token::Unit, ], - BTreeSet::::new() => vec![ + BTreeSet::::new() => &[ Token::SeqStart(Some(0)), Token::SeqEnd, ], - btreeset![btreeset![], btreeset![1], btreeset![2, 3]] => vec![ + btreeset![btreeset![], btreeset![1], btreeset![2, 3]] => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::SeqStart(Some(0)), @@ -295,23 +295,23 @@ declare_tests! { Token::SeqEnd, Token::SeqEnd, ], - BTreeSet::::new() => vec![ + BTreeSet::::new() => &[ Token::UnitStruct("Anything"), ], - BTreeSet::::new() => vec![ + BTreeSet::::new() => &[ Token::TupleStructStart("Anything", Some(0)), Token::SeqEnd, ], } test_hashset { - HashSet::::new() => vec![ + HashSet::::new() => &[ Token::Unit, ], - HashSet::::new() => vec![ + HashSet::::new() => &[ Token::SeqStart(Some(0)), Token::SeqEnd, ], - hashset![1, 2, 3] => vec![ + hashset![1, 2, 3] => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::I32(1), @@ -323,14 +323,14 @@ declare_tests! { Token::I32(3), Token::SeqEnd, ], - HashSet::::new() => vec![ + HashSet::::new() => &[ Token::UnitStruct("Anything"), ], - HashSet::::new() => vec![ + HashSet::::new() => &[ Token::TupleStructStart("Anything", Some(0)), Token::SeqEnd, ], - hashset![FnvHasher @ 1, 2, 3] => vec![ + hashset![FnvHasher @ 1, 2, 3] => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::I32(1), @@ -344,14 +344,14 @@ declare_tests! { ], } test_vec { - Vec::::new() => vec![ + Vec::::new() => &[ Token::Unit, ], - Vec::::new() => vec![ + Vec::::new() => &[ Token::SeqStart(Some(0)), Token::SeqEnd, ], - vec![vec![], vec![1], vec![2, 3]] => vec![ + vec![vec![], vec![1], vec![2, 3]] => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::SeqStart(Some(0)), @@ -373,27 +373,27 @@ declare_tests! { Token::SeqEnd, Token::SeqEnd, ], - Vec::::new() => vec![ + Vec::::new() => &[ Token::UnitStruct("Anything"), ], - Vec::::new() => vec![ + Vec::::new() => &[ Token::TupleStructStart("Anything", Some(0)), Token::SeqEnd, ], } test_array { - [0; 0] => vec![ + [0; 0] => &[ Token::Unit, ], - [0; 0] => vec![ + [0; 0] => &[ Token::SeqStart(Some(0)), Token::SeqEnd, ], - [0; 0] => vec![ + [0; 0] => &[ Token::SeqArrayStart(0), Token::SeqEnd, ], - ([0; 0], [1], [2, 3]) => vec![ + ([0; 0], [1], [2, 3]) => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::SeqStart(Some(0)), @@ -415,7 +415,7 @@ declare_tests! { Token::SeqEnd, Token::SeqEnd, ], - ([0; 0], [1], [2, 3]) => vec![ + ([0; 0], [1], [2, 3]) => &[ Token::SeqArrayStart(3), Token::SeqSep, Token::SeqArrayStart(0), @@ -437,22 +437,22 @@ declare_tests! { Token::SeqEnd, Token::SeqEnd, ], - [0; 0] => vec![ + [0; 0] => &[ Token::UnitStruct("Anything"), ], - [0; 0] => vec![ + [0; 0] => &[ Token::TupleStructStart("Anything", Some(0)), Token::SeqEnd, ], } test_tuple { - (1,) => vec![ + (1,) => &[ Token::SeqStart(Some(1)), Token::SeqSep, Token::I32(1), Token::SeqEnd, ], - (1, 2, 3) => vec![ + (1, 2, 3) => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::I32(1), @@ -464,13 +464,13 @@ declare_tests! { Token::I32(3), Token::SeqEnd, ], - (1,) => vec![ + (1,) => &[ Token::TupleStart(1), Token::TupleSep, Token::I32(1), Token::TupleEnd, ], - (1, 2, 3) => vec![ + (1, 2, 3) => &[ Token::TupleStart(3), Token::TupleSep, Token::I32(1), @@ -484,21 +484,21 @@ declare_tests! { ], } test_btreemap { - BTreeMap::::new() => vec![ + BTreeMap::::new() => &[ Token::Unit, ], - BTreeMap::::new() => vec![ + BTreeMap::::new() => &[ Token::MapStart(Some(0)), Token::MapEnd, ], - btreemap![1 => 2] => vec![ + btreemap![1 => 2] => &[ Token::MapStart(Some(1)), Token::MapSep, Token::I32(1), Token::I32(2), Token::MapEnd, ], - btreemap![1 => 2, 3 => 4] => vec![ + btreemap![1 => 2, 3 => 4] => &[ Token::MapStart(Some(2)), Token::MapSep, Token::I32(1), @@ -509,7 +509,7 @@ declare_tests! { Token::I32(4), Token::MapEnd, ], - btreemap![1 => btreemap![], 2 => btreemap![3 => 4, 5 => 6]] => vec![ + btreemap![1 => btreemap![], 2 => btreemap![3 => 4, 5 => 6]] => &[ Token::MapStart(Some(2)), Token::MapSep, Token::I32(1), @@ -529,30 +529,30 @@ declare_tests! { Token::MapEnd, Token::MapEnd, ], - BTreeMap::::new() => vec![ + BTreeMap::::new() => &[ Token::UnitStruct("Anything"), ], - BTreeMap::::new() => vec![ + BTreeMap::::new() => &[ Token::StructStart("Anything", Some(0)), Token::MapEnd, ], } test_hashmap { - HashMap::::new() => vec![ + HashMap::::new() => &[ Token::Unit, ], - HashMap::::new() => vec![ + HashMap::::new() => &[ Token::MapStart(Some(0)), Token::MapEnd, ], - hashmap![1 => 2] => vec![ + hashmap![1 => 2] => &[ Token::MapStart(Some(1)), Token::MapSep, Token::I32(1), Token::I32(2), Token::MapEnd, ], - hashmap![1 => 2, 3 => 4] => vec![ + hashmap![1 => 2, 3 => 4] => &[ Token::MapStart(Some(2)), Token::MapSep, Token::I32(1), @@ -563,7 +563,7 @@ declare_tests! { Token::I32(4), Token::MapEnd, ], - hashmap![1 => hashmap![], 2 => hashmap![3 => 4, 5 => 6]] => vec![ + hashmap![1 => hashmap![], 2 => hashmap![3 => 4, 5 => 6]] => &[ Token::MapStart(Some(2)), Token::MapSep, Token::I32(1), @@ -583,14 +583,14 @@ declare_tests! { Token::MapEnd, Token::MapEnd, ], - HashMap::::new() => vec![ + HashMap::::new() => &[ Token::UnitStruct("Anything"), ], - HashMap::::new() => vec![ + HashMap::::new() => &[ Token::StructStart("Anything", Some(0)), Token::MapEnd, ], - hashmap![FnvHasher @ 1 => 2, 3 => 4] => vec![ + hashmap![FnvHasher @ 1 => 2, 3 => 4] => &[ Token::MapStart(Some(2)), Token::MapSep, Token::I32(1), @@ -603,7 +603,7 @@ declare_tests! { ], } test_struct { - Struct { a: 1, b: 2, c: 0 } => vec![ + Struct { a: 1, b: 2, c: 0 } => &[ Token::MapStart(Some(3)), Token::MapSep, Token::Str("a"), @@ -614,7 +614,7 @@ declare_tests! { Token::I32(2), Token::MapEnd, ], - Struct { a: 1, b: 2, c: 0 } => vec![ + Struct { a: 1, b: 2, c: 0 } => &[ Token::StructStart("Struct", Some(3)), Token::StructSep, Token::Str("a"), @@ -625,7 +625,7 @@ declare_tests! { Token::I32(2), Token::StructEnd, ], - Struct { a: 1, b: 2, c: 0 } => vec![ + Struct { a: 1, b: 2, c: 0 } => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::I32(1), @@ -636,7 +636,7 @@ declare_tests! { ], } test_struct_with_skip { - Struct { a: 1, b: 2, c: 0 } => vec![ + Struct { a: 1, b: 2, c: 0 } => &[ Token::MapStart(Some(3)), Token::MapSep, Token::Str("a"), @@ -655,7 +655,7 @@ declare_tests! { Token::I32(4), Token::MapEnd, ], - Struct { a: 1, b: 2, c: 0 } => vec![ + Struct { a: 1, b: 2, c: 0 } => &[ Token::StructStart("Struct", Some(3)), Token::StructSep, Token::Str("a"), @@ -676,18 +676,18 @@ declare_tests! { ], } test_enum_unit { - Enum::Unit => vec![ + Enum::Unit => &[ Token::EnumUnit("Enum", "Unit"), ], } test_enum_simple { - Enum::Simple(1) => vec![ + Enum::Simple(1) => &[ Token::EnumNewType("Enum", "Simple"), Token::I32(1), ], } test_enum_seq { - Enum::Seq(1, 2, 3) => vec![ + Enum::Seq(1, 2, 3) => &[ Token::EnumSeqStart("Enum", "Seq", Some(3)), Token::EnumSeqSep, Token::I32(1), @@ -701,7 +701,7 @@ declare_tests! { ], } test_enum_map { - Enum::Map { a: 1, b: 2, c: 3 } => vec![ + Enum::Map { a: 1, b: 2, c: 3 } => &[ Token::EnumMapStart("Enum", "Map", Some(3)), Token::EnumMapSep, Token::Str("a"), @@ -718,24 +718,24 @@ declare_tests! { ], } test_enum_unit_usize { - Enum::Unit => vec![ + Enum::Unit => &[ Token::EnumStart("Enum"), Token::Usize(0), Token::Unit, ], } test_enum_unit_bytes { - Enum::Unit => vec![ + Enum::Unit => &[ Token::EnumStart("Enum"), Token::Bytes(b"Unit"), Token::Unit, ], } test_box { - Box::new(0i32) => vec![Token::I32(0)], + Box::new(0i32) => &[Token::I32(0)], } test_boxed_slice { - Box::new([0, 1, 2]) => vec![ + Box::new([0, 1, 2]) => &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::I32(0), @@ -747,18 +747,18 @@ declare_tests! { ], } test_net_ipv4addr { - "1.2.3.4".parse::().unwrap() => vec![Token::Str("1.2.3.4")], + "1.2.3.4".parse::().unwrap() => &[Token::Str("1.2.3.4")], } test_net_ipv6addr { - "::1".parse::().unwrap() => vec![Token::Str("::1")], + "::1".parse::().unwrap() => &[Token::Str("::1")], } test_net_socketaddr { - "1.2.3.4:1234".parse::().unwrap() => vec![Token::Str("1.2.3.4:1234")], - "1.2.3.4:1234".parse::().unwrap() => vec![Token::Str("1.2.3.4:1234")], - "[::1]:1234".parse::().unwrap() => vec![Token::Str("[::1]:1234")], + "1.2.3.4:1234".parse::().unwrap() => &[Token::Str("1.2.3.4:1234")], + "1.2.3.4:1234".parse::().unwrap() => &[Token::Str("1.2.3.4:1234")], + "[::1]:1234".parse::().unwrap() => &[Token::Str("[::1]:1234")], } test_path_buf { - PathBuf::from("/usr/local/lib") => vec![ + PathBuf::from("/usr/local/lib") => &[ Token::String("/usr/local/lib".to_owned()), ], } @@ -769,19 +769,19 @@ declare_tests! { fn test_net_ipaddr() { assert_de_tokens( "1.2.3.4".parse::().unwrap(), - vec![Token::Str("1.2.3.4")], + &[Token::Str("1.2.3.4")], ); } declare_error_tests! { test_unknown_variant { - vec![ + &[ Token::EnumUnit("Enum", "Foo"), ], Error::UnknownVariant("Foo".to_owned()), } test_struct_seq_too_long { - vec![ + &[ Token::SeqStart(Some(4)), Token::SeqSep, Token::I32(1), Token::SeqSep, Token::I32(2), @@ -790,7 +790,7 @@ declare_error_tests! { Error::UnexpectedToken(Token::SeqSep), } test_duplicate_field_struct { - vec![ + &[ Token::MapStart(Some(3)), Token::MapSep, Token::Str("a"), @@ -802,7 +802,7 @@ declare_error_tests! { Error::DuplicateField("a"), } test_duplicate_field_enum { - vec![ + &[ Token::EnumMapStart("Enum", "Map", Some(3)), Token::EnumMapSep, Token::Str("a"), diff --git a/testing/tests/test_macros.rs b/testing/tests/test_macros.rs index 188244c2..ca4dffaa 100644 --- a/testing/tests/test_macros.rs +++ b/testing/tests/test_macros.rs @@ -162,7 +162,7 @@ struct DefaultTyParam = i32> { fn test_named_unit() { assert_tokens( &NamedUnit, - vec![Token::UnitStruct("NamedUnit")] + &[Token::UnitStruct("NamedUnit")] ); } @@ -193,7 +193,7 @@ fn test_ser_named_tuple() { fn test_de_named_tuple() { assert_de_tokens( &DeNamedTuple(5, 6, 7), - vec![ + &[ Token::SeqStart(Some(3)), Token::SeqSep, Token::I32(5), @@ -210,7 +210,7 @@ fn test_de_named_tuple() { assert_de_tokens( &DeNamedTuple(5, 6, 7), - vec![ + &[ Token::TupleStructStart("DeNamedTuple", Some(3)), Token::TupleStructSep, Token::I32(5), @@ -266,7 +266,7 @@ fn test_de_named_map() { b: 6, c: 7, }, - vec![ + &[ Token::StructStart("DeNamedMap", Some(3)), Token::StructSep, @@ -380,7 +380,7 @@ fn test_ser_enum_map() { fn test_de_enum_unit() { assert_tokens( &DeEnum::Unit::, - vec![ + &[ Token::EnumUnit("DeEnum", "Unit"), ], ); @@ -404,7 +404,7 @@ fn test_de_enum_seq() { e, //f, ), - vec![ + &[ Token::EnumSeqStart("DeEnum", "Seq", Some(4)), Token::EnumSeqSep, @@ -442,7 +442,7 @@ fn test_de_enum_map() { e: e, //f: f, }, - vec![ + &[ Token::EnumMapStart("DeEnum", "Map", Some(4)), Token::EnumMapSep, @@ -517,7 +517,7 @@ fn test_lifetimes() { fn test_generic_struct() { assert_tokens( &GenericStruct { x: 5u32 }, - vec![ + &[ Token::StructStart("GenericStruct", Some(1)), Token::StructSep, @@ -533,7 +533,7 @@ fn test_generic_struct() { fn test_generic_newtype_struct() { assert_tokens( &GenericNewTypeStruct(5u32), - vec![ + &[ Token::StructNewType("GenericNewTypeStruct"), Token::U32(5), ] @@ -544,7 +544,7 @@ fn test_generic_newtype_struct() { fn test_generic_tuple_struct() { assert_tokens( &GenericTupleStruct(5u32, 6u32), - vec![ + &[ Token::TupleStructStart("GenericTupleStruct", Some(2)), Token::TupleStructSep, @@ -562,7 +562,7 @@ fn test_generic_tuple_struct() { fn test_generic_enum_unit() { assert_tokens( &GenericEnum::Unit::, - vec![ + &[ Token::EnumUnit("GenericEnum", "Unit"), ] ); @@ -572,7 +572,7 @@ fn test_generic_enum_unit() { fn test_generic_enum_newtype() { assert_tokens( &GenericEnum::NewType::(5), - vec![ + &[ Token::EnumNewType("GenericEnum", "NewType"), Token::U32(5), ] @@ -583,7 +583,7 @@ fn test_generic_enum_newtype() { fn test_generic_enum_seq() { assert_tokens( &GenericEnum::Seq::(5, 6), - vec![ + &[ Token::EnumSeqStart("GenericEnum", "Seq", Some(2)), Token::EnumSeqSep, @@ -601,7 +601,7 @@ fn test_generic_enum_seq() { fn test_generic_enum_map() { assert_tokens( &GenericEnum::Map:: { x: 5, y: 6 }, - vec![ + &[ Token::EnumMapStart("GenericEnum", "Map", Some(2)), Token::EnumMapSep, @@ -621,7 +621,7 @@ fn test_generic_enum_map() { fn test_default_ty_param() { assert_tokens( &DefaultTyParam:: { phantom: PhantomData }, - vec![ + &[ Token::StructStart("DefaultTyParam", Some(1)), Token::StructSep,