diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2012-07-11 10:28:30 -0700 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2012-07-11 14:41:41 -0700 |
| commit | b9aa9def858cfc66d411972b10ce3d98479acd78 (patch) | |
| tree | c65223b2926112a34427574cdd9c2feee6d06430 /src/libsyntax/fold.rs | |
| parent | 9b094c0baf4fa758c80fb9db8cc172f03789adbb (diff) | |
| download | rust-b9aa9def858cfc66d411972b10ce3d98479acd78.tar.gz rust-b9aa9def858cfc66d411972b10ce3d98479acd78.zip | |
infer when types are region parameterized rather than requiring /&
- removes various fields from various variants in the AST - also update tests not to use this notation
Diffstat (limited to 'src/libsyntax/fold.rs')
| -rw-r--r-- | src/libsyntax/fold.rs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 01298675688..a78148b37c6 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -244,15 +244,13 @@ fn noop_fold_item_underscore(i: item_, fld: ast_fold) -> item_ { } item_mod(m) { item_mod(fld.fold_mod(m)) } item_foreign_mod(nm) { item_foreign_mod(fld.fold_foreign_mod(nm)) } - item_ty(t, typms, rp) { item_ty(fld.fold_ty(t), - fold_ty_params(typms, fld), - rp) } - item_enum(variants, typms, r) { + item_ty(t, typms) { item_ty(fld.fold_ty(t), + fold_ty_params(typms, fld)) } + item_enum(variants, typms) { item_enum(vec::map(variants, |x| fld.fold_variant(x)), - fold_ty_params(typms, fld), - r) + fold_ty_params(typms, fld)) } - item_class(typms, traits, items, ctor, m_dtor, rp) { + item_class(typms, traits, items, ctor, m_dtor) { let ctor_body = fld.fold_block(ctor.node.body); let ctor_decl = fold_fn_decl(ctor.node.dec, fld); let ctor_id = fld.new_id(ctor.node.id); @@ -269,18 +267,16 @@ fn noop_fold_item_underscore(i: item_, fld: ast_fold) -> item_ { {node: {body: ctor_body, dec: ctor_decl, id: ctor_id with ctor.node} - with ctor}, dtor, rp) + with ctor}, dtor) } - item_impl(tps, rp, ifce, ty, methods) { + item_impl(tps, ifce, ty, methods) { item_impl(fold_ty_params(tps, fld), - rp, ifce.map(|p| fold_trait_ref(p, fld)), fld.fold_ty(ty), vec::map(methods, |x| fld.fold_method(x))) } - item_trait(tps, rp, methods) { + item_trait(tps, methods) { item_trait(fold_ty_params(tps, fld), - rp, /* FIXME (#2543) */ copy methods) } item_mac(m) { |
