pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-28 07:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup code, fix some incompatibilites with rust head

Browse Source
This commit is contained in:
Erick Tryzelaar
2015-02-13 09:40:47 -08:00
parent 5bce95f3e7
commit b70d77b5c9
3 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_macros/src/lib.rs
+9 -9
View File
@@ -1,7 +1,7 @@
#![crate_name = "serde_macros"]
#![crate_type = "dylib"]
#![feature(plugin_registrar, quote, unboxed_closures, rustc_private)]
#![feature(core, plugin_registrar, quote, unboxed_closures, rustc_private)]
extern crate syntax;
extern crate rustc;
@@ -143,7 +143,7 @@ fn serialize_substructure(cx: &ExtCtxt,
let name = match (serial_name, name) {
(Some(serial), _) => serial.clone(),
(None, Some(id)) => token::get_ident(id),
(None, None) => token::intern_and_get_ident(&format!("_field{}", i)),
(None, None) => token::intern_and_get_ident(&format!("_field{}", i)[]),
};
let name = cx.expr_str(span, name);
@@ -261,7 +261,7 @@ fn deserialize_substructure(cx: &mut ExtCtxt,
cx,
span,
substr.type_ident,
&definition.fields,
&definition.fields[],
fields,
deserializer.clone(),
token)
@@ -271,8 +271,8 @@ fn deserialize_substructure(cx: &mut ExtCtxt,
cx,
span,
substr.type_ident,
&definition.variants,
&fields,
&definition.variants[],
&fields[],
deserializer,
token)
}
@@ -300,7 +300,7 @@ fn deserialize_struct(
let field_idents: Vec<ast::Ident> = fields.iter()
.enumerate()
.map(|(idx, _)| {
cx.ident_of(&format!("field{}", idx))
cx.ident_of(&format!("field{}", idx)[])
})
.collect();
@@ -415,7 +415,7 @@ fn deserialize_enum(
cx,
span,
path,
&serial_names,
&serial_names[],
parts,
|&: cx, _, _| {
quote_expr!(cx, try!($deserializer.expect_enum_elt()))
@@ -461,7 +461,7 @@ fn deserialize_static_fields<F>(
getarg(
cx,
span,
token::intern_and_get_ident(&format!("_field{}", i))
token::intern_and_get_ident(&format!("_field{}", i)[])
)
}).collect();
@@ -488,7 +488,7 @@ fn deserialize_static_fields<F>(
}
}
fn find_serial_name<'a, I>(iterator: I) -> Option<token::InternedString> where
fn find_serial_name<'a, I>(mut iterator: I) -> Option<token::InternedString> where
I: Iterator<Item=&'a Attribute>
{
for at in iterator {