pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-12 20:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Erick Tryzelaar
2015-03-13 23:43:21 -07:00
parent f699d29fb3
commit c917941ec3
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_macros/src/lib.rs
+11 -11
View File
@@ -660,6 +660,10 @@ fn deserialize_struct(
trait_generics: &ast::Generics, trait_generics: &ast::Generics,
impl_generics: &ast::Generics, impl_generics: &ast::Generics,
) -> P<ast::Expr> { ) -> P<ast::Expr> {
let visitor_ty = builder.ty().path()
.segment("__Visitor").with_generics(trait_generics.clone()).build()
.build();
match *fields { match *fields {
Unnamed(ref fields) => { Unnamed(ref fields) => {
if fields.is_empty() { if fields.is_empty() {
@@ -680,7 +684,7 @@ fn deserialize_struct(
&fields, &fields,
state, state,
trait_generics, trait_generics,
impl_generics, visitor_ty,
) )
} }
} }
@@ -696,7 +700,7 @@ fn deserialize_struct(
state, state,
struct_def, struct_def,
trait_generics, trait_generics,
impl_generics, visitor_ty,
) )
} }
} }
@@ -760,7 +764,7 @@ fn deserialize_struct_unnamed_fields(
fields: &[Span], fields: &[Span],
state: P<ast::Expr>, state: P<ast::Expr>,
trait_generics: &ast::Generics, trait_generics: &ast::Generics,
type_generics: &ast::Generics, visitor_ty: P<ast::Ty>,
) -> P<ast::Expr> { ) -> P<ast::Expr> {
let where_clause = &trait_generics.where_clause; let where_clause = &trait_generics.where_clause;
@@ -784,13 +788,13 @@ fn deserialize_struct_unnamed_fields(
let struct_name = builder.expr().str(struct_ident); let struct_name = builder.expr().str(struct_ident);
let value_ty = builder.ty().path() let value_ty = builder.ty().path()
.segment(type_ident).with_generics(type_generics.clone()).build() .segment(type_ident).with_generics(trait_generics.clone()).build()
.build(); .build();
quote_expr!(cx, { quote_expr!(cx, {
$visitor_struct $visitor_struct
impl $trait_generics ::serde::de::Visitor for __Visitor $type_generics $where_clause { impl $trait_generics ::serde::de::Visitor for $visitor_ty $where_clause {
type Value = $value_ty; type Value = $value_ty;
fn visit_seq<__V>(&mut self, mut visitor: __V) -> Result<$value_ty, __V::Error> fn visit_seq<__V>(&mut self, mut visitor: __V) -> Result<$value_ty, __V::Error>
@@ -860,7 +864,7 @@ fn deserialize_struct_named_fields(
state: P<ast::Expr>, state: P<ast::Expr>,
struct_def: &StructDef, struct_def: &StructDef,
trait_generics: &ast::Generics, trait_generics: &ast::Generics,
type_generics: &ast::Generics, visitor_ty: P<ast::Ty>,
) -> P<ast::Expr> { ) -> P<ast::Expr> {
let where_clause = &trait_generics.where_clause; let where_clause = &trait_generics.where_clause;
@@ -898,10 +902,6 @@ fn deserialize_struct_named_fields(
let struct_name = builder.expr().str(struct_ident); let struct_name = builder.expr().str(struct_ident);
let visitor_ty = builder.ty().path()
.segment("__Visitor").with_generics(trait_generics.clone()).build()
.build();
let value_ty = builder.ty().path() let value_ty = builder.ty().path()
.segment(type_ident).with_generics(trait_generics.clone()).build() .segment(type_ident).with_generics(trait_generics.clone()).build()
.build(); .build();
@@ -929,7 +929,7 @@ fn deserialize_struct_named_fields(
$visitor_struct; $visitor_struct;
impl $trait_generics ::serde::de::Visitor for __Visitor $type_generics $where_clause { impl $trait_generics ::serde::de::Visitor for $visitor_ty $where_clause {
type Value = $value_ty; type Value = $value_ty;
#[inline] #[inline]