Fix tests for 1.51

They used array `IntoIterator`.
This commit is contained in:
David Pedersen 2021-08-07 11:08:20 +02:00
parent 6a042a9b3a
commit 904227419c

View file

@ -579,7 +579,7 @@ mod tests {
($ty:ty, $value_str:literal, $value:expr) => { ($ty:ty, $value_str:literal, $value:expr) => {
#[allow(clippy::bool_assert_comparison)] #[allow(clippy::bool_assert_comparison)]
{ {
let url_params = create_url_params([("value", $value_str)]); let url_params = create_url_params(vec![("value", $value_str)]);
let deserializer = PathDeserializer::new(&url_params); let deserializer = PathDeserializer::new(&url_params);
assert_eq!(<$ty>::deserialize(deserializer).unwrap(), $value); assert_eq!(<$ty>::deserialize(deserializer).unwrap(), $value);
} }
@ -603,13 +603,13 @@ mod tests {
check_single_value!(String, "abc", "abc"); check_single_value!(String, "abc", "abc");
check_single_value!(char, "a", 'a'); check_single_value!(char, "a", 'a');
let url_params = create_url_params([("a", "B")]); let url_params = create_url_params(vec![("a", "B")]);
assert_eq!( assert_eq!(
MyEnum::deserialize(PathDeserializer::new(&url_params)).unwrap(), MyEnum::deserialize(PathDeserializer::new(&url_params)).unwrap(),
MyEnum::B MyEnum::B
); );
let url_params = create_url_params([("a", "1"), ("b", "2")]); let url_params = create_url_params(vec![("a", "1"), ("b", "2")]);
assert_eq!( assert_eq!(
i32::deserialize(PathDeserializer::new(&url_params)).unwrap_err(), i32::deserialize(PathDeserializer::new(&url_params)).unwrap_err(),
PathDeserializerError::custom("wrong number of parameters: 2 expected 1".to_string()) PathDeserializerError::custom("wrong number of parameters: 2 expected 1".to_string())
@ -618,7 +618,7 @@ mod tests {
#[test] #[test]
fn test_parse_seq() { fn test_parse_seq() {
let url_params = create_url_params([("a", "1"), ("b", "true"), ("c", "abc")]); let url_params = create_url_params(vec![("a", "1"), ("b", "true"), ("c", "abc")]);
assert_eq!( assert_eq!(
<(i32, bool, String)>::deserialize(PathDeserializer::new(&url_params)).unwrap(), <(i32, bool, String)>::deserialize(PathDeserializer::new(&url_params)).unwrap(),
(1, true, "abc".to_string()) (1, true, "abc".to_string())
@ -631,13 +631,13 @@ mod tests {
TupleStruct(1, true, "abc".to_string()) TupleStruct(1, true, "abc".to_string())
); );
let url_params = create_url_params([("a", "1"), ("b", "2"), ("c", "3")]); let url_params = create_url_params(vec![("a", "1"), ("b", "2"), ("c", "3")]);
assert_eq!( assert_eq!(
<Vec<i32>>::deserialize(PathDeserializer::new(&url_params)).unwrap(), <Vec<i32>>::deserialize(PathDeserializer::new(&url_params)).unwrap(),
vec![1, 2, 3] vec![1, 2, 3]
); );
let url_params = create_url_params([("a", "c"), ("a", "B")]); let url_params = create_url_params(vec![("a", "c"), ("a", "B")]);
assert_eq!( assert_eq!(
<Vec<MyEnum>>::deserialize(PathDeserializer::new(&url_params)).unwrap(), <Vec<MyEnum>>::deserialize(PathDeserializer::new(&url_params)).unwrap(),
vec![MyEnum::C, MyEnum::B] vec![MyEnum::C, MyEnum::B]
@ -646,7 +646,7 @@ mod tests {
#[test] #[test]
fn test_parse_struct() { fn test_parse_struct() {
let url_params = create_url_params([("a", "1"), ("b", "true"), ("c", "abc")]); let url_params = create_url_params(vec![("a", "1"), ("b", "true"), ("c", "abc")]);
assert_eq!( assert_eq!(
Struct::deserialize(PathDeserializer::new(&url_params)).unwrap(), Struct::deserialize(PathDeserializer::new(&url_params)).unwrap(),
Struct { Struct {
@ -659,7 +659,7 @@ mod tests {
#[test] #[test]
fn test_parse_map() { fn test_parse_map() {
let url_params = create_url_params([("a", "1"), ("b", "true"), ("c", "abc")]); let url_params = create_url_params(vec![("a", "1"), ("b", "true"), ("c", "abc")]);
assert_eq!( assert_eq!(
<HashMap<String, String>>::deserialize(PathDeserializer::new(&url_params)).unwrap(), <HashMap<String, String>>::deserialize(PathDeserializer::new(&url_params)).unwrap(),
[("a", "1"), ("b", "true"), ("c", "abc")] [("a", "1"), ("b", "true"), ("c", "abc")]