rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

libsyntax: make enum variants take refs

Browse Source
This commit is contained in:
Erick Tryzelaar
2013-02-17 10:59:09 -08:00
parent 59ba4fc104
commit bc62bd3782
9 changed files with 149 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libsyntax/ext/auto_encode.rs
View File

@@ -127,24 +127,24 @@ pub fn expand_auto_encode(
do vec::flat_map(in_items) |item| {
if item.attrs.any(is_auto_encode) {
match item.node {
ast::item_struct(@ast::struct_def { fields, _}, tps) => {
ast::item_struct(ref struct_def, ref tps) => {
let ser_impl = mk_struct_ser_impl(
cx,
item.span,
item.ident,
fields,
tps
struct_def.fields,
*tps
);
~[filter_attrs(*item), ser_impl]
},
ast::item_enum(ref enum_def, tps) => {
ast::item_enum(ref enum_def, ref tps) => {
let ser_impl = mk_enum_ser_impl(
cx,
item.span,
item.ident,
(*enum_def),
tps
*enum_def,
*tps
);
~[filter_attrs(*item), ser_impl]
@@ -182,24 +182,24 @@ pub fn expand_auto_decode(
do vec::flat_map(in_items) |item| {
if item.attrs.any(is_auto_decode) {
match item.node {
ast::item_struct(@ast::struct_def { fields, _}, tps) => {
ast::item_struct(ref struct_def, ref tps) => {
let deser_impl = mk_struct_deser_impl(
cx,
item.span,
item.ident,
fields,
tps
struct_def.fields,
*tps
);
~[filter_attrs(*item), deser_impl]
},
ast::item_enum(ref enum_def, tps) => {
ast::item_enum(ref enum_def, ref tps) => {
let deser_impl = mk_enum_deser_impl(
cx,
item.span,
item.ident,
(*enum_def),
tps
*enum_def,
*tps
);
~[filter_attrs(*item), deser_impl]
@@ -410,7 +410,7 @@ fn mk_impl(
ident: ast::ident,
ty_param: ast::ty_param,
path: @ast::path,
tps: ~[ast::ty_param],
tps: &[ast::ty_param],
f: fn(@ast::Ty) -> @ast::method
) -> @ast::item {
// All the type parameters need to bound to the trait.
@@ -458,7 +458,7 @@ fn mk_ser_impl(
cx: ext_ctxt,
span: span,
ident: ast::ident,
tps: ~[ast::ty_param],
tps: &[ast::ty_param],
body: @ast::expr
) -> @ast::item {
// Make a path to the std::serialize::Encodable typaram.
@@ -666,8 +666,8 @@ fn mk_struct_ser_impl(
cx: ext_ctxt,
span: span,
ident: ast::ident,
fields: ~[@ast::struct_field],
tps: ~[ast::ty_param]
fields: &[@ast::struct_field],
tps: &[ast::ty_param]
) -> @ast::item {
let fields = do mk_struct_fields(fields).mapi |idx, field| {
// ast for `|| self.$(name).encode(__s)`
@@ -808,7 +808,7 @@ struct field {
mutbl: ast::mutability,
}
fn mk_struct_fields(fields: ~[@ast::struct_field]) -> ~[field] {
fn mk_struct_fields(fields: &[@ast::struct_field]) -> ~[field] {
do fields.map |field| {
let (ident, mutbl) = match field.node.kind {
ast::named_field(ident, mutbl, _) => (ident, mutbl),