mirror of
https://github.com/pezkuwichain/serde.git
synced 2026-06-09 20:11:01 +00:00
Minor cleanup
This commit is contained in:
@@ -613,7 +613,10 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
|
|||||||
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
|
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
|
||||||
match *self {
|
match *self {
|
||||||
Result::Ok(ref field0) => {
|
Result::Ok(ref field0) => {
|
||||||
struct Visitor<'a, T, E> where T: Serialize + 'a, E: Serialize + 'a {
|
struct Visitor<'a, T, E>
|
||||||
|
where T: Serialize + 'a,
|
||||||
|
E: Serialize + 'a
|
||||||
|
{
|
||||||
state: usize,
|
state: usize,
|
||||||
value: (&'a T,),
|
value: (&'a T,),
|
||||||
_structure_ty: PhantomData<&'a Result<T, E>>,
|
_structure_ty: PhantomData<&'a Result<T, E>>,
|
||||||
@@ -653,7 +656,10 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
|
|||||||
serializer.visit_enum_seq("Result", 0, "Ok", visitor)
|
serializer.visit_enum_seq("Result", 0, "Ok", visitor)
|
||||||
}
|
}
|
||||||
Result::Err(ref field0) => {
|
Result::Err(ref field0) => {
|
||||||
struct Visitor<'a, T, E> where T: Serialize + 'a, E: Serialize + 'a {
|
struct Visitor<'a, T, E>
|
||||||
|
where T: Serialize + 'a,
|
||||||
|
E: Serialize + 'a
|
||||||
|
{
|
||||||
state: usize,
|
state: usize,
|
||||||
value: (&'a E,),
|
value: (&'a E,),
|
||||||
_structure_ty: PhantomData<&'a Result<T, E>>,
|
_structure_ty: PhantomData<&'a Result<T, E>>,
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ pub struct FieldAttrs {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl FieldAttrs {
|
impl FieldAttrs {
|
||||||
|
|
||||||
/// Create a FieldAttr with a single default field name
|
/// Create a FieldAttr with a single default field name
|
||||||
pub fn new(default_value: bool, name: P<ast::Expr>) -> FieldAttrs {
|
pub fn new(default_value: bool, name: P<ast::Expr>) -> FieldAttrs {
|
||||||
FieldAttrs {
|
FieldAttrs {
|
||||||
@@ -35,7 +34,7 @@ impl FieldAttrs {
|
|||||||
default_value: bool,
|
default_value: bool,
|
||||||
default_name: P<ast::Expr>,
|
default_name: P<ast::Expr>,
|
||||||
formats: HashMap<P<ast::Expr>, P<ast::Expr>>,
|
formats: HashMap<P<ast::Expr>, P<ast::Expr>>,
|
||||||
) -> FieldAttrs {
|
) -> FieldAttrs {
|
||||||
FieldAttrs {
|
FieldAttrs {
|
||||||
names: FieldNames::Format {
|
names: FieldNames::Format {
|
||||||
formats: formats,
|
formats: formats,
|
||||||
|
|||||||
@@ -89,7 +89,11 @@ impl<'a> Serializer for AssertSerializer<'a> {
|
|||||||
name: &str,
|
name: &str,
|
||||||
_variant_index: usize,
|
_variant_index: usize,
|
||||||
variant: &str) -> Result<(), ()> {
|
variant: &str) -> Result<(), ()> {
|
||||||
assert_eq!(self.iter.next().unwrap(), Token::EnumUnit(name, variant));
|
assert_eq!(
|
||||||
|
self.iter.next().unwrap(),
|
||||||
|
Token::EnumUnit(name, variant)
|
||||||
|
);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,7 +200,10 @@ impl<'a> Serializer for AssertSerializer<'a> {
|
|||||||
{
|
{
|
||||||
let len = visitor.len();
|
let len = visitor.len();
|
||||||
|
|
||||||
assert_eq!(self.iter.next().unwrap(), Token::TupleStructStart(name, len));
|
assert_eq!(
|
||||||
|
self.iter.next().unwrap(),
|
||||||
|
Token::TupleStructStart(name, len)
|
||||||
|
);
|
||||||
|
|
||||||
self.visit_sequence(visitor)
|
self.visit_sequence(visitor)
|
||||||
}
|
}
|
||||||
@@ -210,7 +217,10 @@ impl<'a> Serializer for AssertSerializer<'a> {
|
|||||||
{
|
{
|
||||||
let len = visitor.len();
|
let len = visitor.len();
|
||||||
|
|
||||||
assert_eq!(self.iter.next().unwrap(), Token::EnumSeqStart(name, variant, len));
|
assert_eq!(
|
||||||
|
self.iter.next().unwrap(),
|
||||||
|
Token::EnumSeqStart(name, variant, len)
|
||||||
|
);
|
||||||
|
|
||||||
self.visit_sequence(visitor)
|
self.visit_sequence(visitor)
|
||||||
}
|
}
|
||||||
@@ -237,7 +247,10 @@ impl<'a> Serializer for AssertSerializer<'a> {
|
|||||||
{
|
{
|
||||||
let len = visitor.len();
|
let len = visitor.len();
|
||||||
|
|
||||||
assert_eq!(self.iter.next().unwrap(), Token::StructStart(name, len));
|
assert_eq!(
|
||||||
|
self.iter.next().unwrap(),
|
||||||
|
Token::StructStart(name, len)
|
||||||
|
);
|
||||||
|
|
||||||
self.visit_mapping(visitor)
|
self.visit_mapping(visitor)
|
||||||
}
|
}
|
||||||
@@ -251,7 +264,10 @@ impl<'a> Serializer for AssertSerializer<'a> {
|
|||||||
{
|
{
|
||||||
let len = visitor.len();
|
let len = visitor.len();
|
||||||
|
|
||||||
assert_eq!(self.iter.next().unwrap(), Token::EnumMapStart(name, variant, len));
|
assert_eq!(
|
||||||
|
self.iter.next().unwrap(),
|
||||||
|
Token::EnumMapStart(name, variant, len)
|
||||||
|
);
|
||||||
|
|
||||||
self.visit_mapping(visitor)
|
self.visit_mapping(visitor)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user