mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update commas and blocks in match arms

Browse Source
This commit is contained in:
Hugo Duncan 2015-05-14 17:28:44 -04:00
parent ec483fc07d
commit bdec0b3e63
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
serde_macros/src/attr.rs
View File

@ -75,8 +75,8 @@ impl FieldAttrs {
quote_expr!(cx,
{
match S::format() {
$arms,
_ => $default
$arms
_ => { $default }
}
})
},

20
serde_macros/src/de.rs
View File

@ -309,7 +309,7 @@ fn deserialize_seq(
let name = builder.id(format!("__field{}", i));
quote_stmt!(cx,
let $name = match try!(visitor.visit()) {
Some(value) => value,
Some(value) => { value },
None => {
return Err(::serde::de::Error::end_of_stream_error());
}
@ -622,8 +622,8 @@ fn deserialize_field_visitor(
// No formats specific attributes, so no match on format required
quote_expr!(cx,
match value {
$default_field_arms,
_ => Err(::serde::de::Error::unknown_field_error(value)),
$default_field_arms
_ => { Err(::serde::de::Error::unknown_field_error(value)) }
})
} else {
let field_arms : Vec<_> = formats.iter()
@ -643,7 +643,7 @@ fn deserialize_field_visitor(
.map(|(ref fmt, ref arms)| {
quote_arm!(cx, $fmt => {
match value {
$arms,
$arms
_ => {
Err(::serde::de::Error::unknown_field_error(value))
}
@ -653,10 +653,10 @@ fn deserialize_field_visitor(
quote_expr!(cx,
match __D::format() {
$fmt_matches,
$fmt_matches
_ => match value {
$default_field_arms,
_ => Err(::serde::de::Error::unknown_field_error(value)),
$default_field_arms
_ => { Err(::serde::de::Error::unknown_field_error(value)) }
}
})
};
@ -766,8 +766,8 @@ fn deserialize_map(
cx,
try!(visitor.missing_field(
match __D::format() {
$arms,
_ => $default
$arms
_ => { $default }
})))
}
};
@ -775,7 +775,7 @@ fn deserialize_map(
quote_stmt!(cx,
let $field_name = match $field_name {
Some($field_name) => $field_name,
None => $missing_expr,
None => $missing_expr
};
).unwrap()
})

8
serde_macros/src/ser.rs
View File

@ -276,7 +276,7 @@ fn serialize_variant(
$type_name,
$variant_name,
)
},
}
)
}
ast::TupleVariantKind(ref args) => {
@ -488,11 +488,11 @@ fn serialize_tuple_struct_visitor(
$where_clause {
#[inline]
fn visit<S>(&mut self, serializer: &mut S) -> ::std::result::Result<Option<()>, S::Error>
where S: ::serde::ser::Serializer,
where S: ::serde::ser::Serializer
{
match self.state {
$arms
_ => Ok(None),
_ => Ok(None)
}
}
@ -572,7 +572,7 @@ fn serialize_struct_visitor<I>(
{
match self.state {
$arms
_ => Ok(None),
_ => Ok(None)
}
}