adjust tests for new interface

This commit is contained in:
Oliver Schneider
2016-07-15 12:59:30 +02:00
parent 984181c558
commit 42c41922ce
4 changed files with 189 additions and 50 deletions
+11 -19
View File
@@ -230,9 +230,9 @@ fn serialize_tuple_struct(
let len = serialize_stmts.len();
quote_expr!(cx, {
let state = try!(_serializer.serialize_tuple_struct($type_name, $len));
let mut state = try!(_serializer.serialize_tuple_struct($type_name, $len));
$serialize_stmts
_serializer.serialize_tuple_struct_end($type_name, $len, state)
_serializer.serialize_tuple_struct_end(state)
})
}
@@ -269,10 +269,9 @@ fn serialize_struct(
.fold(quote_expr!(cx, 0), |sum, expr| quote_expr!(cx, $sum + $expr));
quote_expr!(cx, {
let len = $len;
let state = try!(_serializer.serialize_struct($type_name, len));
let mut state = try!(_serializer.serialize_struct($type_name, $len));
$serialize_fields
_serializer.serialize_struct_end($type_name, len, state)
_serializer.serialize_struct_end(state)
})
}
@@ -464,9 +463,9 @@ fn serialize_tuple_variant(
let len = serialize_stmts.len();
quote_expr!(cx, {
let state = try!(_serializer.serialize_tuple_variant($type_name, $variant_index, $variant_name, $len));
let mut state = try!(_serializer.serialize_tuple_variant($type_name, $variant_index, $variant_name, $len));
$serialize_stmts
_serializer.serialize_tuple_variant_end($type_name, $variant_index, $variant_name, $len, state)
_serializer.serialize_tuple_variant_end(state)
})
}
@@ -506,21 +505,14 @@ fn serialize_struct_variant(
.fold(quote_expr!(cx, 0), |sum, expr| quote_expr!(cx, $sum + $expr));
quote_expr!(cx, {
let len = $len;
let state = try!(_serializer.serialize_struct_variant(
let mut state = try!(_serializer.serialize_struct_variant(
$item_name,
$variant_index,
$variant_name,
len,
$len,
));
$serialize_fields
_serializer.serialize_struct_variant_end(
$item_name,
$variant_index,
$variant_name,
len,
state,
)
_serializer.serialize_struct_variant_end(state)
})
}
@@ -553,7 +545,7 @@ fn serialize_tuple_struct_visitor(
quote_stmt!(cx,
if !$skip {
try!(_serializer.$func($field_expr));
try!(_serializer.$func(&mut state, $field_expr));
}
).unwrap()
})
@@ -592,7 +584,7 @@ fn serialize_struct_visitor(
quote_stmt!(cx,
if !$skip {
try!(_serializer.$func($key_expr, $field_expr));
try!(_serializer.$func(&mut state, $key_expr, $field_expr));
}
).unwrap()
})