pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-17 22:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(codegen): Clean up error handling

Browse Source
This commit is contained in:
Erick Tryzelaar
2016-02-05 18:11:58 -08:00
parent 8c8fcdbc54
commit a926cb62f0
6 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/src/attr.rs
+37 -9
View File
@@ -9,6 +9,8 @@ use syntax::ptr::P;
use aster; use aster;
use error::Error;
/// Represents field name information /// Represents field name information
#[derive(Debug)] #[derive(Debug)]
pub enum FieldNames { pub enum FieldNames {
@@ -130,7 +132,7 @@ impl<'a> FieldAttrsBuilder<'a> {
} }
} }
pub fn field(mut self, field: &ast::StructField) -> Result<FieldAttrsBuilder<'a>, ()> { pub fn field(mut self, field: &ast::StructField) -> Result<FieldAttrsBuilder<'a>, Error> {
match field.node.kind { match field.node.kind {
ast::NamedField(name, _) => { ast::NamedField(name, _) => {
self.name = Some(self.builder.expr().str(name)); self.name = Some(self.builder.expr().str(name));
@@ -141,7 +143,7 @@ impl<'a> FieldAttrsBuilder<'a> {
self.attrs(&field.node.attrs) self.attrs(&field.node.attrs)
} }
pub fn attrs(mut self, attrs: &[ast::Attribute]) -> Result<FieldAttrsBuilder<'a>, ()> { pub fn attrs(mut self, attrs: &[ast::Attribute]) -> Result<FieldAttrsBuilder<'a>, Error> {
for attr in attrs { for attr in attrs {
self = try!(self.attr(attr)); self = try!(self.attr(attr));
} }
@@ -149,7 +151,7 @@ impl<'a> FieldAttrsBuilder<'a> {
Ok(self) Ok(self)
} }
pub fn attr(mut self, attr: &ast::Attribute) -> Result<FieldAttrsBuilder<'a>, ()> { pub fn attr(mut self, attr: &ast::Attribute) -> Result<FieldAttrsBuilder<'a>, Error> {
match attr.node.value.node { match attr.node.value.node {
ast::MetaList(ref name, ref items) if name == &"serde" => { ast::MetaList(ref name, ref items) if name == &"serde" => {
attr::mark_used(&attr); attr::mark_used(&attr);
@@ -165,7 +167,8 @@ impl<'a> FieldAttrsBuilder<'a> {
} }
} }
pub fn meta_item(mut self, meta_item: &P<ast::MetaItem>) -> Result<FieldAttrsBuilder<'a>, ()> { pub fn meta_item(mut self,
meta_item: &P<ast::MetaItem>) -> Result<FieldAttrsBuilder<'a>, Error> {
match meta_item.node { match meta_item.node {
ast::MetaNameValue(ref name, ref lit) if name == &"rename" => { ast::MetaNameValue(ref name, ref lit) if name == &"rename" => {
let expr = self.builder.expr().build_lit(P(lit.clone())); let expr = self.builder.expr().build_lit(P(lit.clone()));
@@ -204,7 +207,7 @@ impl<'a> FieldAttrsBuilder<'a> {
meta_item.span, meta_item.span,
&format!("unknown serde field attribute `{}`", &format!("unknown serde field attribute `{}`",
meta_item_to_string(meta_item))); meta_item_to_string(meta_item)));
Err(()) Err(Error)
} }
} }
} }
@@ -285,7 +288,7 @@ impl<'a> ContainerAttrsBuilder<'a> {
} }
} }
pub fn attrs(mut self, attrs: &[ast::Attribute]) -> Result<Self, ()> { pub fn attrs(mut self, attrs: &[ast::Attribute]) -> Result<Self, Error> {
for attr in attrs { for attr in attrs {
self = try!(self.attr(attr)); self = try!(self.attr(attr));
} }
@@ -293,7 +296,7 @@ impl<'a> ContainerAttrsBuilder<'a> {
Ok(self) Ok(self)
} }
pub fn attr(mut self, attr: &ast::Attribute) -> Result<Self, ()> { pub fn attr(mut self, attr: &ast::Attribute) -> Result<Self, Error> {
match attr.node.value.node { match attr.node.value.node {
ast::MetaList(ref name, ref items) if name == &"serde" => { ast::MetaList(ref name, ref items) if name == &"serde" => {
attr::mark_used(&attr); attr::mark_used(&attr);
@@ -309,7 +312,7 @@ impl<'a> ContainerAttrsBuilder<'a> {
} }
} }
pub fn meta_item(self, meta_item: &P<ast::MetaItem>) -> Result<Self, ()> { pub fn meta_item(self, meta_item: &P<ast::MetaItem>) -> Result<Self, Error> {
match meta_item.node { match meta_item.node {
ast::MetaWord(ref name) if name == &"deny_unknown_fields" => { ast::MetaWord(ref name) if name == &"deny_unknown_fields" => {
Ok(self.deny_unknown_fields()) Ok(self.deny_unknown_fields())
@@ -319,7 +322,7 @@ impl<'a> ContainerAttrsBuilder<'a> {
meta_item.span, meta_item.span,
&format!("unknown serde container attribute `{}`", &format!("unknown serde container attribute `{}`",
meta_item_to_string(meta_item))); meta_item_to_string(meta_item)));
Err(()) Err(Error)
} }
} }
} }
@@ -335,3 +338,28 @@ impl<'a> ContainerAttrsBuilder<'a> {
} }
} }
} }
/// Extract out the `#[serde(...)]` attributes from an item.
pub fn get_container_attrs(cx: &ExtCtxt,
container: &ast::Item,
) -> Result<ContainerAttrs, Error> {
let builder = ContainerAttrsBuilder::new(cx);
let builder = try!(builder.attrs(container.attrs()));
Ok(builder.build())
}
/// Extract out the `#[serde(...)]` attributes from a struct field.
pub fn get_struct_field_attrs(cx: &ExtCtxt,
builder: &aster::AstBuilder,
fields: &[ast::StructField]
) -> Result<Vec<FieldAttrs>, Error> {
let mut attrs = vec![];
for field in fields {
let builder = FieldAttrsBuilder::new(cx, builder);
let builder = try!(builder.field(field));
let attr = builder.build();
attrs.push(attr);
}
Ok(attrs)
}
serde_codegen/src/de.rs
+20 -19
View File
@@ -15,7 +15,8 @@ use syntax::ext::build::AstBuilder;
use syntax::ptr::P; use syntax::ptr::P;
use attr::{self, ContainerAttrs}; use attr::{self, ContainerAttrs};
use field;
use error::Error;
pub fn expand_derive_deserialize( pub fn expand_derive_deserialize(
cx: &mut ExtCtxt, cx: &mut ExtCtxt,
@@ -59,7 +60,7 @@ pub fn expand_derive_deserialize(
let body = match deserialize_body(cx, &builder, &item, &impl_generics, ty.clone()) { let body = match deserialize_body(cx, &builder, &item, &impl_generics, ty.clone()) {
Ok(body) => body, Ok(body) => body,
Err(()) => { Err(Error) => {
// An error occured, but it should have been reported already. // An error occured, but it should have been reported already.
return; return;
} }
@@ -86,8 +87,8 @@ fn deserialize_body(
item: &Item, item: &Item,
impl_generics: &ast::Generics, impl_generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let container_attrs = try!(field::container_attrs(cx, item)); let container_attrs = try!(attr::get_container_attrs(cx, item));
match item.node { match item.node {
ast::ItemStruct(ref variant_data, _) => { ast::ItemStruct(ref variant_data, _) => {
@@ -129,7 +130,7 @@ fn deserialize_item_struct(
span: Span, span: Span,
variant_data: &ast::VariantData, variant_data: &ast::VariantData,
container_attrs: &ContainerAttrs, container_attrs: &ContainerAttrs,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
match *variant_data { match *variant_data {
ast::VariantData::Unit(_) => { ast::VariantData::Unit(_) => {
deserialize_unit_struct( deserialize_unit_struct(
@@ -186,7 +187,7 @@ fn deserialize_visitor(
trait_generics: &ast::Generics, trait_generics: &ast::Generics,
forward_ty_params: Vec<ast::TyParam>, forward_ty_params: Vec<ast::TyParam>,
forward_tys: Vec<P<ast::Ty>> forward_tys: Vec<P<ast::Ty>>
) -> Result<(P<ast::Item>, P<ast::Ty>, P<ast::Expr>, ast::Generics), ()> { ) -> Result<(P<ast::Item>, P<ast::Ty>, P<ast::Expr>, ast::Generics), Error> {
if trait_generics.ty_params.is_empty() && forward_tys.is_empty() { if trait_generics.ty_params.is_empty() && forward_tys.is_empty() {
Ok(( Ok((
builder.item().tuple_struct("__Visitor").build(), builder.item().tuple_struct("__Visitor").build(),
@@ -265,7 +266,7 @@ fn deserialize_unit_struct(
cx: &ExtCtxt, cx: &ExtCtxt,
builder: &aster::AstBuilder, builder: &aster::AstBuilder,
type_ident: Ident, type_ident: Ident,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let type_name = builder.expr().str(type_ident); let type_name = builder.expr().str(type_ident);
Ok(quote_expr!(cx, { Ok(quote_expr!(cx, {
@@ -300,7 +301,7 @@ fn deserialize_newtype_struct(
type_ident: Ident, type_ident: Ident,
impl_generics: &ast::Generics, impl_generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let where_clause = &impl_generics.where_clause; let where_clause = &impl_generics.where_clause;
let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = try!(deserialize_visitor( let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = try!(deserialize_visitor(
@@ -352,7 +353,7 @@ fn deserialize_tuple_struct(
impl_generics: &ast::Generics, impl_generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
fields: usize, fields: usize,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let where_clause = &impl_generics.where_clause; let where_clause = &impl_generics.where_clause;
let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = try!(deserialize_visitor( let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = try!(deserialize_visitor(
@@ -428,7 +429,7 @@ fn deserialize_struct_as_seq(
builder: &aster::AstBuilder, builder: &aster::AstBuilder,
struct_path: ast::Path, struct_path: ast::Path,
fields: &[ast::StructField], fields: &[ast::StructField],
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let let_values: Vec<P<ast::Stmt>> = (0 .. fields.len()) let let_values: Vec<P<ast::Stmt>> = (0 .. fields.len())
.map(|i| { .map(|i| {
let name = builder.id(format!("__field{}", i)); let name = builder.id(format!("__field{}", i));
@@ -478,7 +479,7 @@ fn deserialize_struct(
ty: P<ast::Ty>, ty: P<ast::Ty>,
fields: &[ast::StructField], fields: &[ast::StructField],
container_attrs: &ContainerAttrs, container_attrs: &ContainerAttrs,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let where_clause = &impl_generics.where_clause; let where_clause = &impl_generics.where_clause;
let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = try!(deserialize_visitor( let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = try!(deserialize_visitor(
@@ -544,7 +545,7 @@ fn deserialize_item_enum(
ty: P<ast::Ty>, ty: P<ast::Ty>,
enum_def: &EnumDef, enum_def: &EnumDef,
container_attrs: &ContainerAttrs container_attrs: &ContainerAttrs
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let where_clause = &impl_generics.where_clause; let where_clause = &impl_generics.where_clause;
let type_name = builder.expr().str(type_ident); let type_name = builder.expr().str(type_ident);
@@ -642,7 +643,7 @@ fn deserialize_variant(
ty: P<ast::Ty>, ty: P<ast::Ty>,
variant: &ast::Variant, variant: &ast::Variant,
container_attrs: &ContainerAttrs, container_attrs: &ContainerAttrs,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let variant_ident = variant.node.name; let variant_ident = variant.node.name;
match variant.node.data { match variant.node.data {
@@ -692,7 +693,7 @@ fn deserialize_tuple_variant(
generics: &ast::Generics, generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
fields: usize, fields: usize,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let where_clause = &generics.where_clause; let where_clause = &generics.where_clause;
let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = try!(deserialize_visitor( let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = try!(deserialize_visitor(
@@ -735,7 +736,7 @@ fn deserialize_struct_variant(
ty: P<ast::Ty>, ty: P<ast::Ty>,
fields: &[ast::StructField], fields: &[ast::StructField],
container_attrs: &ContainerAttrs, container_attrs: &ContainerAttrs,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let where_clause = &generics.where_clause; let where_clause = &generics.where_clause;
let type_path = builder.path() let type_path = builder.path()
@@ -963,11 +964,11 @@ fn deserialize_struct_visitor(
struct_path: ast::Path, struct_path: ast::Path,
fields: &[ast::StructField], fields: &[ast::StructField],
container_attrs: &ContainerAttrs, container_attrs: &ContainerAttrs,
) -> Result<(Vec<P<ast::Item>>, P<ast::Stmt>, P<ast::Expr>), ()> { ) -> Result<(Vec<P<ast::Item>>, P<ast::Stmt>, P<ast::Expr>), Error> {
let field_visitor = deserialize_field_visitor( let field_visitor = deserialize_field_visitor(
cx, cx,
builder, builder,
try!(field::struct_field_attrs(cx, builder, fields)), try!(attr::get_struct_field_attrs(cx, builder, fields)),
container_attrs container_attrs
); );
@@ -1006,7 +1007,7 @@ fn deserialize_map(
struct_path: ast::Path, struct_path: ast::Path,
fields: &[ast::StructField], fields: &[ast::StructField],
container_attrs: &ContainerAttrs, container_attrs: &ContainerAttrs,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
// Create the field names for the fields. // Create the field names for the fields.
let field_names: Vec<ast::Ident> = (0 .. fields.len()) let field_names: Vec<ast::Ident> = (0 .. fields.len())
.map(|i| builder.id(format!("__field{}", i))) .map(|i| builder.id(format!("__field{}", i)))
@@ -1039,7 +1040,7 @@ fn deserialize_map(
.chain(ignored_arm.into_iter()) .chain(ignored_arm.into_iter())
.collect(); .collect();
let field_attrs = try!(field::struct_field_attrs(cx, builder, fields)); let field_attrs = try!(attr::get_struct_field_attrs(cx, builder, fields));
let extract_values: Vec<P<ast::Stmt>> = field_names.iter() let extract_values: Vec<P<ast::Stmt>> = field_names.iter()
.zip(field_attrs.iter()) .zip(field_attrs.iter())
serde_codegen/src/error.rs
+2
View File
@@ -0,0 +1,2 @@
/// Error returned if failed to parse attribute.
pub struct Error;
serde_codegen/src/field.rs
-30
View File
@@ -1,30 +0,0 @@
use syntax::ast;
use syntax::ext::base::ExtCtxt;
use aster;
use attr;
pub fn struct_field_attrs(
cx: &ExtCtxt,
builder: &aster::AstBuilder,
fields: &[ast::StructField],
) -> Result<Vec<attr::FieldAttrs>, ()> {
let mut attrs = vec![];
for field in fields {
let builder = attr::FieldAttrsBuilder::new(cx, builder);
let builder = try!(builder.field(field));
let attr = builder.build();
attrs.push(attr);
}
Ok(attrs)
}
pub fn container_attrs(
cx: &ExtCtxt,
container: &ast::Item,
) -> Result<attr::ContainerAttrs, ()> {
let builder = attr::ContainerAttrsBuilder::new(cx);
let builder = try!(builder.attrs(container.attrs()));
Ok(builder.build())
}
serde_codegen/src/lib.rs.in
+1 -1
View File
@@ -1,4 +1,4 @@
mod attr; mod attr;
mod de; mod de;
mod field; mod error;
mod ser; mod ser;
serde_codegen/src/ser.rs
+15 -14
View File
@@ -11,7 +11,8 @@ use syntax::ext::base::{Annotatable, ExtCtxt};
use syntax::ext::build::AstBuilder; use syntax::ext::build::AstBuilder;
use syntax::ptr::P; use syntax::ptr::P;
use field; use attr;
use error::Error;
pub fn expand_derive_serialize( pub fn expand_derive_serialize(
cx: &mut ExtCtxt, cx: &mut ExtCtxt,
@@ -55,7 +56,7 @@ pub fn expand_derive_serialize(
let body = match serialize_body(cx, &builder, &item, &impl_generics, ty.clone()) { let body = match serialize_body(cx, &builder, &item, &impl_generics, ty.clone()) {
Ok(body) => body, Ok(body) => body,
Err(()) => { Err(Error) => {
// An error occured, but it should have been reported already. // An error occured, but it should have been reported already.
return; return;
} }
@@ -82,10 +83,10 @@ fn serialize_body(
item: &Item, item: &Item,
impl_generics: &ast::Generics, impl_generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
// Note: While we don't have any container attributes, we still want to try to // Note: While we don't have any container attributes, we still want to try to
// parse them so we can report a proper error if we get passed an unknown attribute. // parse them so we can report a proper error if we get passed an unknown attribute.
let _ = try!(field::container_attrs(cx, item)); let _ = try!(attr::get_container_attrs(cx, item));
match item.node { match item.node {
ast::ItemStruct(ref variant_data, _) => { ast::ItemStruct(ref variant_data, _) => {
@@ -124,7 +125,7 @@ fn serialize_item_struct(
ty: P<ast::Ty>, ty: P<ast::Ty>,
span: Span, span: Span,
variant_data: &ast::VariantData, variant_data: &ast::VariantData,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
match *variant_data { match *variant_data {
ast::VariantData::Unit(_) => { ast::VariantData::Unit(_) => {
serialize_unit_struct( serialize_unit_struct(
@@ -175,7 +176,7 @@ fn serialize_unit_struct(
cx: &ExtCtxt, cx: &ExtCtxt,
builder: &aster::AstBuilder, builder: &aster::AstBuilder,
type_ident: Ident type_ident: Ident
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let type_name = builder.expr().str(type_ident); let type_name = builder.expr().str(type_ident);
Ok(quote_expr!(cx, Ok(quote_expr!(cx,
@@ -187,7 +188,7 @@ fn serialize_newtype_struct(
cx: &ExtCtxt, cx: &ExtCtxt,
builder: &aster::AstBuilder, builder: &aster::AstBuilder,
type_ident: Ident type_ident: Ident
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let type_name = builder.expr().str(type_ident); let type_name = builder.expr().str(type_ident);
Ok(quote_expr!(cx, Ok(quote_expr!(cx,
@@ -202,7 +203,7 @@ fn serialize_tuple_struct(
impl_generics: &ast::Generics, impl_generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
fields: usize, fields: usize,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let (visitor_struct, visitor_impl) = serialize_tuple_struct_visitor( let (visitor_struct, visitor_impl) = serialize_tuple_struct_visitor(
cx, cx,
builder, builder,
@@ -235,7 +236,7 @@ fn serialize_struct(
impl_generics: &ast::Generics, impl_generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
fields: &[ast::StructField], fields: &[ast::StructField],
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let value_exprs = fields.iter().map(|field| { let value_exprs = fields.iter().map(|field| {
let name = field.node.ident().expect("struct has unnamed field"); let name = field.node.ident().expect("struct has unnamed field");
quote_expr!(cx, &self.value.$name) quote_expr!(cx, &self.value.$name)
@@ -274,7 +275,7 @@ fn serialize_item_enum(
impl_generics: &ast::Generics, impl_generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
enum_def: &ast::EnumDef, enum_def: &ast::EnumDef,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let mut arms = vec![]; let mut arms = vec![];
for (variant_index, variant) in enum_def.variants.iter().enumerate() { for (variant_index, variant) in enum_def.variants.iter().enumerate() {
@@ -306,7 +307,7 @@ fn serialize_variant(
ty: P<ast::Ty>, ty: P<ast::Ty>,
variant: &ast::Variant, variant: &ast::Variant,
variant_index: usize, variant_index: usize,
) -> Result<ast::Arm, ()> { ) -> Result<ast::Arm, Error> {
let type_name = builder.expr().str(type_ident); let type_name = builder.expr().str(type_ident);
let variant_ident = variant.node.name; let variant_ident = variant.node.name;
let variant_name = builder.expr().str(variant_ident); let variant_name = builder.expr().str(variant_ident);
@@ -479,7 +480,7 @@ fn serialize_struct_variant(
structure_ty: P<ast::Ty>, structure_ty: P<ast::Ty>,
fields: &[ast::StructField], fields: &[ast::StructField],
field_names: Vec<Ident>, field_names: Vec<Ident>,
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, Error> {
let value_ty = builder.ty().tuple() let value_ty = builder.ty().tuple()
.with_tys( .with_tys(
fields.iter().map(|field| { fields.iter().map(|field| {
@@ -599,12 +600,12 @@ fn serialize_struct_visitor<I>(
fields: &[ast::StructField], fields: &[ast::StructField],
generics: &ast::Generics, generics: &ast::Generics,
value_exprs: I, value_exprs: I,
) -> Result<(P<ast::Item>, P<ast::Item>), ()> ) -> Result<(P<ast::Item>, P<ast::Item>), Error>
where I: Iterator<Item=P<ast::Expr>>, where I: Iterator<Item=P<ast::Expr>>,
{ {
let value_exprs = value_exprs.collect::<Vec<_>>(); let value_exprs = value_exprs.collect::<Vec<_>>();
let field_attrs = try!(field::struct_field_attrs(cx, builder, fields)); let field_attrs = try!(attr::get_struct_field_attrs(cx, builder, fields));
let arms: Vec<ast::Arm> = field_attrs.iter() let arms: Vec<ast::Arm> = field_attrs.iter()
.zip(value_exprs.iter()) .zip(value_exprs.iter())